[USBOHCI]

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

svn path=/trunk/; revision=61377

diff --git a/reactos/drivers/usb/usbohci/hardware.cpp b/reactos/drivers/usb/usbohci/hardware.cpp
index ad49006..9900cfe 100644 (file)
--- a/reactos/drivers/usb/usbohci/hardware.cpp
+++ b/reactos/drivers/usb/usbohci/hardware.cpp
@@ -8,9 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-#define INITGUID
 #include "usbohci.h"
-#include "hardware.h"
+
+#define NDEBUG
+#include <debug.h>
 
 typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext);
 

diff --git a/reactos/drivers/usb/usbohci/usb_queue.cpp b/reactos/drivers/usb/usbohci/usb_queue.cpp
index c615629..f757c4b 100644 (file)
--- a/reactos/drivers/usb/usbohci/usb_queue.cpp
+++ b/reactos/drivers/usb/usbohci/usb_queue.cpp
@@ -9,7 +9,9 @@
  */
 
 #include "usbohci.h"
-#include "hardware.h"
+
+#define NDEBUG
+#include <debug.h>
 
 class CUSBQueue : public IOHCIQueue
 {

diff --git a/reactos/drivers/usb/usbohci/usb_request.cpp b/reactos/drivers/usb/usbohci/usb_request.cpp
index ae5a53c..0983089 100644 (file)
--- a/reactos/drivers/usb/usbohci/usb_request.cpp
+++ b/reactos/drivers/usb/usbohci/usb_request.cpp
@@ -8,10 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-#define INITGUID
-
 #include "usbohci.h"
-#include "hardware.h"
+
+#define NDEBUG
+#include <debug.h>
 
 class CUSBRequest : public IOHCIRequest
 {

diff --git a/reactos/drivers/usb/usbohci/usbohci.cpp b/reactos/drivers/usb/usbohci/usbohci.cpp
index 9077210..b5e6f0e 100644 (file)
--- a/reactos/drivers/usb/usbohci/usbohci.cpp
+++ b/reactos/drivers/usb/usbohci/usbohci.cpp
@@ -10,6 +10,9 @@
 
 #include "usbohci.h"
 
+#define NDEBUG
+#include <debug.h>
+
 extern
 "C"
 NTSTATUS

diff --git a/reactos/drivers/usb/usbohci/usbohci.h b/reactos/drivers/usb/usbohci/usbohci.h
index 4a1b131..61fef27 100644 (file)
--- a/reactos/drivers/usb/usbohci/usbohci.h
+++ b/reactos/drivers/usb/usbohci/usbohci.h
@@ -1,9 +1,9 @@
 #ifndef USBOHCI_H__
 #define USBOHCI_H__
 
+#define INITGUID
+
 #include <ntddk.h>
-#define NDEBUG
-#include <debug.h>
 #include <hubbusif.h>
 #include <usbbusif.h>
 #include <usbioctl.h>
@@ -31,6 +31,7 @@ extern
 #include <dmusicks.h>
 #include <kcom.h>
 
+#include "hardware.h"
 #include "interfaces.h"
 
 //