[USBHUB]

* Do not include debug.h into the main header.
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61330

diff --git a/reactos/drivers/usb/usbhub/fdo.c b/reactos/drivers/usb/usbhub/fdo.c
index 21512a9..39cf3f8 100644 (file)
--- a/reactos/drivers/usb/usbhub/fdo.c
+++ b/reactos/drivers/usb/usbhub/fdo.c
@@ -8,9 +8,11 @@
  *                  Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
  *                  Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 

-#define INITGUID

 #include "usbhub.h"
 
 #include "usbhub.h"
 

+#define NDEBUG
+#include <debug.h>
+

 NTSTATUS
 QueryStatusChangeEndpoint(
     IN PDEVICE_OBJECT DeviceObject);
 NTSTATUS
 QueryStatusChangeEndpoint(
     IN PDEVICE_OBJECT DeviceObject);

diff --git a/reactos/drivers/usb/usbhub/hub_fdo.c b/reactos/drivers/usb/usbhub/hub_fdo.c
index 1684782..019328b 100644 (file)
--- a/reactos/drivers/usb/usbhub/hub_fdo.c
+++ b/reactos/drivers/usb/usbhub/hub_fdo.c
@@ -7,8 +7,12 @@
  *                  Michael Martin (michael.martin@reactos.org)
  *                  Johannes Anderwald (johannes.anderwald@reactos.org)
  */
  *                  Michael Martin (michael.martin@reactos.org)
  *                  Johannes Anderwald (johannes.anderwald@reactos.org)
  */

+

 #include "usbhub.h"
 
 #include "usbhub.h"
 

+#define NDEBUG
+#include <debug.h>
+

 NTSTATUS
 USBHUB_ParentFDOStartDevice(
     IN PDEVICE_OBJECT DeviceObject,
 NTSTATUS
 USBHUB_ParentFDOStartDevice(
     IN PDEVICE_OBJECT DeviceObject,

diff --git a/reactos/drivers/usb/usbhub/misc.c b/reactos/drivers/usb/usbhub/misc.c
index f81d424..da9e8e0 100644 (file)
--- a/reactos/drivers/usb/usbhub/misc.c
+++ b/reactos/drivers/usb/usbhub/misc.c
@@ -7,8 +7,11 @@
  *                  Michael Martin (michael.martin@reactos.org)
  *                  Johannes Anderwald (johannes.anderwald@reactos.org)
  */
  *                  Michael Martin (michael.martin@reactos.org)
  *                  Johannes Anderwald (johannes.anderwald@reactos.org)
  */

+

 #include "usbhub.h"
 #include "usbhub.h"

-#include <stdarg.h>
+
+#define NDEBUG
+#include <debug.h>

 
 VOID
 DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor)
 
 VOID
 DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor)

diff --git a/reactos/drivers/usb/usbhub/pdo.c b/reactos/drivers/usb/usbhub/pdo.c
index 4fd8207..c804336 100644 (file)
--- a/reactos/drivers/usb/usbhub/pdo.c
+++ b/reactos/drivers/usb/usbhub/pdo.c
@@ -11,6 +11,9 @@
 
 #include "usbhub.h"
 
 
 #include "usbhub.h"
 

+#define NDEBUG
+#include <debug.h>
+

 #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003)
 
 NTSTATUS
 #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003)
 
 NTSTATUS

diff --git a/reactos/drivers/usb/usbhub/usbhub.c b/reactos/drivers/usb/usbhub/usbhub.c
index f34c4e4..1596e21 100644 (file)
--- a/reactos/drivers/usb/usbhub/usbhub.c
+++ b/reactos/drivers/usb/usbhub/usbhub.c
@@ -11,6 +11,9 @@
 
 #include "usbhub.h"
 
 
 #include "usbhub.h"
 

+#define NDEBUG
+#include <debug.h>
+

 NTSTATUS NTAPI
 USBHUB_Create(
     IN PDEVICE_OBJECT DeviceObject,
 NTSTATUS NTAPI
 USBHUB_Create(
     IN PDEVICE_OBJECT DeviceObject,

diff --git a/reactos/drivers/usb/usbhub/usbhub.h b/reactos/drivers/usb/usbhub/usbhub.h
index ab49ced..34058db 100644 (file)
--- a/reactos/drivers/usb/usbhub/usbhub.h
+++ b/reactos/drivers/usb/usbhub/usbhub.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #pragma once
 

-#define NDEBUG
+#define INITGUID
+

 #include <ntifs.h>
 #include <ntddk.h>
 #include <wdmguid.h>
 #include <ntifs.h>
 #include <ntddk.h>
 #include <wdmguid.h>


@@ -8,9 +9,10 @@
 #include <usbbusif.h>
 #include <usbioctl.h>
 #include <usb.h>
 #include <usbbusif.h>
 #include <usbioctl.h>
 #include <usb.h>

+#include <stdarg.h>

 #include <stdio.h>
 #include <usbdlib.h>
 #include <stdio.h>
 #include <usbdlib.h>

-#include <debug.h>
+

 //BROKEN: #include <usbprotocoldefs.h>
 #include <pseh/pseh2.h>
 
 //BROKEN: #include <usbprotocoldefs.h>
 #include <pseh/pseh2.h>
 


@@ -193,4 +195,4 @@ GetPortStatusAndChange(
 NTSTATUS
 USBHUB_ParentFDOStartDevice(
     IN PDEVICE_OBJECT DeviceObject,
 NTSTATUS
 USBHUB_ParentFDOStartDevice(
     IN PDEVICE_OBJECT DeviceObject,

-    IN PIRP Irp);
\ No newline at end of file
+    IN PIRP Irp);