Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 05:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBEHCI_NEW]

Browse source 
- Silence usb bulk control traces

svn path=/branches/usb-bringup/; revision=51507
This commit is contained in:
Johannes Anderwald 2011-04-30 18:46:10 +00:00
parent 6321f84f30
commit bca978808b
5 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/usbehci_new/hardware.cpp
View file

@ -774,7 +774,7 @@ CUSBHardwareDevice::ClearPortStatus(
{
ULONG Value;
DPRINT1("CUSBHardwareDevice::ClearPortStatus\n");
DPRINT("CUSBHardwareDevice::ClearPortStatus\n");
if (PortId > m_Capabilities.HCSParams.PortCount)
return STATUS_UNSUCCESSFUL;
@ -818,7 +818,7 @@ CUSBHardwareDevice::SetPortFeature(
{
ULONG Value;
DPRINT1("CUSBHardwareDevice::SetPortFeature\n");
DPRINT("CUSBHardwareDevice::SetPortFeature\n");
if (PortId > m_Capabilities.HCSParams.PortCount)
return STATUS_UNSUCCESSFUL;

2
drivers/usb/usbehci_new/hub_controller.cpp
View file

@ -799,7 +799,7 @@ CHubController::HandleBulkOrInterruptTransfer(
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:

10
drivers/usb/usbehci_new/usb_queue.cpp
View file

@ -98,7 +98,7 @@ CUSBQueue::Initialize(
{
NTSTATUS Status = STATUS_SUCCESS;
DPRINT1("CUSBQueue::Initialize()\n");
DPRINT("CUSBQueue::Initialize()\n");
ASSERT(Hardware);
@ -208,7 +208,7 @@ CUSBQueue::AddUSBRequest(
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 @@ CUSBQueue::ProcessAsyncList(
//
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 @@ CUSBQueue::InterruptCallback(
OUT PULONG ShouldRingDoorBell)
{
DPRINT1("CUSBQueue::InterruptCallback\n");
DPRINT("CUSBQueue::InterruptCallback\n");
//
// iterate asynchronous list
@ -666,7 +666,7 @@ CUSBQueue::CompleteAsyncRequests()
PLIST_ENTRY Entry;
PQUEUE_HEAD CurrentQH;
DPRINT1("CUSBQueue::CompleteAsyncRequests\n");
DPRINT("CUSBQueue::CompleteAsyncRequests\n");
//
// first acquire request lock

24
drivers/usb/usbehci_new/usb_request.cpp
View file

@ -261,7 +261,7 @@ CUSBRequest::InitializeWithIrp(
//
// 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 @@ CUSBRequest::CompletionCallback(
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 @@ CUSBRequest::IsRequestComplete()
//
// FIXME: check if request was split
//
UNIMPLEMENTED
return TRUE;
}
//----------------------------------------------------------------------------------------
@ -790,12 +789,12 @@ CUSBRequest::BuildBulkTransferQueueHead(
PC_ASSERT(Base);
DPRINT1("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress);
DPRINT1("EndPointDirection %x\n", USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress));
DPRINT("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress);
DPRINT("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("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 @@ CUSBRequest::BuildBulkTransferQueueHead(
//
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 @@ CUSBRequest::BuildBulkTransferQueueHead(
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 @@ CUSBRequest::BuildBulkTransferQueueHead(
//
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 @@ CUSBRequest::BuildBulkTransferQueueHead(
//
// 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 @@ CUSBRequest::FreeQueueHead(
//
// 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;
}

2
drivers/usb/usbehci_new/usbehci.h
View file

@ -2,7 +2,7 @@
#define USBEHCI_H__
#include <ntddk.h>
#define YDEBUG
#define NDEBUG
#include <debug.h>
#include <hubbusif.h>
#include <usbbusif.h>