[akhaldi] 61377: [USBOHCI] * Move some inclusions and definitions to the main header. * Do not include debug.h into the main header. CORE-7716

Author: akhaldi
Date: Tue Dec 24 20:42:53 2013
New Revision: 61377

URL: http://svn.reactos.org/svn/reactos?rev=61377&view=rev
Log:
[USBOHCI]
* Move some inclusions and definitions to the main header.
* Do not include debug.h into the main header.
CORE-7716

Modified:
    trunk/reactos/drivers/usb/usbohci/hardware.cpp
    trunk/reactos/drivers/usb/usbohci/usb_queue.cpp
    trunk/reactos/drivers/usb/usbohci/usb_request.cpp
    trunk/reactos/drivers/usb/usbohci/usbohci.cpp
    trunk/reactos/drivers/usb/usbohci/usbohci.h

Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwar...
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/hardware.cpp	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/hardware.cpp	[iso-8859-1] Tue Dec 24 20:42:53 2013
@@ -8,9 +8,10 @@
  *              Johannes Anderwald ([e-mail])
  */

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

typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext);

Modified: trunk/reactos/drivers/usb/usbohci/usb_queue.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_que...
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/usb_queue.cpp	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/usb_queue.cpp	[iso-8859-1] Tue Dec 24 20:42:53 2013
@@ -9,7 +9,9 @@
  */

#include "usbohci.h"
-#include "hardware.h"
+
+#define NDEBUG
+#include <debug.h>

class CUSBQueue : public IOHCIQueue
 {

Modified: trunk/reactos/drivers/usb/usbohci/usb_request.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_req...
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/usb_request.cpp	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/usb_request.cpp	[iso-8859-1] Tue Dec 24 20:42:53 2013
@@ -8,10 +8,10 @@
  *              Johannes Anderwald ([e-mail])
  */

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

class CUSBRequest : public IOHCIRequest
 {

Modified: trunk/reactos/drivers/usb/usbohci/usbohci.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usbohci...
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/usbohci.cpp	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/usbohci.cpp	[iso-8859-1] Tue Dec 24 20:42:53 2013
@@ -9,6 +9,9 @@
  */

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

extern
 "C"

Modified: trunk/reactos/drivers/usb/usbohci/usbohci.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usbohci...
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/usbohci.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/usbohci.h	[iso-8859-1] Tue Dec 24 20:42:53 2013
@@ -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 @@
 #include <dmusicks.h>
 #include <kcom.h>

+#include "hardware.h"
 #include "interfaces.h"

//