30 Apr
2011
30 Apr
'11
6:46 p.m.
Author: janderwald
Date: Sat Apr 30 18:46:10 2011
New Revision: 51507
URL: http://svn.reactos.org/svn/reactos?rev=51507&view=rev
Log:
[USBEHCI_NEW]
- Silence usb bulk control traces
Modified:
branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp
branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp
branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp
branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp
branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h
Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sat Apr 30
18:46:10 2011
@@ -774,7 +774,7 @@
{
ULONG Value;
- DPRINT1("CUSBHardwareDevice::ClearPortStatus\n");
+ DPRINT("CUSBHardwareDevice::ClearPortStatus\n");
if (PortId > m_Capabilities.HCSParams.PortCount)
return STATUS_UNSUCCESSFUL;
@@ -818,7 +818,7 @@
{
ULONG Value;
- DPRINT1("CUSBHardwareDevice::SetPortFeature\n");
+ DPRINT("CUSBHardwareDevice::SetPortFeature\n");
if (PortId > m_Capabilities.HCSParams.PortCount)
return STATUS_UNSUCCESSFUL;
Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1]
(original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Sat Apr
30 18:46:10 2011
@@ -799,7 +799,7 @@
DPRINT1("Control Transfer is not expected!!!\n");
return STATUS_INVALID_DEVICE_REQUEST;
case USB_ENDPOINT_TYPE_BULK:
- DPRINT1("Initiating Bulk Transfer\n");
+ DPRINT("Initiating Bulk Transfer\n");
break;
case USB_ENDPOINT_TYPE_ISOCHRONOUS:
case USB_ENDPOINT_TYPE_INTERRUPT:
Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Sat Apr 30
18:46:10 2011
@@ -98,7 +98,7 @@
{
NTSTATUS Status = STATUS_SUCCESS;
- DPRINT1("CUSBQueue::Initialize()\n");
+ DPRINT("CUSBQueue::Initialize()\n");
ASSERT(Hardware);
@@ -208,7 +208,7 @@
return Status;
}
- DPRINT1("Request %p QueueHead %p inserted into AsyncQueue\n", Request,
QueueHead);
+ DPRINT("Request %p QueueHead %p inserted into AsyncQueue\n", Request,
QueueHead);
//
// Add it to the pending list
@@ -518,7 +518,7 @@
//
IsQueueHeadComplete = Request->IsQueueHeadComplete(QueueHead);
- DPRINT1("Request %p QueueHead %p Complete %d\n", Request, QueueHead,
IsQueueHeadComplete);
+ DPRINT("Request %p QueueHead %p Complete %d\n", Request, QueueHead,
IsQueueHeadComplete);
//
// check if queue head is complete
@@ -550,7 +550,7 @@
OUT PULONG ShouldRingDoorBell)
{
- DPRINT1("CUSBQueue::InterruptCallback\n");
+ DPRINT("CUSBQueue::InterruptCallback\n");
//
// iterate asynchronous list
@@ -666,7 +666,7 @@
PLIST_ENTRY Entry;
PQUEUE_HEAD CurrentQH;
- DPRINT1("CUSBQueue::CompleteAsyncRequests\n");
+ DPRINT("CUSBQueue::CompleteAsyncRequests\n");
//
// first acquire request lock
Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Sat Apr 30
18:46:10 2011
@@ -261,7 +261,7 @@
//
// Create one using TransferBuffer
//
- DPRINT1("Creating Mdl from Urb Buffer %p Length %lu\n",
Urb->UrbBulkOrInterruptTransfer.TransferBuffer,
Urb->UrbBulkOrInterruptTransfer.TransferBufferLength);
+ DPRINT("Creating Mdl from Urb Buffer %p Length %lu\n",
Urb->UrbBulkOrInterruptTransfer.TransferBuffer,
Urb->UrbBulkOrInterruptTransfer.TransferBufferLength);
m_TransferBufferMDL =
IoAllocateMdl(Urb->UrbBulkOrInterruptTransfer.TransferBuffer,
Urb->UrbBulkOrInterruptTransfer.TransferBufferLength,
FALSE,
@@ -384,7 +384,7 @@
Urb->UrbBulkOrInterruptTransfer.TransferBufferLength =
InternalCalculateTransferLength();
}
- DPRINT1("Request %p Completing Irp %p NtStatusCode %x UrbStatusCode %x
Transferred Length %lu\n", this, m_Irp, NtStatusCode, UrbStatusCode,
Urb->UrbBulkOrInterruptTransfer.TransferBufferLength);
+ DPRINT("Request %p Completing Irp %p NtStatusCode %x UrbStatusCode %x
Transferred Length %lu\n", this, m_Irp, NtStatusCode, UrbStatusCode,
Urb->UrbBulkOrInterruptTransfer.TransferBufferLength);
//
// FIXME: check if the transfer was split
@@ -521,7 +521,6 @@
//
// FIXME: check if request was split
//
- UNIMPLEMENTED
return TRUE;
}
//----------------------------------------------------------------------------------------
@@ -790,12 +789,12 @@
PC_ASSERT(Base);
- DPRINT1("EndPointAddress %x\n",
m_EndpointDescriptor->bEndpointAddress);
- DPRINT1("EndPointDirection %x\n",
USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress));
-
- DPRINT1("Request %p Base Address %p TransferBytesLength %lu MDL %p\n",
this, Base, BytesAvailable, m_TransferBufferMDL);
- DPRINT1("InternalGetPidDirection() %d EndPointAddress %x\n",
InternalGetPidDirection(), m_EndpointDescriptor->bEndpointAddress & 0x0F);
- DPRINT1("Irp %p QueueHead %p\n", m_Irp, QueueHead);
+ DPRINT("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress);
+ DPRINT("EndPointDirection %x\n",
USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress));
+
+ DPRINT("Request %p Base Address %p TransferBytesLength %lu MDL %p\n", this,
Base, BytesAvailable, m_TransferBufferMDL);
+ DPRINT("InternalGetPidDirection() %d EndPointAddress %x\n",
InternalGetPidDirection(), m_EndpointDescriptor->bEndpointAddress & 0x0F);
+ DPRINT("Irp %p QueueHead %p\n", m_Irp, QueueHead);
//PC_ASSERT(InternalGetPidDirection() ==
USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress));
@@ -868,7 +867,7 @@
//
BytesAvailable -=
m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer;
- DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu
TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index],
m_TransferDescriptors[Index]->BufferPointer[BufferIndex],
+ DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu
TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index],
m_TransferDescriptors[Index]->BufferPointer[BufferIndex],
BufferIndex,
m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable);
}
else
@@ -879,7 +878,7 @@
m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer =
BytesAvailable;
BytesAvailable = 0;
- DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu
TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index],
m_TransferDescriptors[Index]->BufferPointer[BufferIndex],
+ DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu
TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index],
m_TransferDescriptors[Index]->BufferPointer[BufferIndex],
BufferIndex,
m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable);
break;
}
@@ -913,7 +912,7 @@
//
BytesAvailable -= PAGE_SIZE;
- DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu
TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index],
m_TransferDescriptors[Index]->BufferPointer[BufferIndex],
+ DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu
TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index],
m_TransferDescriptors[Index]->BufferPointer[BufferIndex],
BufferIndex,
m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable);
}
else
@@ -938,7 +937,7 @@
//
// done
//
- DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu
TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index],
m_TransferDescriptors[Index]->BufferPointer[BufferIndex],
+ DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu
TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index],
m_TransferDescriptors[Index]->BufferPointer[BufferIndex],
BufferIndex,
m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable);
break;
@@ -1465,7 +1464,6 @@
//
// release transfer descriptors
//
- DPRINT1("m_TransferDescriptor[0] Length %lu\n",
m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer);
m_DmaManager->Release(m_TransferDescriptors[0],
sizeof(QUEUE_TRANSFER_DESCRIPTOR));
m_TransferDescriptors[0] = 0;
}
Modified: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Sat Apr 30
18:46:10 2011
@@ -2,7 +2,7 @@
#define USBEHCI_H__
#include <ntddk.h>
-#define YDEBUG
+#define NDEBUG
#include <debug.h>
#include <hubbusif.h>
#include <usbbusif.h>