- Remove cruft from CMakeLists.txt

- Silence debug flood
- Remove debugging code
- Add traces for composite device detection
- Don't print device descriptor

svn path=/branches/usb-bringup-trunk/; revision=55302

diff --git a/drivers/usb/usbehci_new/usb_queue.cpp b/drivers/usb/usbehci_new/usb_queue.cpp
index a8ce84b..acbf1b1 100644 (file)
--- a/drivers/usb/usbehci_new/usb_queue.cpp
+++ b/drivers/usb/usbehci_new/usb_queue.cpp
@@ -364,10 +364,6 @@ CUSBQueue::AddUSBRequest(
         LinkQueueHead(AsyncListQueueHead, QueueHead);
         KeReleaseSpinLock(m_Lock, OldLevel);
 
-        EHCI_USBCMD_CONTENT UsbCmd;
-        m_Hardware->GetCommandRegister(&UsbCmd);
-        ASSERT(UsbCmd.AsyncEnable == TRUE);
-
     }
 
 

diff --git a/drivers/usb/usbehci_new/usbehci.h b/drivers/usb/usbehci_new/usbehci.h
index 5e4f5ab..a4d1896 100644 (file)
--- a/drivers/usb/usbehci_new/usbehci.h
+++ b/drivers/usb/usbehci_new/usbehci.h
@@ -2,7 +2,7 @@
 #define USBEHCI_H__
 
 #include <ntddk.h>
-#define YDEBUG
+#define NDEBUG
 #include <debug.h>
 #include <hubbusif.h>
 #include <usbbusif.h>

diff --git a/drivers/usb/usbhub_new/fdo.c b/drivers/usb/usbhub_new/fdo.c
index 1153ed7..0b309ce 100644 (file)
--- a/drivers/usb/usbhub_new/fdo.c
+++ b/drivers/usb/usbhub_new/fdo.c
@@ -817,6 +817,7 @@ IsCompositeDevice(
          //
          // composite device must have only one configuration
          //
+         DPRINT1("IsCompositeDevice bNumConfigurations %x\n", DeviceDescriptor->bNumConfigurations);
          return FALSE;
     }
 
@@ -825,6 +826,7 @@ IsCompositeDevice(
         //
         // composite device must have multiple interfaces
         //
+        DPRINT1("IsCompositeDevice bNumInterfaces %x\n", ConfigurationDescriptor->bNumInterfaces);
         return FALSE;
     }
 
@@ -835,6 +837,7 @@ IsCompositeDevice(
         //
         ASSERT(DeviceDescriptor->bDeviceSubClass == 0);
         ASSERT(DeviceDescriptor->bDeviceProtocol == 0);
+        DPRINT1("IsCompositeDevice: TRUE\n");
         return TRUE;
     }
 
@@ -845,9 +848,12 @@ IsCompositeDevice(
         //
         // USB-IF association descriptor
         //
+        DPRINT1("IsCompositeDevice: TRUE\n");
         return TRUE;
     }
 
+    DPRINT1("DeviceDescriptor bDeviceClass %x bDeviceSubClass %x bDeviceProtocol %x\n", DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol);
+
     //
     // not a composite device
     //
@@ -1327,7 +1333,7 @@ CreateUsbChildDeviceObject(
         goto Cleanup;
     }
 
-    DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc);
+    //DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc);
 
     //
     // Construct all the strings that will described the device to PNP

diff --git a/drivers/usb/usbohci/CMakeLists.txt b/drivers/usb/usbohci/CMakeLists.txt
index de3deca..53d605c 100644 (file)
--- a/drivers/usb/usbohci/CMakeLists.txt
+++ b/drivers/usb/usbohci/CMakeLists.txt
@@ -29,6 +29,6 @@ else()
 endif(MSVC)
 
 set_module_type(usbohci kernelmodedriver)
-add_importlibs(usbohci ntoskrnl ks drmk hal usbd)
+add_importlibs(usbohci ntoskrnl hal usbd)
 
 add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all)
\ No newline at end of file