[akhaldi] 61496: [LIBUSB] * Do not include debug.h into the main header. * Cleanup the main header. * Improve the GUIDs situation. CORE-7716

Author: akhaldi
Date: Fri Jan  3 10:38:06 2014
New Revision: 61496

URL: http://svn.reactos.org/svn/reactos?rev=61496&view=rev
Log:
[LIBUSB]
* Do not include debug.h into the main header.
* Cleanup the main header.
* Improve the GUIDs situation.
CORE-7716

Modified:
    trunk/reactos/lib/drivers/libusb/hcd_controller.cpp
    trunk/reactos/lib/drivers/libusb/hub_controller.cpp
    trunk/reactos/lib/drivers/libusb/libusb.cpp
    trunk/reactos/lib/drivers/libusb/libusb.h
    trunk/reactos/lib/drivers/libusb/memory_manager.cpp
    trunk/reactos/lib/drivers/libusb/misc.cpp
    trunk/reactos/lib/drivers/libusb/purecall.cpp
    trunk/reactos/lib/drivers/libusb/usb_device.cpp

Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hcd_con…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/hcd_controller.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/hcd_controller.cpp	[iso-8859-1] Fri Jan  3 10:38:06
2014
@@ -8,8 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald(a)reactos.org)
  */
 
-#define INITGUID
 #include "libusb.h"
+
+#define NDEBUG
+#include <debug.h>
 
 class CHCDController : public IHCDController,
                        public IDispatchIrp

Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/hub_controller.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp	[iso-8859-1] Fri Jan  3 10:38:06
2014
@@ -8,9 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald(a)reactos.org)
  */
 
-
-#define INITGUID
 #include "libusb.h"
+
+#define NDEBUG
+#include <debug.h>
 
 VOID StatusChangeEndpointCallBack(
     PVOID Context);

Modified: trunk/reactos/lib/drivers/libusb/libusb.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/libusb.…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/libusb.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/libusb.cpp	[iso-8859-1] Fri Jan  3 10:38:06 2014
@@ -8,8 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald(a)reactos.org)
  */
 
+#include "libusb.h"
 
-#include "libusb.h"
+#define NDEBUG
+#include <debug.h>
 
 //
 // driver verifier

Modified: trunk/reactos/lib/drivers/libusb/libusb.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/libusb.…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/libusb.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/libusb.h	[iso-8859-1] Fri Jan  3 10:38:06 2014
@@ -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 @@
 // FIXME: 
 // #include <usbprotocoldefs.h>
 //
-#include <usb.h>
 #include <stdio.h>
 #include <wdmguid.h>
 
@@ -26,7 +22,6 @@
 // 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 @@
 
 }
 
-
-#endif
+#endif /* LIBUSB_H__ */

Modified: trunk/reactos/lib/drivers/libusb/memory_manager.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/memory_…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/memory_manager.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/memory_manager.cpp	[iso-8859-1] Fri Jan  3 10:38:06
2014
@@ -8,8 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald(a)reactos.org)
  */
 
-
 #include "libusb.h"
+
+#define NDEBUG
+#include <debug.h>
 
 class CDMAMemoryManager : public IDMAMemoryManager
 {

Modified: trunk/reactos/lib/drivers/libusb/misc.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/misc.cp…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/misc.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/misc.cpp	[iso-8859-1] Fri Jan  3 10:38:06 2014
@@ -8,8 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald(a)reactos.org)
  */
 
+#include "libusb.h"
 
-#include "libusb.h"
+#define NDEBUG
+#include <debug.h>
 
 //
 // driver verifier

Modified: trunk/reactos/lib/drivers/libusb/purecall.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/purecal…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/purecall.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/purecall.cpp	[iso-8859-1] Fri Jan  3 10:38:06 2014
@@ -8,10 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald(a)reactos.org)
  */
 
-
-
 #include "libusb.h"
 
+#define NDEBUG
+#include <debug.h>
 
 extern "C" {
   void 
@@ -23,4 +23,3 @@
 
   }
 }
-

Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/usb_device.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/usb_device.cpp	[iso-8859-1] Fri Jan  3 10:38:06 2014
@@ -8,9 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald(a)reactos.org)
  */
 
-
-#define INITGUID
 #include "libusb.h"
+
+#define NDEBUG
+#include <debug.h>
 
 class CUSBDevice : public IUSBDevice
 {