From 35fbe8f7b54213c2c256fa45fc601c81fdd73009 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 3 Jan 2014 10:38:06 +0000
Subject: [PATCH] [LIBUSB] * Do not include debug.h into the main header. *
 Cleanup the main header. * Improve the GUIDs situation. CORE-7716

svn path=/trunk/; revision=61496
---
 reactos/lib/drivers/libusb/hcd_controller.cpp | 4 +++-
 reactos/lib/drivers/libusb/hub_controller.cpp | 5 +++--
 reactos/lib/drivers/libusb/libusb.cpp         | 4 +++-
 reactos/lib/drivers/libusb/libusb.h           | 8 +-------
 reactos/lib/drivers/libusb/memory_manager.cpp | 4 +++-
 reactos/lib/drivers/libusb/misc.cpp           | 4 +++-
 reactos/lib/drivers/libusb/purecall.cpp       | 5 ++---
 reactos/lib/drivers/libusb/usb_device.cpp     | 5 +++--
 8 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/reactos/lib/drivers/libusb/hcd_controller.cpp b/reactos/lib/drivers/libusb/hcd_controller.cpp
index 5662270cd7c..996c126aa78 100644
--- a/reactos/lib/drivers/libusb/hcd_controller.cpp
+++ b/reactos/lib/drivers/libusb/hcd_controller.cpp
@@ -8,9 +8,11 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-#define INITGUID
 #include "libusb.h"
 
+#define NDEBUG
+#include <debug.h>
+
 class CHCDController : public IHCDController,
                        public IDispatchIrp
 {
diff --git a/reactos/lib/drivers/libusb/hub_controller.cpp b/reactos/lib/drivers/libusb/hub_controller.cpp
index 7b9521295ee..763fd5c395a 100644
--- a/reactos/lib/drivers/libusb/hub_controller.cpp
+++ b/reactos/lib/drivers/libusb/hub_controller.cpp
@@ -8,10 +8,11 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-
-#define INITGUID
 #include "libusb.h"
 
+#define NDEBUG
+#include <debug.h>
+
 VOID StatusChangeEndpointCallBack(
     PVOID Context);
 
diff --git a/reactos/lib/drivers/libusb/libusb.cpp b/reactos/lib/drivers/libusb/libusb.cpp
index a6049fad1fc..dcf2021e616 100644
--- a/reactos/lib/drivers/libusb/libusb.cpp
+++ b/reactos/lib/drivers/libusb/libusb.cpp
@@ -8,9 +8,11 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-
 #include "libusb.h"
 
+#define NDEBUG
+#include <debug.h>
+
 //
 // driver verifier
 //
diff --git a/reactos/lib/drivers/libusb/libusb.h b/reactos/lib/drivers/libusb/libusb.h
index 1fd96b17f38..f24190183af 100644
--- a/reactos/lib/drivers/libusb/libusb.h
+++ b/reactos/lib/drivers/libusb/libusb.h
@@ -2,11 +2,8 @@
 #define LIBUSB_H__
 
 #include <ntddk.h>
-#define NDEBUG
-#include <debug.h>
 #include <hubbusif.h>
 #include <usbbusif.h>
-#include <usbioctl.h>
 
 extern "C"
 {
@@ -17,7 +14,6 @@ extern "C"
 // FIXME: 
 // #include <usbprotocoldefs.h>
 //
-#include <usb.h>
 #include <stdio.h>
 #include <wdmguid.h>
 
@@ -26,7 +22,6 @@ extern "C"
 // the following includes are required to get kcom to compile
 //
 #include <portcls.h>
-#include <dmusicks.h>
 #include <kcom.h>
 
 #include "common_interfaces.h"
@@ -99,5 +94,4 @@ NTSTATUS NTAPI USBLIB_Dispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 }
 
-
-#endif
+#endif /* LIBUSB_H__ */
diff --git a/reactos/lib/drivers/libusb/memory_manager.cpp b/reactos/lib/drivers/libusb/memory_manager.cpp
index d9418442acb..14521599903 100644
--- a/reactos/lib/drivers/libusb/memory_manager.cpp
+++ b/reactos/lib/drivers/libusb/memory_manager.cpp
@@ -8,9 +8,11 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-
 #include "libusb.h"
 
+#define NDEBUG
+#include <debug.h>
+
 class CDMAMemoryManager : public IDMAMemoryManager
 {
 public:
diff --git a/reactos/lib/drivers/libusb/misc.cpp b/reactos/lib/drivers/libusb/misc.cpp
index fe36cf447cc..d1622f6b19c 100644
--- a/reactos/lib/drivers/libusb/misc.cpp
+++ b/reactos/lib/drivers/libusb/misc.cpp
@@ -8,9 +8,11 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-
 #include "libusb.h"
 
+#define NDEBUG
+#include <debug.h>
+
 //
 // driver verifier
 //
diff --git a/reactos/lib/drivers/libusb/purecall.cpp b/reactos/lib/drivers/libusb/purecall.cpp
index f7d49f9d001..9fa4eb8b7e5 100644
--- a/reactos/lib/drivers/libusb/purecall.cpp
+++ b/reactos/lib/drivers/libusb/purecall.cpp
@@ -8,10 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-
-
 #include "libusb.h"
 
+#define NDEBUG
+#include <debug.h>
 
 extern "C" {
   void 
@@ -23,4 +23,3 @@ extern "C" {
 
   }
 }
-
diff --git a/reactos/lib/drivers/libusb/usb_device.cpp b/reactos/lib/drivers/libusb/usb_device.cpp
index bc7ef06e883..ddb612c88d6 100644
--- a/reactos/lib/drivers/libusb/usb_device.cpp
+++ b/reactos/lib/drivers/libusb/usb_device.cpp
@@ -8,10 +8,11 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-
-#define INITGUID
 #include "libusb.h"
 
+#define NDEBUG
+#include <debug.h>
+
 class CUSBDevice : public IUSBDevice
 {
 public: