Author: janderwald
Date: Sun Jan 29 23:11:21 2012
New Revision: 55302
URL:
http://svn.reactos.org/svn/reactos?rev=55302&view=rev
Log:
- Remove cruft from CMakeLists.txt
- Silence debug flood
- Remove debugging code
- Add traces for composite device detection
- Don't print device descriptor
Modified:
branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h
branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c
branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Sun Jan
29 23:11:21 2012
@@ -364,10 +364,6 @@
LinkQueueHead(AsyncListQueueHead, QueueHead);
KeReleaseSpinLock(m_Lock, OldLevel);
- EHCI_USBCMD_CONTENT UsbCmd;
- m_Hardware->GetCommandRegister(&UsbCmd);
- ASSERT(UsbCmd.AsyncEnable == TRUE);
-
}
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Sun Jan 29
23:11:21 2012
@@ -2,7 +2,7 @@
#define USBEHCI_H__
#include <ntddk.h>
-#define YDEBUG
+#define NDEBUG
#include <debug.h>
#include <hubbusif.h>
#include <usbbusif.h>
Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sun Jan 29
23:11:21 2012
@@ -817,6 +817,7 @@
//
// composite device must have only one configuration
//
+ DPRINT1("IsCompositeDevice bNumConfigurations %x\n",
DeviceDescriptor->bNumConfigurations);
return FALSE;
}
@@ -825,6 +826,7 @@
//
// composite device must have multiple interfaces
//
+ DPRINT1("IsCompositeDevice bNumInterfaces %x\n",
ConfigurationDescriptor->bNumInterfaces);
return FALSE;
}
@@ -835,6 +837,7 @@
//
ASSERT(DeviceDescriptor->bDeviceSubClass == 0);
ASSERT(DeviceDescriptor->bDeviceProtocol == 0);
+ DPRINT1("IsCompositeDevice: TRUE\n");
return TRUE;
}
@@ -845,8 +848,11 @@
//
// 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 @@
goto Cleanup;
}
- DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc);
+ //DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc);
//
// Construct all the strings that will described the device to PNP
Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] Sun Jan 29
23:11:21 2012
@@ -29,6 +29,6 @@
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)