[USBEHCI]

* Remove inclusions that already exist in the main header.
* Cleanup the main header.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61502

reactos/drivers/usb/usbehci/CMakeLists.txt

@@ -10,7 +10,8 @@ list(APPEND SOURCE
     usbehci.cpp
     usb_request.cpp
     usb_queue.cpp
-    hardware.cpp)
+    hardware.cpp
+    guid.cpp)
 
 add_library(usbehci SHARED
     ${SOURCE}

reactos/drivers/usb/usbehci/guid.cpp

@@ -0,0 +1,6 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <initguid.h>
+#include <libusb.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

reactos/drivers/usb/usbehci/hardware.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#include <ntddk.h>
-
-
 //
 // Host Controller Capability Registers
 //
@@ -325,4 +322,4 @@ typedef struct
 #define EHCI_QH_CAPS_SCM_SHIFT  8			// Split Completion Mask
 #define EHCI_QH_CAPS_SCM_MASK   0xff
 #define EHCI_QH_CAPS_ISM_SHIFT  0			// Interrupt Schedule Mask
-#define EHCI_QH_CAPS_ISM_MASK  0xff
+#define EHCI_QH_CAPS_ISM_MASK  0xff

reactos/drivers/usb/usbehci/interfaces.h

@@ -1,10 +1,6 @@
-
 #ifndef INTERFACES_HPP
 #define INTERFACES_HPP
 
-#include "libusb.h"
-
-
 //=========================================================================================
 //
 // class IUSBHardwareDevice
@@ -152,4 +148,4 @@ DECLARE_INTERFACE_(IEHCIQueue, IUSBQueue)
 
 typedef IEHCIQueue *PEHCIQUEUE;
 
-#endif
+#endif /* INTERFACES_HPP */

reactos/drivers/usb/usbehci/usbehci.h

@@ -1,35 +1,7 @@
 #ifndef USBEHCI_H__
 #define USBEHCI_H__
 
-#define INITGUID
-
-#include <ntddk.h>
-#include <hubbusif.h>
-#include <usbbusif.h>
-#include <usbioctl.h>
-
-extern "C"
-{
-#include <usbdlib.h>
-}
-
-
-
-//
-// FIXME: 
-// #include <usbprotocoldefs.h>
-//
-#include <usb.h>
-#include <stdio.h>
-#include <wdmguid.h>
-
-//
-// FIXME:
-// the following includes are required to get kcom to compile
-//
-#include <portcls.h>
-#include <dmusicks.h>
-#include <kcom.h>
+#include <libusb.h>
 
 #include "hardware.h"
 #include "interfaces.h"
@@ -61,4 +33,4 @@ NTSTATUS NTAPI CreateUSBQueue(PUSBQUEUE *OutUsbQueue);
 //
 NTSTATUS NTAPI InternalCreateUSBRequest(PUSBREQUEST *OutRequest);
 
-#endif
+#endif /* USBEHCI_H__ */