[USBUHCI]

* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61955

diff --git a/reactos/drivers/usb/usbuhci/CMakeLists.txt b/reactos/drivers/usb/usbuhci/CMakeLists.txt
index 8eede69..6af8742 100644 (file)
--- a/reactos/drivers/usb/usbuhci/CMakeLists.txt
+++ b/reactos/drivers/usb/usbuhci/CMakeLists.txt
@@ -19,6 +19,7 @@ add_library(usbuhci SHARED
     usbuhci.rc)
 
 target_link_libraries(usbuhci
+    uuid
     libusb
     libcntpr
     ${PSEH_LIB})

diff --git a/reactos/drivers/usb/usbuhci/guid.cpp b/reactos/drivers/usb/usbuhci/guid.cpp
index 8ea477c..50a6036 100644 (file)
--- a/reactos/drivers/usb/usbuhci/guid.cpp
+++ b/reactos/drivers/usb/usbuhci/guid.cpp
@@ -1,6 +1,9 @@
 /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
 
+#include <wdm.h>
 #include <initguid.h>
-#include <libusb.h>
+#include <wdmguid.h>
+#include <hubbusif.h>
+#include <usbbusif.h>
 
 /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

diff --git a/reactos/drivers/usb/usbuhci/usbuhci.h b/reactos/drivers/usb/usbuhci/usbuhci.h
index 632a101..4d8cfb2 100644 (file)
--- a/reactos/drivers/usb/usbuhci/usbuhci.h
+++ b/reactos/drivers/usb/usbuhci/usbuhci.h
@@ -47,4 +47,4 @@ NTSTATUS NTAPI CreateUSBQueue(PUSBQUEUE *OutUsbQueue);
 //
 NTSTATUS NTAPI InternalCreateUSBRequest(PUSBREQUEST *OutRequest);
 
-#endif
+#endif /* USBUHCI_H__ */