[USBOHCI]

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

svn path=/trunk/; revision=61504

reactos/drivers/usb/usbohci/CMakeLists.txt

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

reactos/drivers/usb/usbohci/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/usbohci/hardware.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <ntddk.h>
-
 //
 // OHCI Operational Registers
 //

reactos/drivers/usb/usbohci/interfaces.h

@@ -1,4 +1,3 @@
-
 #ifndef INTERFACES_HPP
 #define INTERFACES_HPP
 
@@ -6,8 +5,6 @@ struct _OHCI_ENDPOINT_DESCRIPTOR;
 struct IDMAMemoryManager;
 struct IUSBQueue;
 
-#include "libusb.h"
-
 //=========================================================================================
 //
 // class IUSBHardwareDevice
@@ -134,4 +131,4 @@ DECLARE_INTERFACE_(IOHCIQueue, IUSBQueue)
 
 typedef IOHCIQueue *POHCIQUEUE;
 
-#endif
+#endif /* INTERFACES_HPP */

reactos/drivers/usb/usbohci/usbohci.h

@@ -1,35 +1,7 @@
 #ifndef USBOHCI_H__
 #define USBOHCI_H__
 
-#define INITGUID
-
-#include <ntddk.h>
-#include <hubbusif.h>
-#include <usbbusif.h>
-#include <usbioctl.h>
-#include <usb100.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"
@@ -79,4 +51,4 @@ NTSTATUS NTAPI CreateUSBQueue(PUSBQUEUE *OutUsbQueue);
 NTSTATUS NTAPI InternalCreateUSBRequest(PUSBREQUEST *OutRequest);
 }
 
-#endif
+#endif /* USBOHCI_H__ */