[ros-diffs] [akhaldi] 61330: [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

Author: akhaldi
Date: Sat Dec 21 19:15:13 2013
New Revision: 61330

URL: http://svn.reactos.org/svn/reactos?rev=61330&view=rev
Log:
[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

Modified:
    trunk/reactos/drivers/usb/usbhub/fdo.c
    trunk/reactos/drivers/usb/usbhub/hub_fdo.c
    trunk/reactos/drivers/usb/usbhub/misc.c
    trunk/reactos/drivers/usb/usbhub/pdo.c
    trunk/reactos/drivers/usb/usbhub/usbhub.c
    trunk/reactos/drivers/usb/usbhub/usbhub.h

Modified: trunk/reactos/drivers/usb/usbhub/fdo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?re...
==============================================================================
--- trunk/reactos/drivers/usb/usbhub/fdo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub/fdo.c	[iso-8859-1] Sat Dec 21 19:15:13 2013
@@ -8,8 +8,10 @@
  *                  Johannes Anderwald ([e-mail])
  */

-#define INITGUID
 #include "usbhub.h"
+
+#define NDEBUG
+#include <debug.h>

NTSTATUS
 QueryStatusChangeEndpoint(

Modified: trunk/reactos/drivers/usb/usbhub/hub_fdo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/hub_fdo....
==============================================================================
--- trunk/reactos/drivers/usb/usbhub/hub_fdo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub/hub_fdo.c	[iso-8859-1] Sat Dec 21 19:15:13 2013
@@ -7,7 +7,11 @@
  *                  Michael Martin ([e-mail])
  *                  Johannes Anderwald ([e-mail])
  */
+
 #include "usbhub.h"
+
+#define NDEBUG
+#include <debug.h>

NTSTATUS
 USBHUB_ParentFDOStartDevice(

Modified: trunk/reactos/drivers/usb/usbhub/misc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/misc.c?r...
==============================================================================
--- trunk/reactos/drivers/usb/usbhub/misc.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub/misc.c	[iso-8859-1] Sat Dec 21 19:15:13 2013
@@ -7,8 +7,11 @@
  *                  Michael Martin ([e-mail])
  *                  Johannes Anderwald ([e-mail])
  */
+
 #include "usbhub.h"
-#include <stdarg.h>
+
+#define NDEBUG
+#include <debug.h>

VOID
 DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor)

Modified: trunk/reactos/drivers/usb/usbhub/pdo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?re...
==============================================================================
--- trunk/reactos/drivers/usb/usbhub/pdo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub/pdo.c	[iso-8859-1] Sat Dec 21 19:15:13 2013
@@ -10,6 +10,9 @@
  */

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

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

Modified: trunk/reactos/drivers/usb/usbhub/usbhub.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.c...
==============================================================================
--- trunk/reactos/drivers/usb/usbhub/usbhub.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub/usbhub.c	[iso-8859-1] Sat Dec 21 19:15:13 2013
@@ -11,6 +11,9 @@

#include "usbhub.h"

+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS NTAPI
 USBHUB_Create(
     IN PDEVICE_OBJECT DeviceObject,

Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.h...
==============================================================================
--- trunk/reactos/drivers/usb/usbhub/usbhub.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub/usbhub.h	[iso-8859-1] Sat Dec 21 19:15:13 2013
@@ -1,6 +1,7 @@
 #pragma once

-#define NDEBUG
+#define INITGUID
+
 #include <ntifs.h>
 #include <ntddk.h>
 #include <wdmguid.h>
@@ -8,9 +9,10 @@
 #include <usbbusif.h>
 #include <usbioctl.h>
 #include <usb.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <usbdlib.h>
-#include <debug.h>
+
 //BROKEN: #include <usbprotocoldefs.h>
 #include <pseh/pseh2.h>

@@ -193,4 +195,4 @@
 NTSTATUS
 USBHUB_ParentFDOStartDevice(
     IN PDEVICE_OBJECT DeviceObject,
-    IN PIRP Irp);
+    IN PIRP Irp);