[USBHUB]

* Cleanup the main header.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61503

diff --git a/reactos/drivers/usb/usbhub/CMakeLists.txt b/reactos/drivers/usb/usbhub/CMakeLists.txt
index 6e1a3cd..029840a 100644 (file)
--- a/reactos/drivers/usb/usbhub/CMakeLists.txt
+++ b/reactos/drivers/usb/usbhub/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-DDEBUG_MODE)
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-add_library(usbhub SHARED fdo.c misc.c pdo.c hub_fdo.c usbhub.c usbhub.rc)
+add_library(usbhub SHARED fdo.c misc.c pdo.c hub_fdo.c usbhub.c guid.c usbhub.rc)
 
 target_link_libraries(usbhub ${PSEH_LIB})
 

diff --git a/reactos/drivers/usb/usbhub/fdo.c b/reactos/drivers/usb/usbhub/fdo.c
index 39cf3f8..ddeb84b 100644 (file)
--- a/reactos/drivers/usb/usbhub/fdo.c
+++ b/reactos/drivers/usb/usbhub/fdo.c
@@ -10,6 +10,8 @@
 
 #include "usbhub.h"
 
+#include <stdio.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/usb/usbhub/guid.c b/reactos/drivers/usb/usbhub/guid.c
new file mode 100644 (file)
index 0000000..50a6036
--- /dev/null
+++ b/reactos/drivers/usb/usbhub/guid.c
@@ -0,0 +1,9 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <wdm.h>
+#include <initguid.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/usbhub/pdo.c b/reactos/drivers/usb/usbhub/pdo.c
index c804336..8103333 100644 (file)
--- a/reactos/drivers/usb/usbhub/pdo.c
+++ b/reactos/drivers/usb/usbhub/pdo.c
@@ -11,6 +11,8 @@
 
 #include "usbhub.h"
 
+#include <wdmguid.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/usb/usbhub/usbhub.h b/reactos/drivers/usb/usbhub/usbhub.h
index 34058db..2a93c80 100644 (file)
--- a/reactos/drivers/usb/usbhub/usbhub.h
+++ b/reactos/drivers/usb/usbhub/usbhub.h
@@ -1,20 +1,11 @@
 #pragma once
 
-#define INITGUID
-
-#include <ntifs.h>
 #include <ntddk.h>
-#include <wdmguid.h>
 #include <hubbusif.h>
 #include <usbbusif.h>
-#include <usbioctl.h>
-#include <usb.h>
-#include <stdarg.h>
-#include <stdio.h>
 #include <usbdlib.h>
 
 //BROKEN: #include <usbprotocoldefs.h>
-#include <pseh/pseh2.h>
 
 #define USB_HUB_TAG 'hbsu'
 #define USB_MAXCHILDREN 127