[USBCCGP]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61951

diff --git a/reactos/drivers/usb/usbccgp/descriptor.c b/reactos/drivers/usb/usbccgp/descriptor.c
index ba17339..4a8a9c8 100644 (file)
--- a/reactos/drivers/usb/usbccgp/descriptor.c
+++ b/reactos/drivers/usb/usbccgp/descriptor.c
@@ -545,4 +545,3 @@ USBCCGP_SelectConfiguration(
     //
     return Status;
 }
-

diff --git a/reactos/drivers/usb/usbccgp/misc.c b/reactos/drivers/usb/usbccgp/misc.c
index e65cb3f..807be49 100644 (file)
--- a/reactos/drivers/usb/usbccgp/misc.c
+++ b/reactos/drivers/usb/usbccgp/misc.c
@@ -190,4 +190,4 @@ DumpFunctionDescriptor(
             DPRINT1(" Index %lu iInterface %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->iInterface);
         }
     }
-}
\ No newline at end of file
+}

diff --git a/reactos/drivers/usb/usbccgp/pdo.c b/reactos/drivers/usb/usbccgp/pdo.c
index 0efcc80..9810344 100644 (file)
--- a/reactos/drivers/usb/usbccgp/pdo.c
+++ b/reactos/drivers/usb/usbccgp/pdo.c
@@ -11,6 +11,8 @@
 
 #include "usbccgp.h"
 
+#include <ntddk.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/usb/usbccgp/usbccgp.h b/reactos/drivers/usb/usbccgp/usbccgp.h
index d722b47..640760f 100644 (file)
--- a/reactos/drivers/usb/usbccgp/usbccgp.h
+++ b/reactos/drivers/usb/usbccgp/usbccgp.h
@@ -1,14 +1,11 @@
 #ifndef USBEHCI_H__
 #define USBEHCI_H__
 
-#include <ntddk.h>
+#include <wdm.h>
 #include <hubbusif.h>
 #include <usbbusif.h>
 #include <usbdlib.h>
 
-/* FIXME:
-#include <usbprotocoldefs.h> */
-
 #include <stdio.h>
 
 typedef struct
@@ -151,4 +148,4 @@ NTSTATUS
 USBCCGP_EnumerateFunctions(
     IN PDEVICE_OBJECT DeviceObject);
 
-#endif
+#endif /* USBEHCI_H__ */