[USBUHCI]

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

svn path=/trunk/; revision=61505

diff --git a/reactos/drivers/usb/usbuhci/CMakeLists.txt b/reactos/drivers/usb/usbuhci/CMakeLists.txt
index 623daf0..8eede69 100644 (file)
--- a/reactos/drivers/usb/usbuhci/CMakeLists.txt
+++ b/reactos/drivers/usb/usbuhci/CMakeLists.txt
@@ -11,7 +11,8 @@ list(APPEND SOURCE
     usbuhci.cpp
     usb_request.cpp
     usb_queue.cpp
-    hardware.cpp)
+    hardware.cpp
+    guid.cpp)
 
 add_library(usbuhci SHARED
     ${SOURCE}

diff --git a/reactos/drivers/usb/usbuhci/guid.cpp b/reactos/drivers/usb/usbuhci/guid.cpp
new file mode 100644 (file)
index 0000000..8ea477c
--- /dev/null
+++ b/reactos/drivers/usb/usbuhci/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 */

diff --git a/reactos/drivers/usb/usbuhci/hardware.h b/reactos/drivers/usb/usbuhci/hardware.h
index fafe7eb..9f1c13e 100644 (file)
--- a/reactos/drivers/usb/usbuhci/hardware.h
+++ b/reactos/drivers/usb/usbuhci/hardware.h
@@ -188,4 +188,4 @@ typedef struct _UHCI_QUEUE_HEAD
 #define UHCI_BULK_QUEUE               3
 #define UHCI_DEBUG_QUEUE              4
 
-#endif
+#endif /* UHCI_HARDWARE_H */

diff --git a/reactos/drivers/usb/usbuhci/interfaces.h b/reactos/drivers/usb/usbuhci/interfaces.h
index 55781a1..f4adb57 100644 (file)
--- a/reactos/drivers/usb/usbuhci/interfaces.h
+++ b/reactos/drivers/usb/usbuhci/interfaces.h
@@ -1,9 +1,6 @@
-
 #ifndef INTERFACES_HPP
 #define INTERFACES_HPP
 
-#include "libusb.h"
-
 //---------------------------------------------------------------------------
 //
 //          Object Hierachy
@@ -138,4 +135,4 @@ DECLARE_INTERFACE_(IUHCIQueue, IUSBQueue)
 
 typedef IUHCIQueue *PUHCIQUEUE;
 
-#endif
+#endif /* INTERFACES_HPP */

diff --git a/reactos/drivers/usb/usbuhci/usbuhci.h b/reactos/drivers/usb/usbuhci/usbuhci.h
index 55e33b5..632a101 100644 (file)
--- a/reactos/drivers/usb/usbuhci/usbuhci.h
+++ b/reactos/drivers/usb/usbuhci/usbuhci.h
@@ -1,34 +1,7 @@
 #ifndef USBUHCI_H__
 #define USBUHCI_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"