Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 18:35:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HIDCLASS][HIDPARSE][HIDUSB][KBDHID][MOUHID][USBCCGP][USBD][USBEHCI][USBOHCI][USBHUB][USBSTOR]

Browse source 
- Massive debug spam reduction

svn path=/branches/usb-bringup-trunk/; revision=55553
This commit is contained in:
Cameron Gutman 2012-02-12 02:53:34 +00:00
parent 68c1c7661e
commit 50daddc967
35 changed files with 245 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/hid/hidclass/fdo.c
View file

@ -183,7 +183,7 @@ HidClassFDO_DispatchRequestSynchronous(
// //
// call driver // call driver
// //
DPRINT1("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); DPRINT("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction);
Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp);
// //

6
drivers/hid/hidclass/hidclass.c
View file

@ -177,9 +177,9 @@ HidClass_Create(
// //
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("ShareAccess %x\n", IoStack->Parameters.Create.ShareAccess); DPRINT("ShareAccess %x\n", IoStack->Parameters.Create.ShareAccess);
DPRINT1("Options %x\n", IoStack->Parameters.Create.Options); DPRINT("Options %x\n", IoStack->Parameters.Create.Options);
DPRINT1("DesiredAccess %x\n", IoStack->Parameters.Create.SecurityContext->DesiredAccess); DPRINT("DesiredAccess %x\n", IoStack->Parameters.Create.SecurityContext->DesiredAccess);
// //
// allocate context // allocate context

6
drivers/hid/hidclass/pdo.c
View file

@ -131,7 +131,7 @@ HidClassPDO_HandleQueryDeviceId(
// //
// store result // store result
// //
DPRINT1("NewBuffer %S\n", NewBuffer); DPRINT("NewBuffer %S\n", NewBuffer);
Irp->IoStatus.Information = (ULONG_PTR)NewBuffer; Irp->IoStatus.Information = (ULONG_PTR)NewBuffer;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -510,14 +510,14 @@ HidClassPDO_PnP(
// now register the device interface // now register the device interface
// //
Status = IoRegisterDeviceInterface(PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject, &GUID_DEVINTERFACE_HID, NULL, &PDODeviceExtension->DeviceInterface); Status = IoRegisterDeviceInterface(PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject, &GUID_DEVINTERFACE_HID, NULL, &PDODeviceExtension->DeviceInterface);
DPRINT1("[HIDCLASS] IoRegisterDeviceInterfaceState Status %x\n", Status); DPRINT("[HIDCLASS] IoRegisterDeviceInterfaceState Status %x\n", Status);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
// //
// enable device interface // enable device interface
// //
Status = IoSetDeviceInterfaceState(&PDODeviceExtension->DeviceInterface, TRUE); Status = IoSetDeviceInterfaceState(&PDODeviceExtension->DeviceInterface, TRUE);
DPRINT1("[HIDCLASS] IoSetDeviceInterFaceState %x\n", Status); DPRINT("[HIDCLASS] IoSetDeviceInterFaceState %x\n", Status);
} }
// //

2
drivers/hid/hidparse/hidparse.c
View file

@ -640,6 +640,6 @@ DriverEntry(
IN PUNICODE_STRING RegPath) IN PUNICODE_STRING RegPath)
{ {
DPRINT1("********* HID PARSE *********\n"); DPRINT("********* HID PARSE *********\n");
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

30
drivers/hid/hidusb/hidusb.c
View file

@ -305,7 +305,7 @@ HidCreate(
// //
// informal debug print // informal debug print
// //
DPRINT1("HIDUSB Request: %x\n", IoStack->MajorFunction); DPRINT("HIDUSB Request: %x\n", IoStack->MajorFunction);
// //
// done // done
@ -324,7 +324,7 @@ HidUsb_ResetWorkerRoutine(
PHID_USB_RESET_CONTEXT ResetContext; PHID_USB_RESET_CONTEXT ResetContext;
PHID_DEVICE_EXTENSION DeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension;
DPRINT1("[HIDUSB] ResetWorkerRoutine\n"); DPRINT("[HIDUSB] ResetWorkerRoutine\n");
// //
// get context // get context
@ -340,7 +340,7 @@ HidUsb_ResetWorkerRoutine(
// get port status // get port status
// //
Status = HidUsb_GetPortStatus(ResetContext->DeviceObject, &PortStatus); Status = HidUsb_GetPortStatus(ResetContext->DeviceObject, &PortStatus);
DPRINT1("[HIDUSB] ResetWorkerRoutine GetPortStatus %x PortStatus %x\n", Status, PortStatus); DPRINT("[HIDUSB] ResetWorkerRoutine GetPortStatus %x PortStatus %x\n", Status, PortStatus);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
if (!(PortStatus & USB_PORT_STATUS_ENABLE)) if (!(PortStatus & USB_PORT_STATUS_ENABLE))
@ -661,7 +661,7 @@ HidUsb_GetReportDescriptor(
// get current stack location // get current stack location
// //
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("[HIDUSB] GetReportDescriptor: Status %x ReportLength %lu OutputBufferLength %lu TransferredLength %lu\n", Status, HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, BufferLength); DPRINT("[HIDUSB] GetReportDescriptor: Status %x ReportLength %lu OutputBufferLength %lu TransferredLength %lu\n", Status, HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, BufferLength);
// //
// get length to copy // get length to copy
@ -727,7 +727,7 @@ HidInternalDeviceControl(
// //
// store result // store result
// //
DPRINT1("[HIDUSB] IOCTL_HID_GET_DEVICE_ATTRIBUTES\n"); DPRINT("[HIDUSB] IOCTL_HID_GET_DEVICE_ATTRIBUTES\n");
ASSERT(HidDeviceExtension->DeviceDescriptor); ASSERT(HidDeviceExtension->DeviceDescriptor);
Irp->IoStatus.Information = sizeof(HID_DESCRIPTOR); Irp->IoStatus.Information = sizeof(HID_DESCRIPTOR);
Attributes = (PHID_DEVICE_ATTRIBUTES)Irp->UserBuffer; Attributes = (PHID_DEVICE_ATTRIBUTES)Irp->UserBuffer;
@ -749,7 +749,7 @@ HidInternalDeviceControl(
// sanity check // sanity check
// //
ASSERT(HidDeviceExtension->HidDescriptor); ASSERT(HidDeviceExtension->HidDescriptor);
DPRINT1("[HIDUSB] IOCTL_HID_GET_DEVICE_DESCRIPTOR DescriptorLength %lu OutputBufferLength %lu\n", HidDeviceExtension->HidDescriptor->bLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); DPRINT("[HIDUSB] IOCTL_HID_GET_DEVICE_DESCRIPTOR DescriptorLength %lu OutputBufferLength %lu\n", HidDeviceExtension->HidDescriptor->bLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength);
// //
// store length // store length
@ -774,7 +774,7 @@ HidInternalDeviceControl(
case IOCTL_HID_GET_REPORT_DESCRIPTOR: case IOCTL_HID_GET_REPORT_DESCRIPTOR:
{ {
Status = HidUsb_GetReportDescriptor(DeviceObject, Irp); Status = HidUsb_GetReportDescriptor(DeviceObject, Irp);
DPRINT1("[HIDUSB] IOCTL_HID_GET_REPORT_DESCRIPTOR Status %x\n", Status); DPRINT("[HIDUSB] IOCTL_HID_GET_REPORT_DESCRIPTOR Status %x\n", Status);
Irp->IoStatus.Status = Status; Irp->IoStatus.Status = Status;
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
return Status; return Status;
@ -1000,7 +1000,7 @@ Hid_DispatchUrb(
Status = IoStatus.Status; Status = IoStatus.Status;
} }
DPRINT1("[HIDUSB] DispatchUrb %x\n", Status); DPRINT("[HIDUSB] DispatchUrb %x\n", Status);
// //
@ -1291,7 +1291,7 @@ Hid_SetIdle(
// //
// print status // print status
// //
DPRINT1("Status %x\n", Status); DPRINT("Status %x\n", Status);
return Status; return Status;
} }
@ -1358,7 +1358,7 @@ Hid_GetProtocol(
// //
// print status // print status
// //
DPRINT1("Status %x Protocol %x\n", Status, Protocol[0] & 0xFF); DPRINT("Status %x Protocol %x\n", Status, Protocol[0] & 0xFF);
// //
// assert when boot protocol is still active // assert when boot protocol is still active
@ -1501,7 +1501,7 @@ Hid_PnpStart(
// //
// done // done
// //
DPRINT1("[HIDUSB] SelectConfiguration %x\n", Status); DPRINT("[HIDUSB] SelectConfiguration %x\n", Status);
return Status; return Status;
} }
@ -1536,7 +1536,7 @@ HidPnp(
// get current stack location // get current stack location
// //
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("[HIDUSB] Pnp %x\n", IoStack->MinorFunction); DPRINT("[HIDUSB] Pnp %x\n", IoStack->MinorFunction);
// //
// handle requests based on request type // handle requests based on request type
@ -1714,7 +1714,7 @@ HidPnp(
// complete request // complete request
// //
Irp->IoStatus.Status = Status; Irp->IoStatus.Status = Status;
DPRINT1("[HIDUSB] IRP_MN_START_DEVICE Status %x\n", Status); DPRINT("[HIDUSB] IRP_MN_START_DEVICE Status %x\n", Status);
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
return Status; return Status;
} }
@ -1807,8 +1807,8 @@ DriverEntry(
// //
// informal debug // informal debug
// //
DPRINT1("********* HIDUSB *********\n"); DPRINT("********* HIDUSB *********\n");
DPRINT1("HIDUSB Registration Status %x\n", Status); DPRINT("HIDUSB Registration Status %x\n", Status);
return Status; return Status;
} }

18
drivers/hid/kbdhid/kbdhid.c
View file

@ -51,7 +51,7 @@ KbdHid_InsertScanCodes(
for(Index = 0; Index < Length; Index++) for(Index = 0; Index < Length; Index++)
{ {
DPRINT1("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF); DPRINT("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF);
/* init input data */ /* init input data */
RtlZeroMemory(&InputData, sizeof(KEYBOARD_INPUT_DATA)); RtlZeroMemory(&InputData, sizeof(KEYBOARD_INPUT_DATA));
@ -114,7 +114,7 @@ KbdHid_ReadCompletion(
// print out raw report // print out raw report
// //
ASSERT(DeviceExtension->ReportLength >= 9); ASSERT(DeviceExtension->ReportLength >= 9);
DPRINT1("[KBDHID] ReadCompletion %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", DeviceExtension->Report[0], DeviceExtension->Report[1], DeviceExtension->Report[2], DPRINT("[KBDHID] ReadCompletion %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", DeviceExtension->Report[0], DeviceExtension->Report[1], DeviceExtension->Report[2],
DeviceExtension->Report[3], DeviceExtension->Report[4], DeviceExtension->Report[5], DeviceExtension->Report[3], DeviceExtension->Report[4], DeviceExtension->Report[5],
DeviceExtension->Report[6], DeviceExtension->Report[7], DeviceExtension->Report[8]); DeviceExtension->Report[6], DeviceExtension->Report[7], DeviceExtension->Report[8]);
@ -207,7 +207,7 @@ KbdHid_Create(
KEVENT Event; KEVENT Event;
PKBDHID_DEVICE_EXTENSION DeviceExtension; PKBDHID_DEVICE_EXTENSION DeviceExtension;
DPRINT1("[KBDHID]: IRP_MJ_CREATE\n"); DPRINT("[KBDHID]: IRP_MJ_CREATE\n");
/* get device extension */ /* get device extension */
DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
@ -256,7 +256,7 @@ KbdHid_Create(
/* initiating read */ /* initiating read */
Status = KbdHid_InitiateRead(DeviceExtension); Status = KbdHid_InitiateRead(DeviceExtension);
DPRINT1("[KBDHID] KbdHid_InitiateRead: status %x\n", Status); DPRINT("[KBDHID] KbdHid_InitiateRead: status %x\n", Status);
if (Status == STATUS_PENDING) if (Status == STATUS_PENDING)
{ {
/* report irp is pending */ /* report irp is pending */
@ -323,7 +323,7 @@ KbdHid_InternalDeviceControl(
/* get current stack location */ /* get current stack location */
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("[KBDHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); DPRINT("[KBDHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode);
/* get device extension */ /* get device extension */
DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
@ -622,7 +622,7 @@ KbdHid_StartDevice(
return Status; return Status;
} }
DPRINT1("[KBDHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); DPRINT("[KBDHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength);
/* init input report*/ /* init input report*/
DeviceExtension->ReportLength = Capabilities.InputReportByteLength; DeviceExtension->ReportLength = Capabilities.InputReportByteLength;
@ -640,7 +640,7 @@ KbdHid_StartDevice(
/* get max number of buttons */ /* get max number of buttons */
Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_KEYBOARD, PreparsedData); Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_KEYBOARD, PreparsedData);
DPRINT1("[KBDHID] Buttons %lu\n", Buttons); DPRINT("[KBDHID] Buttons %lu\n", Buttons);
ASSERT(Buttons > 0); ASSERT(Buttons > 0);
/* now allocate an array for those buttons */ /* now allocate an array for those buttons */
@ -735,7 +735,7 @@ KbdHid_Pnp(
/* get current irp stack */ /* get current irp stack */
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("[KBDHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); DPRINT("[KBDHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction);
if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE ||
IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE ||
@ -803,7 +803,7 @@ KbdHid_Pnp(
/* lets start the device */ /* lets start the device */
Status = KbdHid_StartDevice(DeviceObject); Status = KbdHid_StartDevice(DeviceObject);
DPRINT1("KbdHid_StartDevice %x\n", Status); DPRINT("KbdHid_StartDevice %x\n", Status);
/* complete request */ /* complete request */
Irp->IoStatus.Status = Status; Irp->IoStatus.Status = Status;

26
drivers/hid/mouhid/mouhid.c
View file

@ -298,7 +298,7 @@ MouHid_Create(
KEVENT Event; KEVENT Event;
PMOUHID_DEVICE_EXTENSION DeviceExtension; PMOUHID_DEVICE_EXTENSION DeviceExtension;
DPRINT1("MOUHID: IRP_MJ_CREATE\n"); DPRINT("MOUHID: IRP_MJ_CREATE\n");
/* get device extension */ /* get device extension */
DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
@ -347,7 +347,7 @@ MouHid_Create(
/* initiating read */ /* initiating read */
Status = MouHid_InitiateRead(DeviceExtension); Status = MouHid_InitiateRead(DeviceExtension);
DPRINT1("[MOUHID] MouHid_InitiateRead: status %x\n", Status); DPRINT("[MOUHID] MouHid_InitiateRead: status %x\n", Status);
if (Status == STATUS_PENDING) if (Status == STATUS_PENDING)
{ {
/* report irp is pending */ /* report irp is pending */
@ -414,7 +414,7 @@ MouHid_InternalDeviceControl(
/* get current stack location */ /* get current stack location */
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("[MOUHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); DPRINT("[MOUHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode);
/* get device extension */ /* get device extension */
DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
@ -447,10 +447,10 @@ MouHid_InternalDeviceControl(
/* queue length */ /* queue length */
Attributes->InputDataQueueLength = 2; Attributes->InputDataQueueLength = 2;
DPRINT1("[MOUHID] MouseIdentifier %x\n", Attributes->MouseIdentifier); DPRINT("[MOUHID] MouseIdentifier %x\n", Attributes->MouseIdentifier);
DPRINT1("[MOUHID] NumberOfButtons %x\n", Attributes->NumberOfButtons); DPRINT("[MOUHID] NumberOfButtons %x\n", Attributes->NumberOfButtons);
DPRINT1("[MOUHID] SampleRate %x\n", Attributes->SampleRate); DPRINT("[MOUHID] SampleRate %x\n", Attributes->SampleRate);
DPRINT1("[MOUHID] InputDataQueueLength %x\n", Attributes->InputDataQueueLength); DPRINT("[MOUHID] InputDataQueueLength %x\n", Attributes->InputDataQueueLength);
/* complete request */ /* complete request */
Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES);
@ -645,7 +645,7 @@ MouHid_StartDevice(
return Status; return Status;
} }
DPRINT1("[MOUHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); DPRINT("[MOUHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength);
/* verify capabilities */ /* verify capabilities */
if ((Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE) || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC) if ((Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE) || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC)
@ -671,7 +671,7 @@ MouHid_StartDevice(
/* get max number of buttons */ /* get max number of buttons */
Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData); Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData);
DPRINT1("[MOUHID] Buttons %lu\n", Buttons); DPRINT("[MOUHID] Buttons %lu\n", Buttons);
ASSERT(Buttons > 0); ASSERT(Buttons > 0);
/* now allocate an array for those buttons */ /* now allocate an array for those buttons */
@ -713,7 +713,7 @@ MouHid_StartDevice(
/* mouse has wheel support */ /* mouse has wheel support */
DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE;
DeviceExtension->WheelUsagePage = ValueCaps.UsagePage; DeviceExtension->WheelUsagePage = ValueCaps.UsagePage;
DPRINT1("[MOUHID] mouse wheel support detected\n", Status); DPRINT("[MOUHID] mouse wheel support detected\n", Status);
} }
else else
{ {
@ -725,7 +725,7 @@ MouHid_StartDevice(
/* wheel support */ /* wheel support */
DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE;
DeviceExtension->WheelUsagePage = ValueCaps.UsagePage; DeviceExtension->WheelUsagePage = ValueCaps.UsagePage;
DPRINT1("[MOUHID] mouse wheel support detected with z-axis\n", Status); DPRINT("[MOUHID] mouse wheel support detected with z-axis\n", Status);
} }
} }
@ -786,7 +786,7 @@ MouHid_Pnp(
/* get current irp stack */ /* get current irp stack */
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("[MOUHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); DPRINT("[MOUHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction);
if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE ||
IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE ||
@ -867,7 +867,7 @@ MouHid_Pnp(
/* lets start the device */ /* lets start the device */
Status = MouHid_StartDevice(DeviceObject); Status = MouHid_StartDevice(DeviceObject);
DPRINT1("MouHid_StartDevice %x\n", Status); DPRINT("MouHid_StartDevice %x\n", Status);
/* complete request */ /* complete request */
Irp->IoStatus.Status = Status; Irp->IoStatus.Status = Status;

8
drivers/usb/usbccgp/fdo.c
View file

@ -404,7 +404,7 @@ FDO_StartDevice(
// //
// done // done
// //
DPRINT1("[USBCCGP] FDO initialized successfully\n"); DPRINT("[USBCCGP] FDO initialized successfully\n");
return Status; return Status;
} }
@ -424,7 +424,7 @@ FDO_HandlePnp(
// get stack location // get stack location
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("[USBCCGP] PnP Minor %x\n", IoStack->MinorFunction); DPRINT("[USBCCGP] PnP Minor %x\n", IoStack->MinorFunction);
switch(IoStack->MinorFunction) switch(IoStack->MinorFunction)
{ {
case IRP_MN_REMOVE_DEVICE: case IRP_MN_REMOVE_DEVICE:
@ -536,7 +536,7 @@ FDO_HandleResetCyclePort(
// get stack location // get stack location
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("FDO_HandleResetCyclePort IOCTL %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); DPRINT("FDO_HandleResetCyclePort IOCTL %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode);
if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_RESET_PORT) if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_RESET_PORT)
{ {
@ -671,7 +671,7 @@ FDO_HandleInternalDeviceControl(
// handle reset / cycle ports // handle reset / cycle ports
// //
Status = FDO_HandleResetCyclePort(DeviceObject, Irp); Status = FDO_HandleResetCyclePort(DeviceObject, Irp);
DPRINT1("FDO_HandleResetCyclePort Status %x\n", Status); DPRINT("FDO_HandleResetCyclePort Status %x\n", Status);
if (Status != STATUS_PENDING) if (Status != STATUS_PENDING)
{ {
// //

8
drivers/usb/usbccgp/function.c
View file

@ -131,7 +131,7 @@ USBCCGP_CustomEnumWithInterface(
DeviceObject, DeviceObject,
FDODeviceExtension->PhysicalDeviceObject); FDODeviceExtension->PhysicalDeviceObject);
DPRINT1("USBCCGP_CustomEnumWithInterface Status %x\n", Status); DPRINT("USBCCGP_CustomEnumWithInterface Status %x\n", Status);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
// //
@ -140,8 +140,8 @@ USBCCGP_CustomEnumWithInterface(
return Status; return Status;
} }
DPRINT1("FunctionDescriptorBufferLength %lu\n", FunctionDescriptorBufferLength); DPRINT("FunctionDescriptorBufferLength %lu\n", FunctionDescriptorBufferLength);
DPRINT1("FunctionDescriptorBuffer %p\n", FunctionDescriptorBuffer); DPRINT("FunctionDescriptorBuffer %p\n", FunctionDescriptorBuffer);
// //
// assume length % function buffer size // assume length % function buffer size
@ -777,7 +777,7 @@ USBCCGP_EnumWithAudioLegacy(
// //
// this is an composite audio device // this is an composite audio device
// //
DPRINT1("[USBCCGP] Audio Composite Device detected\n"); DPRINT("[USBCCGP] Audio Composite Device detected\n");
// //
// audio interfaces are all grouped into one single function // audio interfaces are all grouped into one single function

12
drivers/usb/usbccgp/pdo.c
View file

@ -75,7 +75,7 @@ USBCCGP_PdoHandleDeviceRelations(
PDEVICE_RELATIONS DeviceRelations; PDEVICE_RELATIONS DeviceRelations;
PIO_STACK_LOCATION IoStack; PIO_STACK_LOCATION IoStack;
DPRINT1("USBCCGP_PdoHandleDeviceRelations\n"); DPRINT("USBCCGP_PdoHandleDeviceRelations\n");
// //
// get current irp stack location // get current irp stack location
@ -165,7 +165,7 @@ USBCCGP_PdoAppendInterfaceNumber(
{ {
StringLength = swprintf(String, L"%s&MI_%02x", DeviceId) + 1; StringLength = swprintf(String, L"%s&MI_%02x", DeviceId) + 1;
Length = wcslen(DeviceId) + 1; Length = wcslen(DeviceId) + 1;
DPRINT1("String %p\n", String); DPRINT("String %p\n", String);
// //
// next string // next string
@ -222,7 +222,7 @@ USBCCGP_PdoHandleQueryId(
// //
ASSERT(Irp->IoStatus.Information); ASSERT(Irp->IoStatus.Information);
swprintf(Buffer, L"%s&MI_%02x", (LPWSTR)Irp->IoStatus.Information, PDODeviceExtension->FunctionDescriptor->FunctionNumber); swprintf(Buffer, L"%s&MI_%02x", (LPWSTR)Irp->IoStatus.Information, PDODeviceExtension->FunctionDescriptor->FunctionNumber);
DPRINT1("BusQueryDeviceID %S\n", Buffer); DPRINT("BusQueryDeviceID %S\n", Buffer);
ExFreePool((PVOID)Irp->IoStatus.Information); ExFreePool((PVOID)Irp->IoStatus.Information);
Irp->IoStatus .Information = (ULONG_PTR)Buffer; Irp->IoStatus .Information = (ULONG_PTR)Buffer;
@ -410,7 +410,7 @@ PDO_HandlePnp(
// //
// no-op for PDO // no-op for PDO
// //
DPRINT1("[USBCCGP] PDO IRP_MN_START\n"); DPRINT("[USBCCGP] PDO IRP_MN_START\n");
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
break; break;
} }
@ -466,7 +466,7 @@ USBCCGP_BuildConfigurationDescriptor(
// //
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("USBCCGP_BuildConfigurationDescriptor\n"); DPRINT("USBCCGP_BuildConfigurationDescriptor\n");
// //
// get device extension // get device extension
@ -694,7 +694,7 @@ USBCCGP_PDOSelectConfiguration(
InterfaceInformation = &Urb->UrbSelectConfiguration.Interface; InterfaceInformation = &Urb->UrbSelectConfiguration.Interface;
Index = 0; Index = 0;
Entry = NULL; Entry = NULL;
DPRINT1("Count %x\n", InterfaceInformationCount); DPRINT("Count %x\n", InterfaceInformationCount);
do do
{ {
DPRINT1("[USBCCGP] SelectConfiguration Function %x InterfaceNumber %x Alternative %x\n", PDODeviceExtension->FunctionDescriptor->FunctionNumber, InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting); DPRINT1("[USBCCGP] SelectConfiguration Function %x InterfaceNumber %x Alternative %x\n", PDODeviceExtension->FunctionDescriptor->FunctionNumber, InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting);

2
drivers/usb/usbccgp/usbccgp.c
View file

@ -140,7 +140,7 @@ DriverEntry(
{ {
// initialize driver object // initialize driver object
DPRINT1("[USBCCGP] DriverEntry\n"); DPRINT("[USBCCGP] DriverEntry\n");
DriverObject->DriverExtension->AddDevice = USBCCGP_AddDevice; DriverObject->DriverExtension->AddDevice = USBCCGP_AddDevice;
DriverObject->MajorFunction[IRP_MJ_CREATE] = USBCCGP_Dispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBCCGP_Dispatch;
DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBCCGP_Dispatch; DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBCCGP_Dispatch;

2
drivers/usb/usbd/usbd.c
View file

@ -440,7 +440,7 @@ USBD_ParseDescriptors(
if ((ULONG_PTR)CommonDescriptor >= ((ULONG_PTR)DescriptorBuffer + TotalLength)) if ((ULONG_PTR)CommonDescriptor >= ((ULONG_PTR)DescriptorBuffer + TotalLength))
{ {
/* end reached */ /* end reached */
DPRINT1("End reached %p\n", CommonDescriptor); DPRINT("End reached %p\n", CommonDescriptor);
return NULL; return NULL;
} }

22
drivers/usb/usbehci/hardware.cpp
View file

@ -163,7 +163,7 @@ CUSBHardwareDevice::Initialize(
NTSTATUS Status; NTSTATUS Status;
ULONG BytesRead; ULONG BytesRead;
DPRINT1("CUSBHardwareDevice::Initialize\n"); DPRINT("CUSBHardwareDevice::Initialize\n");
// //
// Create DMAMemoryManager for use with QueueHeads and Transfer Descriptors. // Create DMAMemoryManager for use with QueueHeads and Transfer Descriptors.
@ -306,7 +306,7 @@ CUSBHardwareDevice::PnpStart(
UCHAR Value; UCHAR Value;
UCHAR PortCount; UCHAR PortCount;
DPRINT1("CUSBHardwareDevice::PnpStart\n"); DPRINT("CUSBHardwareDevice::PnpStart\n");
for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++) for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++)
{ {
// //
@ -680,7 +680,7 @@ CUSBHardwareDevice::StartController(void)
if ((UsbSts & (EHCI_STS_PSS | EHCI_STS_ASS))) if ((UsbSts & (EHCI_STS_PSS | EHCI_STS_ASS)))
{ {
DPRINT1("Failed to stop running schedules %x\n", UsbSts); DPRINT1("Failed to stop running schedules %x\n", UsbSts);
ASSERT(FALSE); //ASSERT(FALSE);
} }
@ -767,14 +767,14 @@ CUSBHardwareDevice::StartController(void)
if (UsbSts & EHCI_STS_HALT) if (UsbSts & EHCI_STS_HALT)
{ {
DPRINT1("Could not start execution on the controller\n"); DPRINT1("Could not start execution on the controller\n");
ASSERT(FALSE); //ASSERT(FALSE);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
if (!(UsbSts & EHCI_STS_PSS)) if (!(UsbSts & EHCI_STS_PSS))
{ {
DPRINT1("Could not enable periodic scheduling\n"); DPRINT1("Could not enable periodic scheduling\n");
ASSERT(FALSE); //ASSERT(FALSE);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
@ -815,7 +815,7 @@ CUSBHardwareDevice::StartController(void)
if (!(UsbSts & EHCI_STS_ASS)) if (!(UsbSts & EHCI_STS_ASS))
{ {
DPRINT1("Failed to enable async schedule UsbSts %x\n", UsbSts); DPRINT1("Failed to enable async schedule UsbSts %x\n", UsbSts);
ASSERT(FALSE); //ASSERT(FALSE);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
@ -996,7 +996,11 @@ CUSBHardwareDevice::ResetPort(
// //
// this must be enabled now // this must be enabled now
// //
ASSERT(PortStatus & EHCI_PRT_ENABLED); if (PortStatus & EHCI_PRT_ENABLED)
{
DPRINT1("Port is not enabled after reset\n");
//ASSERT(FALSE);
}
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -1281,7 +1285,7 @@ InterruptServiceRoutine(
CStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); CStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_USBSTS);
CStatus &= (EHCI_ERROR_INT | EHCI_STS_INT | EHCI_STS_IAA | EHCI_STS_PCD | EHCI_STS_FLR); CStatus &= (EHCI_ERROR_INT | EHCI_STS_INT | EHCI_STS_IAA | EHCI_STS_PCD | EHCI_STS_FLR);
DPRINT1("CStatus %x\n", CStatus); DPRINT("CStatus %x\n", CStatus);
// //
// Check that it belongs to EHCI // Check that it belongs to EHCI
@ -1350,7 +1354,7 @@ EhciDefferedRoutine(
// controller reported error // controller reported error
// //
DPRINT1("CStatus %x\n", CStatus); DPRINT1("CStatus %x\n", CStatus);
ASSERT(FALSE); //ASSERT(FALSE);
} }
// //

12
drivers/usb/usbehci/hcd_controller.cpp
View file

@ -394,7 +394,7 @@ CHCDController::HandlePnp(
{ {
case IRP_MN_START_DEVICE: case IRP_MN_START_DEVICE:
{ {
DPRINT1("CHCDController::HandlePnp IRP_MN_START FDO\n"); DPRINT("CHCDController::HandlePnp IRP_MN_START FDO\n");
// //
// first start lower device object // first start lower device object
@ -423,12 +423,12 @@ CHCDController::HandlePnp(
Status = SetSymbolicLink(TRUE); Status = SetSymbolicLink(TRUE);
} }
DPRINT1("CHCDController::HandlePnp IRP_MN_START FDO: Status %x\n", Status); DPRINT("CHCDController::HandlePnp IRP_MN_START FDO: Status %x\n", Status);
break; break;
} }
case IRP_MN_QUERY_DEVICE_RELATIONS: case IRP_MN_QUERY_DEVICE_RELATIONS:
{ {
DPRINT1("CHCDController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type); DPRINT("CHCDController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type);
if (m_HubController == NULL) if (m_HubController == NULL)
{ {
@ -508,7 +508,7 @@ CHCDController::HandlePnp(
} }
case IRP_MN_STOP_DEVICE: case IRP_MN_STOP_DEVICE:
{ {
DPRINT1("CHCDController::HandlePnp IRP_MN_STOP_DEVICE\n"); DPRINT("CHCDController::HandlePnp IRP_MN_STOP_DEVICE\n");
if (m_Hardware) if (m_Hardware)
{ {
@ -550,7 +550,7 @@ CHCDController::HandlePnp(
} }
case IRP_MN_REMOVE_DEVICE: case IRP_MN_REMOVE_DEVICE:
{ {
DPRINT1("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); DPRINT("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n");
// //
// delete the symbolic link // delete the symbolic link
@ -673,7 +673,7 @@ CHCDController::CreateFDO(
// //
m_FDODeviceNumber = UsbDeviceNumber; m_FDODeviceNumber = UsbDeviceNumber;
DPRINT1("CreateFDO: DeviceName %wZ\n", &DeviceName); DPRINT("CreateFDO: DeviceName %wZ\n", &DeviceName);
/* done */ /* done */
return Status; return Status;

20
drivers/usb/usbehci/hub_controller.cpp
View file

@ -430,7 +430,7 @@ CHubController::HandlePnp(
{ {
case IRP_MN_START_DEVICE: case IRP_MN_START_DEVICE:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_START_DEVICE\n"); DPRINT("CHubController::HandlePnp IRP_MN_START_DEVICE\n");
// //
// register device interface // register device interface
// //
@ -448,7 +448,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_QUERY_ID: case IRP_MN_QUERY_ID:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType); DPRINT("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType);
if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID)
{ {
@ -474,7 +474,7 @@ CHubController::HandlePnp(
swprintf(Buffer, L"USB\\ROOT_HUB"); swprintf(Buffer, L"USB\\ROOT_HUB");
} }
DPRINT1("Name %S\n", Buffer); DPRINT("Name %S\n", Buffer);
// //
// calculate length // calculate length
@ -585,7 +585,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_QUERY_CAPABILITIES: case IRP_MN_QUERY_CAPABILITIES:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_CAPABILITIES\n"); DPRINT("CHubController::HandlePnp IRP_MN_QUERY_CAPABILITIES\n");
DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities;
@ -617,7 +617,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_QUERY_INTERFACE: case IRP_MN_QUERY_INTERFACE:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_INTERFACE\n"); DPRINT("CHubController::HandlePnp IRP_MN_QUERY_INTERFACE\n");
// //
// handle device interface requests // handle device interface requests
@ -627,7 +627,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_REMOVE_DEVICE: case IRP_MN_REMOVE_DEVICE:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_REMOVE_DEVICE\n"); DPRINT("CHubController::HandlePnp IRP_MN_REMOVE_DEVICE\n");
// //
// deactivate device interface for BUS PDO // deactivate device interface for BUS PDO
@ -657,7 +657,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_QUERY_DEVICE_RELATIONS: case IRP_MN_QUERY_DEVICE_RELATIONS:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); DPRINT("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type);
if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation)
{ {
@ -698,7 +698,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_QUERY_BUS_INFORMATION: case IRP_MN_QUERY_BUS_INFORMATION:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); DPRINT("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n");
// //
// allocate buffer for bus information // allocate buffer for bus information
@ -731,7 +731,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_STOP_DEVICE: case IRP_MN_STOP_DEVICE:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_STOP_DEVICE\n"); DPRINT("CHubController::HandlePnp IRP_MN_STOP_DEVICE\n");
// //
// stop device // stop device
// //
@ -847,7 +847,7 @@ CHubController::HandleBulkOrInterruptTransfer(
// //
// Else pend the IRP, to be completed when a device connects or disconnects. // Else pend the IRP, to be completed when a device connects or disconnects.
// //
DPRINT1("Pending SCE Irp\n");; DPRINT("Pending SCE Irp\n");
m_PendingSCEIrp = Irp; m_PendingSCEIrp = Irp;
IoMarkIrpPending(Irp); IoMarkIrpPending(Irp);
return STATUS_PENDING; return STATUS_PENDING;

2
drivers/usb/usbehci/usb_device.cpp
View file

@ -270,7 +270,7 @@ CUSBDevice::GetType()
} }
DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB);
PC_ASSERT(FALSE); //PC_ASSERT(FALSE);
return Usb11Device; return Usb11Device;
} }

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

@ -195,7 +195,7 @@ CUSBQueue::InitializeSyncSchedule(
// //
DPRINT1("Failed to allocate sync frame list\n"); DPRINT1("Failed to allocate sync frame list\n");
ExFreePool(m_SyncFrameListQueueHeads); ExFreePool(m_SyncFrameListQueueHeads);
ASSERT(FALSE); //ASSERT(FALSE);
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
} }
@ -800,7 +800,7 @@ CUSBQueue::QueueHeadCleanup(
return; return;
} }
DPRINT1("Unable to create a new QueueHead\n"); DPRINT1("Unable to create a new QueueHead\n");
PC_ASSERT(FALSE); //ASSERT(FALSE);
// //
// Else there was a problem // Else there was a problem
@ -808,7 +808,11 @@ CUSBQueue::QueueHeadCleanup(
UrbStatus = USBD_STATUS_INSUFFICIENT_RESOURCES; UrbStatus = USBD_STATUS_INSUFFICIENT_RESOURCES;
} }
if (UrbStatus != USBD_STATUS_SUCCESS) PC_ASSERT(FALSE); if (UrbStatus != USBD_STATUS_SUCCESS)
{
DPRINT1("URB failed with status 0x%x\n", UrbStatus);
//PC_ASSERT(FALSE);
}
// //
// notify request that a transfer has completed // notify request that a transfer has completed

6
drivers/usb/usbehci/usb_request.cpp
View file

@ -329,7 +329,7 @@ CUSBRequest::InitializeWithIrp(
} }
default: default:
DPRINT1("URB Function: not supported %x\n", Urb->UrbHeader.Function); DPRINT1("URB Function: not supported %x\n", Urb->UrbHeader.Function);
PC_ASSERT(FALSE); //ASSERT(FALSE);
} }
// //
@ -1014,7 +1014,7 @@ CUSBRequest::BuildControlTransferQueueHead(
// //
//DumpQueueHead(QueueHead); //DumpQueueHead(QueueHead);
DPRINT1("BuildControlTransferQueueHead done\n"); DPRINT("BuildControlTransferQueueHead done\n");
// //
// done // done
// //
@ -1711,7 +1711,7 @@ CUSBRequest::IsQueueHeadComplete(
// //
DPRINT1("Found halted queue head %p\n", QueueHead); DPRINT1("Found halted queue head %p\n", QueueHead);
DumpQueueHead(QueueHead); DumpQueueHead(QueueHead);
ASSERT(FALSE); //ASSERT(FALSE);
return TRUE; return TRUE;
} }

73
drivers/usb/usbhub/fdo.c
View file

@ -262,7 +262,7 @@ DeviceStatusChangeThread(
LONG PortId; LONG PortId;
BOOLEAN SignalResetComplete = FALSE; BOOLEAN SignalResetComplete = FALSE;
DPRINT1("Entered DeviceStatusChangeThread, Context %x\n", Context); DPRINT("Entered DeviceStatusChangeThread, Context %x\n", Context);
WorkItemData = (PWORK_ITEM_DATA)Context; WorkItemData = (PWORK_ITEM_DATA)Context;
DeviceObject = (PDEVICE_OBJECT)WorkItemData->Context; DeviceObject = (PDEVICE_OBJECT)WorkItemData->Context;
@ -418,7 +418,7 @@ DeviceStatusChangeThread(
// //
// Send another SCE Request // Send another SCE Request
// //
DPRINT1("Sending another SCE!\n"); DPRINT("Sending another SCE!\n");
QueryStatusChangeEndpoint(DeviceObject); QueryStatusChangeEndpoint(DeviceObject);
// //
@ -450,7 +450,7 @@ StatusChangeEndpointCompletion(
// //
// NOTE: USBPORT frees this IRP // NOTE: USBPORT frees this IRP
// //
DPRINT1("Received Irp %x, HubDeviceExtension->PendingSCEIrp %x\n", Irp, HubDeviceExtension->PendingSCEIrp); DPRINT("Received Irp %x, HubDeviceExtension->PendingSCEIrp %x\n", Irp, HubDeviceExtension->PendingSCEIrp);
//IoFreeIrp(Irp); //IoFreeIrp(Irp);
// //
@ -464,7 +464,7 @@ StatusChangeEndpointCompletion(
} }
WorkItemData->Context = RealDeviceObject; WorkItemData->Context = RealDeviceObject;
DPRINT1("Queuing work item\n"); DPRINT("Queuing work item\n");
// //
// Queue the work item to handle initializing the device // Queue the work item to handle initializing the device
@ -524,7 +524,7 @@ QueryStatusChangeEndpoint(
HubDeviceExtension->PendingSCEIrp = IoAllocateIrp(RootHubDeviceObject->StackSize, HubDeviceExtension->PendingSCEIrp = IoAllocateIrp(RootHubDeviceObject->StackSize,
FALSE); FALSE);
*/ */
DPRINT1("Allocated IRP %x\n", HubDeviceExtension->PendingSCEIrp); DPRINT("Allocated IRP %x\n", HubDeviceExtension->PendingSCEIrp);
if (!HubDeviceExtension->PendingSCEIrp) if (!HubDeviceExtension->PendingSCEIrp)
{ {
@ -567,8 +567,8 @@ QueryStatusChangeEndpoint(
// //
// Send to RootHub // Send to RootHub
// //
DPRINT1("DeviceObject is %x\n", DeviceObject); DPRINT("DeviceObject is %x\n", DeviceObject);
DPRINT1("Iocalldriver %x with irp %x\n", RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); DPRINT("Iocalldriver %x with irp %x\n", RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp);
Status = IoCallDriver(RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); Status = IoCallDriver(RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp);
return STATUS_PENDING; return STATUS_PENDING;
@ -791,13 +791,12 @@ GetUsbStringDescriptor(
ExFreePool(StringDesc); ExFreePool(StringDesc);
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
} }
DPRINT1("Buffer %p\n", Buffer); DPRINT("Buffer %p\n", Buffer);
RtlZeroMemory(Buffer, SizeNeeded); RtlZeroMemory(Buffer, SizeNeeded);
DPRINT1("Buffer %p\n", Buffer); DPRINT("SizeNeeded %lu\n", SizeNeeded);
DPRINT1("SizeNeeded %lu\n", SizeNeeded); DPRINT("Offset %lu\n", FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength));
DPRINT1("Offset %lu\n", FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); DPRINT("Length %lu\n", SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength));
DPRINT1("Length %lu\n", SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength));
// //
// Copy the string to destination // Copy the string to destination
@ -978,7 +977,7 @@ CreateDeviceIds(
UsbChildExtension->usCompatibleIds.Buffer = DeviceString; UsbChildExtension->usCompatibleIds.Buffer = DeviceString;
UsbChildExtension->usCompatibleIds.Length = Index * sizeof(WCHAR); UsbChildExtension->usCompatibleIds.Length = Index * sizeof(WCHAR);
UsbChildExtension->usCompatibleIds.MaximumLength = (Index + 1) * sizeof(WCHAR); UsbChildExtension->usCompatibleIds.MaximumLength = (Index + 1) * sizeof(WCHAR);
DPRINT1("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds); DPRINT("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds);
// //
// Construct DeviceId string // Construct DeviceId string
@ -1004,7 +1003,7 @@ CreateDeviceIds(
UsbChildExtension->usDeviceId.Buffer = DeviceString; UsbChildExtension->usDeviceId.Buffer = DeviceString;
UsbChildExtension->usDeviceId.Length = (Index-1) * sizeof(WCHAR); UsbChildExtension->usDeviceId.Length = (Index-1) * sizeof(WCHAR);
UsbChildExtension->usDeviceId.MaximumLength = Index * sizeof(WCHAR); UsbChildExtension->usDeviceId.MaximumLength = Index * sizeof(WCHAR);
DPRINT1("usDeviceId %wZ\n", &UsbChildExtension->usDeviceId); DPRINT("usDeviceId %wZ\n", &UsbChildExtension->usDeviceId);
// //
// Construct HardwareIds // Construct HardwareIds
@ -1037,7 +1036,7 @@ CreateDeviceIds(
UsbChildExtension->usHardwareIds.Buffer = DeviceString; UsbChildExtension->usHardwareIds.Buffer = DeviceString;
UsbChildExtension->usHardwareIds.Length = (Index + 1) * sizeof(WCHAR); UsbChildExtension->usHardwareIds.Length = (Index + 1) * sizeof(WCHAR);
UsbChildExtension->usHardwareIds.MaximumLength = (Index + 1) * sizeof(WCHAR); UsbChildExtension->usHardwareIds.MaximumLength = (Index + 1) * sizeof(WCHAR);
DPRINT1("usHardWareIds %wZ\n", &UsbChildExtension->usHardwareIds); DPRINT("usHardWareIds %wZ\n", &UsbChildExtension->usHardwareIds);
// //
// FIXME: Handle Lang ids // FIXME: Handle Lang ids
@ -1061,7 +1060,7 @@ CreateDeviceIds(
else else
{ {
UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length;
DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); DPRINT("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription);
} }
} }
@ -1082,7 +1081,7 @@ CreateDeviceIds(
} }
UsbChildExtension->usInstanceId.MaximumLength = UsbChildExtension->usInstanceId.Length; UsbChildExtension->usInstanceId.MaximumLength = UsbChildExtension->usInstanceId.Length;
DPRINT1("Usb InstanceId %wZ\n", &UsbChildExtension->usInstanceId); DPRINT("Usb InstanceId %wZ\n", &UsbChildExtension->usInstanceId);
} }
else else
{ {
@ -1104,7 +1103,7 @@ CreateDeviceIds(
RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR)); RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR));
UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR); UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR);
DPRINT1("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId); DPRINT("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId);
} }
return Status; return Status;
@ -1120,7 +1119,7 @@ DestroyUsbChildDeviceObject(
PDEVICE_OBJECT ChildDeviceObject = NULL; PDEVICE_OBJECT ChildDeviceObject = NULL;
ULONG Index = 0; ULONG Index = 0;
DPRINT1("Removing device on port %d (Child index: %d)\n", PortId, Index); DPRINT("Removing device on port %d (Child index: %d)\n", PortId, Index);
for (Index = 0; Index < USB_MAXCHILDREN; Index++) for (Index = 0; Index < USB_MAXCHILDREN; Index++)
{ {
@ -1185,7 +1184,7 @@ CreateUsbChildDeviceObject(
{ {
if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL) if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL)
{ {
DPRINT1("Found unused entry at %d\n", ChildDeviceCount); DPRINT("Found unused entry at %d\n", ChildDeviceCount);
break; break;
} }
} }
@ -1243,7 +1242,7 @@ CreateUsbChildDeviceObject(
return Status; return Status;
} }
DPRINT1("USBHUB: Created Device %x\n", NewChildDeviceObject); DPRINT("USBHUB: Created Device %x\n", NewChildDeviceObject);
break; break;
} }
@ -1281,7 +1280,7 @@ CreateUsbChildDeviceObject(
goto Cleanup; goto Cleanup;
} }
DPRINT1("Usb Device Handle %x\n", UsbChildExtension->UsbDeviceHandle); DPRINT("Usb Device Handle %x\n", UsbChildExtension->UsbDeviceHandle);
ConfigDescSize = sizeof(USB_CONFIGURATION_DESCRIPTOR); ConfigDescSize = sizeof(USB_CONFIGURATION_DESCRIPTOR);
DeviceDescSize = sizeof(USB_DEVICE_DESCRIPTOR); DeviceDescSize = sizeof(USB_DEVICE_DESCRIPTOR);
@ -1451,7 +1450,7 @@ RootHubInitCallbackFunction(
HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension;
DPRINT1("RootHubInitCallbackFunction Sending the initial SCE Request %x\n", DeviceObject); DPRINT("RootHubInitCallbackFunction Sending the initial SCE Request %x\n", DeviceObject);
// //
// Send the first SCE Request // Send the first SCE Request
@ -1524,7 +1523,7 @@ USBHUB_FdoHandlePnp(
PURB ConfigUrb = NULL; PURB ConfigUrb = NULL;
ULONG HubStatus; ULONG HubStatus;
DPRINT1("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n");
// //
// Allocated size including the sizeof USBD_INTERFACE_LIST_ENTRY // Allocated size including the sizeof USBD_INTERFACE_LIST_ENTRY
@ -1543,7 +1542,7 @@ USBHUB_FdoHandlePnp(
RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject;
ASSERT(HubDeviceExtension->RootHubPhysicalDeviceObject); ASSERT(HubDeviceExtension->RootHubPhysicalDeviceObject);
ASSERT(HubDeviceExtension->RootHubFunctionalDeviceObject); ASSERT(HubDeviceExtension->RootHubFunctionalDeviceObject);
DPRINT1("RootPdo %x, RootFdo %x\n", DPRINT("RootPdo %x, RootFdo %x\n",
HubDeviceExtension->RootHubPhysicalDeviceObject, HubDeviceExtension->RootHubPhysicalDeviceObject,
HubDeviceExtension->RootHubFunctionalDeviceObject); HubDeviceExtension->RootHubFunctionalDeviceObject);
@ -1670,7 +1669,7 @@ USBHUB_FdoHandlePnp(
sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR),
NULL); NULL);
DPRINT1("RootHub Handle %x\n", HubDeviceExtension->RootHubHandle); DPRINT("RootHub Handle %x\n", HubDeviceExtension->RootHubHandle);
Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle;
Status = SubmitRequestToRootHub(RootHubDeviceObject, Status = SubmitRequestToRootHub(RootHubDeviceObject,
@ -1782,7 +1781,7 @@ USBHUB_FdoHandlePnp(
HubDeviceExtension->ConfigurationHandle = ConfigUrb->UrbSelectConfiguration.ConfigurationHandle; HubDeviceExtension->ConfigurationHandle = ConfigUrb->UrbSelectConfiguration.ConfigurationHandle;
HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle;
DPRINT1("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); DPRINT("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle);
// //
// check if function is available // check if function is available
@ -1799,7 +1798,7 @@ USBHUB_FdoHandlePnp(
// //
Status = HubDeviceExtension->HubInterface.Initialize20Hub(HubInterfaceBusContext, Status = HubDeviceExtension->HubInterface.Initialize20Hub(HubInterfaceBusContext,
HubDeviceExtension->RootHubHandle, 1); HubDeviceExtension->RootHubHandle, 1);
DPRINT1("Status %x\n", Status); DPRINT("Status %x\n", Status);
// //
// FIXME handle error // FIXME handle error
@ -1814,7 +1813,7 @@ USBHUB_FdoHandlePnp(
// Enable power on all ports // Enable power on all ports
// //
DPRINT1("Enabling PortPower on all ports!\n"); DPRINT("Enabling PortPower on all ports!\n");
for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++)
{ {
@ -1827,7 +1826,7 @@ USBHUB_FdoHandlePnp(
DPRINT1("Failed to power on port %d\n", PortId); DPRINT1("Failed to power on port %d\n", PortId);
} }
DPRINT1("RootHubInitNotification %x\n", HubDeviceExtension->HubInterface.RootHubInitNotification); DPRINT("RootHubInitNotification %x\n", HubDeviceExtension->HubInterface.RootHubInitNotification);
// //
// init root hub notification // init root hub notification
@ -1901,7 +1900,7 @@ USBHUB_FdoHandlePnp(
case BusRelations: case BusRelations:
{ {
PDEVICE_RELATIONS DeviceRelations = NULL; PDEVICE_RELATIONS DeviceRelations = NULL;
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n");
Status = USBHUB_FdoQueryBusRelations(DeviceObject, &DeviceRelations); Status = USBHUB_FdoQueryBusRelations(DeviceObject, &DeviceRelations);
@ -1910,11 +1909,11 @@ USBHUB_FdoHandlePnp(
} }
case RemovalRelations: case RemovalRelations:
{ {
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n");
return ForwardIrpAndForget(DeviceObject, Irp); return ForwardIrpAndForget(DeviceObject, Irp);
} }
default: default:
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n",
Stack->Parameters.QueryDeviceRelations.Type); Stack->Parameters.QueryDeviceRelations.Type);
return ForwardIrpAndForget(DeviceObject, Irp); return ForwardIrpAndForget(DeviceObject, Irp);
} }
@ -1938,22 +1937,22 @@ USBHUB_FdoHandlePnp(
} }
case IRP_MN_QUERY_BUS_INFORMATION: case IRP_MN_QUERY_BUS_INFORMATION:
{ {
DPRINT1("IRP_MN_QUERY_BUS_INFORMATION\n"); DPRINT("IRP_MN_QUERY_BUS_INFORMATION\n");
break; break;
} }
case IRP_MN_QUERY_ID: case IRP_MN_QUERY_ID:
{ {
DPRINT1("IRP_MN_QUERY_ID\n"); DPRINT("IRP_MN_QUERY_ID\n");
break; break;
} }
case IRP_MN_QUERY_CAPABILITIES: case IRP_MN_QUERY_CAPABILITIES:
{ {
DPRINT1("IRP_MN_QUERY_CAPABILITIES\n"); DPRINT("IRP_MN_QUERY_CAPABILITIES\n");
break; break;
} }
default: default:
{ {
DPRINT1(" IRP_MJ_PNP / unknown minor function 0x%lx\n", Stack->MinorFunction); DPRINT(" IRP_MJ_PNP / unknown minor function 0x%lx\n", Stack->MinorFunction);
return ForwardIrpAndForget(DeviceObject, Irp); return ForwardIrpAndForget(DeviceObject, Irp);
} }
} }

30
drivers/usb/usbhub/pdo.c
View file

@ -160,7 +160,7 @@ USBHUB_PdoHandleInternalDeviceControl(
{ {
PHUB_DEVICE_EXTENSION DeviceExtension; PHUB_DEVICE_EXTENSION DeviceExtension;
DPRINT1("IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); DPRINT("IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n");
if (Irp->AssociatedIrp.SystemBuffer == NULL if (Irp->AssociatedIrp.SystemBuffer == NULL
|| Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(PVOID)) || Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(PVOID))
{ {
@ -273,7 +273,7 @@ USBHUB_PdoHandleInternalDeviceControl(
// USBD_PORT_ENABLED (bit 0) or USBD_PORT_CONNECTED (bit 1) // USBD_PORT_ENABLED (bit 0) or USBD_PORT_CONNECTED (bit 1)
// //
DPRINT1("IOCTL_INTERNAL_USB_GET_PORT_STATUS\n"); DPRINT1("IOCTL_INTERNAL_USB_GET_PORT_STATUS\n");
DPRINT1("Arg1 %x\n", *PortStatusBits); DPRINT("Arg1 %x\n", *PortStatusBits);
*PortStatusBits = 0; *PortStatusBits = 0;
if (Stack->Parameters.Others.Argument1) if (Stack->Parameters.Others.Argument1)
{ {
@ -282,8 +282,8 @@ USBHUB_PdoHandleInternalDeviceControl(
Status = GetPortStatusAndChange(RootHubDeviceObject, PortId, &PortStatus); Status = GetPortStatusAndChange(RootHubDeviceObject, PortId, &PortStatus);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
DPRINT1("Connect %x\n", ((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2)); DPRINT("Connect %x\n", ((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2));
DPRINT1("Enable %x\n", ((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2)); DPRINT("Enable %x\n", ((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2));
*PortStatusBits += *PortStatusBits +=
(((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2)) + (((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2)) +
(((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2)); (((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2));
@ -329,7 +329,7 @@ USBHUB_PdoStartDevice(
{ {
PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension;
//NTSTATUS Status; //NTSTATUS Status;
DPRINT1("USBHUB_PdoStartDevice %x\n", DeviceObject); DPRINT("USBHUB_PdoStartDevice %x\n", DeviceObject);
ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension;
// //
@ -364,25 +364,25 @@ USBHUB_PdoQueryId(
{ {
case BusQueryDeviceID: case BusQueryDeviceID:
{ {
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n");
SourceString = &ChildDeviceExtension->usDeviceId; SourceString = &ChildDeviceExtension->usDeviceId;
break; break;
} }
case BusQueryHardwareIDs: case BusQueryHardwareIDs:
{ {
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n");
SourceString = &ChildDeviceExtension->usHardwareIds; SourceString = &ChildDeviceExtension->usHardwareIds;
break; break;
} }
case BusQueryCompatibleIDs: case BusQueryCompatibleIDs:
{ {
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n");
SourceString = &ChildDeviceExtension->usCompatibleIds; SourceString = &ChildDeviceExtension->usCompatibleIds;
break; break;
} }
case BusQueryInstanceID: case BusQueryInstanceID:
{ {
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n");
SourceString = &ChildDeviceExtension->usInstanceId; SourceString = &ChildDeviceExtension->usInstanceId;
break; break;
} }
@ -442,7 +442,7 @@ USBHUB_PdoQueryDeviceText(
case DeviceTextDescription: case DeviceTextDescription:
case DeviceTextLocationInformation: case DeviceTextLocationInformation:
{ {
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n");
// //
// does the device provide a text description // does the device provide a text description
@ -497,7 +497,7 @@ USBHUB_PdoHandlePnp(
{ {
case IRP_MN_START_DEVICE: case IRP_MN_START_DEVICE:
{ {
DPRINT1("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n");
Status = USBHUB_PdoStartDevice(DeviceObject, Irp); Status = USBHUB_PdoStartDevice(DeviceObject, Irp);
break; break;
} }
@ -505,7 +505,7 @@ USBHUB_PdoHandlePnp(
{ {
PDEVICE_CAPABILITIES DeviceCapabilities; PDEVICE_CAPABILITIES DeviceCapabilities;
ULONG i; ULONG i;
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n");
DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities;
// FIXME: capabilities can change with connected device // FIXME: capabilities can change with connected device
@ -533,7 +533,7 @@ USBHUB_PdoHandlePnp(
} }
case IRP_MN_QUERY_RESOURCES: case IRP_MN_QUERY_RESOURCES:
{ {
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n");
Information = Irp->IoStatus.Information; Information = Irp->IoStatus.Information;
Status = Irp->IoStatus.Status; Status = Irp->IoStatus.Status;
@ -541,7 +541,7 @@ USBHUB_PdoHandlePnp(
} }
case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: case IRP_MN_QUERY_RESOURCE_REQUIREMENTS:
{ {
DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n");
Information = Irp->IoStatus.Information; Information = Irp->IoStatus.Information;
Status = Irp->IoStatus.Status; Status = Irp->IoStatus.Status;
@ -576,7 +576,7 @@ USBHUB_PdoHandlePnp(
PHUB_DEVICE_EXTENSION HubDeviceExtension = (PHUB_DEVICE_EXTENSION)UsbChildExtension->ParentDeviceObject->DeviceExtension; PHUB_DEVICE_EXTENSION HubDeviceExtension = (PHUB_DEVICE_EXTENSION)UsbChildExtension->ParentDeviceObject->DeviceExtension;
PUSB_BUS_INTERFACE_HUB_V5 HubInterface = &HubDeviceExtension->HubInterface; PUSB_BUS_INTERFACE_HUB_V5 HubInterface = &HubDeviceExtension->HubInterface;
DPRINT1("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); DPRINT("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n");
/* remove us from pdo list */ /* remove us from pdo list */
bFound = FALSE; bFound = FALSE;

16
drivers/usb/usbhub/usbhub.c
View file

@ -16,7 +16,7 @@ USBHUB_Create(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)
{ {
DPRINT1("USBHUB: IRP_MJ_CREATE\n"); DPRINT("USBHUB: IRP_MJ_CREATE\n");
Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Status = STATUS_SUCCESS;
Irp->IoStatus.Information = 0; Irp->IoStatus.Information = 0;
@ -29,7 +29,7 @@ USBHUB_Close(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)
{ {
DPRINT1("USBHUB: IRP_MJ_CLOSE\n"); DPRINT("USBHUB: IRP_MJ_CLOSE\n");
Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Status = STATUS_SUCCESS;
Irp->IoStatus.Information = 0; Irp->IoStatus.Information = 0;
@ -42,7 +42,7 @@ USBHUB_Cleanup(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)
{ {
DPRINT1("USBHUB: IRP_MJ_CLEANUP\n"); DPRINT("USBHUB: IRP_MJ_CLEANUP\n");
Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Status = STATUS_SUCCESS;
Irp->IoStatus.Information = 0; Irp->IoStatus.Information = 0;
@ -59,7 +59,7 @@ USBHUB_AddDevice(
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
PHUB_DEVICE_EXTENSION HubDeviceExtension; PHUB_DEVICE_EXTENSION HubDeviceExtension;
NTSTATUS Status; NTSTATUS Status;
DPRINT1("USBHUB: AddDevice\n"); DPRINT("USBHUB: AddDevice\n");
// //
// Create the Device Object // Create the Device Object
// //
@ -148,7 +148,7 @@ USBHUB_DispatchDeviceControl(
PDEVICE_OBJECT DeviceObject, PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
{ {
DPRINT1("Usbhub: DispatchDeviceControl\n"); DPRINT("Usbhub: DispatchDeviceControl\n");
if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO)
return USBHUB_FdoHandleDeviceControl(DeviceObject, Irp); return USBHUB_FdoHandleDeviceControl(DeviceObject, Irp);
else else
@ -160,7 +160,7 @@ USBHUB_DispatchInternalDeviceControl(
PDEVICE_OBJECT DeviceObject, PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
{ {
//DPRINT1("Usbhub: DispatchInternalDeviceControl\n"); DPRINT("Usbhub: DispatchInternalDeviceControl\n");
if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO)
return USBHUB_IrpStub(DeviceObject, Irp); return USBHUB_IrpStub(DeviceObject, Irp);
else else
@ -172,7 +172,7 @@ USBHUB_DispatchPnp(
PDEVICE_OBJECT DeviceObject, PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
{ {
DPRINT1("USBHUB: DispatchPnp\n"); DPRINT("USBHUB: DispatchPnp\n");
if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO)
return USBHUB_FdoHandlePnp(DeviceObject, Irp); return USBHUB_FdoHandlePnp(DeviceObject, Irp);
else else
@ -205,7 +205,7 @@ DriverEntry(
DriverObject->DriverExtension->AddDevice = USBHUB_AddDevice; DriverObject->DriverExtension->AddDevice = USBHUB_AddDevice;
DriverObject->DriverUnload = USBHUB_Unload; DriverObject->DriverUnload = USBHUB_Unload;
DPRINT1("USBHUB: DriverEntry\n"); DPRINT("USBHUB: DriverEntry\n");
DriverObject->MajorFunction[IRP_MJ_CREATE] = USBHUB_Create; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBHUB_Create;
DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBHUB_Close; DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBHUB_Close;

20
drivers/usb/usbohci/hardware.cpp
View file

@ -159,7 +159,7 @@ CUSBHardwareDevice::Initialize(
NTSTATUS Status; NTSTATUS Status;
ULONG BytesRead; ULONG BytesRead;
DPRINT1("CUSBHardwareDevice::Initialize\n"); DPRINT("CUSBHardwareDevice::Initialize\n");
// //
// Create DMAMemoryManager for use with QueueHeads and Transfer Descriptors. // Create DMAMemoryManager for use with QueueHeads and Transfer Descriptors.
@ -271,7 +271,7 @@ CUSBHardwareDevice::PnpStart(
NTSTATUS Status; NTSTATUS Status;
ULONG Version; ULONG Version;
DPRINT1("CUSBHardwareDevice::PnpStart\n"); DPRINT("CUSBHardwareDevice::PnpStart\n");
for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++) for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++)
{ {
// //
@ -329,7 +329,7 @@ CUSBHardwareDevice::PnpStart(
// //
Version = READ_REGISTER_ULONG((PULONG)((ULONG_PTR)ResourceBase + OHCI_REVISION_OFFSET)); Version = READ_REGISTER_ULONG((PULONG)((ULONG_PTR)ResourceBase + OHCI_REVISION_OFFSET));
DPRINT1("Version %x\n", Version); DPRINT("Version %x\n", Version);
// //
// Store Resource base // Store Resource base
@ -400,7 +400,6 @@ CUSBHardwareDevice::PnpStart(
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("Failed to Initialize the controller \n"); DPRINT1("Failed to Initialize the controller \n");
ASSERT(FALSE);
return Status; return Status;
} }
@ -422,7 +421,6 @@ CUSBHardwareDevice::PnpStart(
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("Failed to stop the controller \n"); DPRINT1("Failed to stop the controller \n");
ASSERT(FALSE);
return Status; return Status;
} }
@ -565,7 +563,7 @@ CUSBHardwareDevice::StartController(void)
// //
Periodic = OHCI_PERIODIC(m_IntervalValue); Periodic = OHCI_PERIODIC(m_IntervalValue);
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic);
DPRINT1("Periodic Start %x\n", Periodic); DPRINT("Periodic Start %x\n", Periodic);
// //
// start the controller // start the controller
@ -950,7 +948,7 @@ CUSBHardwareDevice::StopController(void)
} }
else else
{ {
DPRINT1("SMM has given up ownership\n"); DPRINT("SMM has given up ownership\n");
} }
} }
else else
@ -959,7 +957,7 @@ CUSBHardwareDevice::StopController(void)
// read contents of control register // read contents of control register
// //
Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK); Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK);
DPRINT1("Controller State %x\n", Control); DPRINT("Controller State %x\n", Control);
if (Control != OHCI_HC_FUNCTIONAL_STATE_RESET) if (Control != OHCI_HC_FUNCTIONAL_STATE_RESET)
{ {
@ -1263,7 +1261,7 @@ CUSBHardwareDevice::SetPortFeature(
{ {
ULONG Value; ULONG Value;
DPRINT1("CUSBHardwareDevice::SetPortFeature PortId %x Feature %x\n", PortId, Feature); DPRINT("CUSBHardwareDevice::SetPortFeature PortId %x Feature %x\n", PortId, Feature);
// //
// read port status // read port status
@ -1426,7 +1424,7 @@ CUSBHardwareDevice::GetCurrentFrameNumber(
Number = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_NUMBER_OFFSET)); Number = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_NUMBER_OFFSET));
DPRINT1("FrameNumberInterval %x Frame %x\n", Number, m_HCCA->CurrentFrameNumber); DPRINT("FrameNumberInterval %x Frame %x\n", Number, m_HCCA->CurrentFrameNumber);
// //
// remove reserved bits // remove reserved bits
@ -1484,7 +1482,7 @@ InterruptServiceRoutine(
// the interrupt was not caused by DoneHead update // the interrupt was not caused by DoneHead update
// check if something important happened // check if something important happened
// //
DPRINT1("InterruptStatus %x InterruptEnable %x\n", READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)), DPRINT("InterruptStatus %x InterruptEnable %x\n", READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)),
READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET))); READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)));
Status = READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)) & READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)) & (~OHCI_WRITEBACK_DONE_HEAD); Status = READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)) & READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)) & (~OHCI_WRITEBACK_DONE_HEAD);
if (Status == 0) if (Status == 0)

14
drivers/usb/usbohci/hcd_controller.cpp
View file

@ -234,7 +234,7 @@ CHCDController::HandleDeviceControl(
// //
PC_ASSERT(DeviceExtension->IsFDO); PC_ASSERT(DeviceExtension->IsFDO);
DPRINT1("HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", DPRINT("HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n",
IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.IoControlCode,
IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.InputBufferLength,
IoStack->Parameters.DeviceIoControl.OutputBufferLength); IoStack->Parameters.DeviceIoControl.OutputBufferLength);
@ -394,7 +394,7 @@ CHCDController::HandlePnp(
{ {
case IRP_MN_START_DEVICE: case IRP_MN_START_DEVICE:
{ {
DPRINT1("CHCDController::HandlePnp IRP_MN_START FDO\n"); DPRINT("CHCDController::HandlePnp IRP_MN_START FDO\n");
// //
// first start lower device object // first start lower device object
@ -423,12 +423,12 @@ CHCDController::HandlePnp(
Status = SetSymbolicLink(TRUE); Status = SetSymbolicLink(TRUE);
} }
DPRINT1("CHCDController::HandlePnp IRP_MN_START FDO: Status %x\n", Status); DPRINT("CHCDController::HandlePnp IRP_MN_START FDO: Status %x\n", Status);
break; break;
} }
case IRP_MN_QUERY_DEVICE_RELATIONS: case IRP_MN_QUERY_DEVICE_RELATIONS:
{ {
DPRINT1("CHCDController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type); DPRINT("CHCDController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type);
if (m_HubController == NULL) if (m_HubController == NULL)
{ {
@ -508,7 +508,7 @@ CHCDController::HandlePnp(
} }
case IRP_MN_STOP_DEVICE: case IRP_MN_STOP_DEVICE:
{ {
DPRINT1("CHCDController::HandlePnp IRP_MN_STOP_DEVICE\n"); DPRINT("CHCDController::HandlePnp IRP_MN_STOP_DEVICE\n");
if (m_Hardware) if (m_Hardware)
{ {
@ -550,7 +550,7 @@ CHCDController::HandlePnp(
} }
case IRP_MN_REMOVE_DEVICE: case IRP_MN_REMOVE_DEVICE:
{ {
DPRINT1("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); DPRINT("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n");
// //
// delete the symbolic link // delete the symbolic link
@ -673,7 +673,7 @@ CHCDController::CreateFDO(
// //
m_FDODeviceNumber = UsbDeviceNumber; m_FDODeviceNumber = UsbDeviceNumber;
DPRINT1("CreateFDO: DeviceName %wZ\n", &DeviceName); DPRINT("CreateFDO: DeviceName %wZ\n", &DeviceName);
/* done */ /* done */
return Status; return Status;

64
drivers/usb/usbohci/hub_controller.cpp
View file

@ -193,7 +193,7 @@ CHubController::Initialize(
USHORT VendorID, DeviceID; USHORT VendorID, DeviceID;
ULONG Dummy1; ULONG Dummy1;
DPRINT1("CHubController::Initialize\n"); DPRINT("CHubController::Initialize\n");
// //
// initialize members // initialize members
@ -308,7 +308,7 @@ CHubController::QueryStatusChageEndpoint(
// Get the number of ports and check each one for device connected // Get the number of ports and check each one for device connected
// //
m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL); m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL);
DPRINT1("SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); DPRINT("SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL);
TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer; TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer;
@ -319,7 +319,7 @@ CHubController::QueryStatusChageEndpoint(
{ {
m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange);
DPRINT1("Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); DPRINT("Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange);
// //
@ -430,7 +430,7 @@ CHubController::HandlePnp(
{ {
case IRP_MN_START_DEVICE: case IRP_MN_START_DEVICE:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_START_DEVICE\n"); DPRINT("CHubController::HandlePnp IRP_MN_START_DEVICE\n");
// //
// register device interface // register device interface
// //
@ -448,7 +448,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_QUERY_ID: case IRP_MN_QUERY_ID:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType); DPRINT("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType);
if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID)
{ {
@ -474,7 +474,7 @@ CHubController::HandlePnp(
swprintf(Buffer, L"USB\\ROOT_HUB"); swprintf(Buffer, L"USB\\ROOT_HUB");
} }
DPRINT1("Name %S\n", Buffer); DPRINT("Name %S\n", Buffer);
// //
// calculate length // calculate length
@ -551,7 +551,7 @@ CHubController::HandlePnp(
Index++; Index++;
DPRINT1("Name %S\n", Buffer); DPRINT("Name %S\n", Buffer);
// //
// allocate buffer // allocate buffer
@ -585,7 +585,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_QUERY_CAPABILITIES: case IRP_MN_QUERY_CAPABILITIES:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_CAPABILITIES\n"); DPRINT("CHubController::HandlePnp IRP_MN_QUERY_CAPABILITIES\n");
DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities;
@ -617,7 +617,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_QUERY_INTERFACE: case IRP_MN_QUERY_INTERFACE:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_INTERFACE\n"); DPRINT("CHubController::HandlePnp IRP_MN_QUERY_INTERFACE\n");
// //
// handle device interface requests // handle device interface requests
@ -627,7 +627,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_REMOVE_DEVICE: case IRP_MN_REMOVE_DEVICE:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_REMOVE_DEVICE\n"); DPRINT("CHubController::HandlePnp IRP_MN_REMOVE_DEVICE\n");
// //
// deactivate device interface for BUS PDO // deactivate device interface for BUS PDO
@ -657,7 +657,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_QUERY_DEVICE_RELATIONS: case IRP_MN_QUERY_DEVICE_RELATIONS:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); DPRINT("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type);
if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation)
{ {
@ -698,7 +698,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_QUERY_BUS_INFORMATION: case IRP_MN_QUERY_BUS_INFORMATION:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); DPRINT("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n");
// //
// allocate buffer for bus information // allocate buffer for bus information
@ -731,7 +731,7 @@ CHubController::HandlePnp(
} }
case IRP_MN_STOP_DEVICE: case IRP_MN_STOP_DEVICE:
{ {
DPRINT1("CHubController::HandlePnp IRP_MN_STOP_DEVICE\n"); DPRINT("CHubController::HandlePnp IRP_MN_STOP_DEVICE\n");
// //
// stop device // stop device
// //
@ -847,7 +847,7 @@ CHubController::HandleBulkOrInterruptTransfer(
// //
// Else pend the IRP, to be completed when a device connects or disconnects. // Else pend the IRP, to be completed when a device connects or disconnects.
// //
DPRINT1("Pending SCE Irp\n");; DPRINT("Pending SCE Irp\n");;
m_PendingSCEIrp = Irp; m_PendingSCEIrp = Irp;
IoMarkIrpPending(Irp); IoMarkIrpPending(Irp);
return STATUS_PENDING; return STATUS_PENDING;
@ -1224,7 +1224,7 @@ CHubController::HandleGetStatusFromDevice(
// //
Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer);
ASSERT(Status == STATUS_SUCCESS); ASSERT(Status == STATUS_SUCCESS);
DPRINT1("CHubController::HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); DPRINT("CHubController::HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus);
// //
// done // done
@ -2442,7 +2442,7 @@ USBI_InterfaceReference(
{ {
CHubController * Controller = (CHubController*)BusContext; CHubController * Controller = (CHubController*)BusContext;
DPRINT1("USBH_InterfaceReference\n"); DPRINT("USBH_InterfaceReference\n");
// //
// add reference // add reference
@ -2457,7 +2457,7 @@ USBI_InterfaceDereference(
{ {
CHubController * Controller = (CHubController*)BusContext; CHubController * Controller = (CHubController*)BusContext;
DPRINT1("USBH_InterfaceDereference\n"); DPRINT("USBH_InterfaceDereference\n");
// //
// release // release
@ -2481,7 +2481,7 @@ USBHI_CreateUsbDevice(
CHubController * Controller; CHubController * Controller;
NTSTATUS Status; NTSTATUS Status;
DPRINT1("USBHI_CreateUsbDevice PortStatus %x\n", PortStatus); DPRINT("USBHI_CreateUsbDevice PortStatus %x\n", PortStatus);
// //
// first get hub controller // first get hub controller
@ -2571,7 +2571,7 @@ USBHI_InitializeUsbDevice(
NTSTATUS Status; NTSTATUS Status;
ULONG Index = 0; ULONG Index = 0;
DPRINT1("USBHI_InitializeUsbDevice\n"); DPRINT("USBHI_InitializeUsbDevice\n");
// //
// first get controller // first get controller
@ -2667,7 +2667,7 @@ USBHI_GetUsbDescriptors(
PUSBDEVICE UsbDevice; PUSBDEVICE UsbDevice;
CHubController * Controller; CHubController * Controller;
DPRINT1("USBHI_GetUsbDescriptors\n"); DPRINT("USBHI_GetUsbDescriptors\n");
// //
// sanity check // sanity check
@ -2736,7 +2736,7 @@ USBHI_RemoveUsbDevice(
CHubController * Controller; CHubController * Controller;
NTSTATUS Status; NTSTATUS Status;
DPRINT1("USBHI_RemoveUsbDevice\n"); DPRINT("USBHI_RemoveUsbDevice\n");
// //
// first get controller // first get controller
@ -2809,7 +2809,7 @@ USBHI_RestoreUsbDevice(
PUSBDEVICE OldUsbDevice, NewUsbDevice; PUSBDEVICE OldUsbDevice, NewUsbDevice;
CHubController * Controller; CHubController * Controller;
DPRINT1("USBHI_RestoreUsbDevice\n"); DPRINT("USBHI_RestoreUsbDevice\n");
// //
// first get controller // first get controller
@ -2831,8 +2831,8 @@ USBHI_RestoreUsbDevice(
PC_ASSERT(Controller->ValidateUsbDevice(NewUsbDevice)); PC_ASSERT(Controller->ValidateUsbDevice(NewUsbDevice));
PC_ASSERT(Controller->ValidateUsbDevice(OldUsbDevice)); PC_ASSERT(Controller->ValidateUsbDevice(OldUsbDevice));
DPRINT1("NewUsbDevice: DeviceAddress %x\n", NewUsbDevice->GetDeviceAddress()); DPRINT("NewUsbDevice: DeviceAddress %x\n", NewUsbDevice->GetDeviceAddress());
DPRINT1("OldUsbDevice: DeviceAddress %x\n", OldUsbDevice->GetDeviceAddress()); DPRINT("OldUsbDevice: DeviceAddress %x\n", OldUsbDevice->GetDeviceAddress());
// //
// remove old device handle // remove old device handle
@ -2855,7 +2855,7 @@ USBHI_QueryDeviceInformation(
PUSBDEVICE UsbDevice; PUSBDEVICE UsbDevice;
CHubController * Controller; CHubController * Controller;
DPRINT1("USBHI_QueryDeviceInformation %p\n", BusContext); DPRINT("USBHI_QueryDeviceInformation %p\n", BusContext);
// //
// sanity check // sanity check
@ -2977,7 +2977,7 @@ USBHI_GetControllerInformation(
{ {
PUSB_CONTROLLER_INFORMATION_0 ControllerInfo; PUSB_CONTROLLER_INFORMATION_0 ControllerInfo;
DPRINT1("USBHI_GetControllerInformation\n"); DPRINT("USBHI_GetControllerInformation\n");
// //
// sanity checks // sanity checks
@ -3040,7 +3040,7 @@ USBHI_GetExtendedHubInformation(
USHORT Dummy1; USHORT Dummy1;
NTSTATUS Status; NTSTATUS Status;
DPRINT1("USBHI_GetExtendedHubInformation\n"); DPRINT("USBHI_GetExtendedHubInformation\n");
// //
// sanity checks // sanity checks
@ -3219,7 +3219,7 @@ USBHI_SetDeviceHandleData(
// looks like we need apply a dragon voodoo to fixup the device stack // looks like we need apply a dragon voodoo to fixup the device stack
// otherwise usbhub will cause a bugcheck // otherwise usbhub will cause a bugcheck
// //
DPRINT1("USBHI_SetDeviceHandleData %p\n", UsbDevicePdo); DPRINT("USBHI_SetDeviceHandleData %p\n", UsbDevicePdo);
// //
// sanity check // sanity check
@ -3256,7 +3256,7 @@ USBDI_GetUSBDIVersion(
ULONG Speed, Dummy2; ULONG Speed, Dummy2;
USHORT Dummy1; USHORT Dummy1;
DPRINT1("USBDI_GetUSBDIVersion\n"); DPRINT("USBDI_GetUSBDIVersion\n");
// //
// get controller // get controller
@ -3336,7 +3336,7 @@ USBDI_IsDeviceHighSpeed(
ULONG Speed, Dummy2; ULONG Speed, Dummy2;
USHORT Dummy1; USHORT Dummy1;
DPRINT1("USBDI_IsDeviceHighSpeed\n"); DPRINT("USBDI_IsDeviceHighSpeed\n");
// //
// get controller // get controller
@ -3659,7 +3659,7 @@ CHubController::CreatePDO(
} }
} }
DPRINT1("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName); DPRINT("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName);
// //
// fixup device stack voodoo part #1 // fixup device stack voodoo part #1
@ -3717,7 +3717,7 @@ VOID StatusChangeEndpointCallBack(PVOID Context)
Irp = This->m_PendingSCEIrp; Irp = This->m_PendingSCEIrp;
if (!Irp) if (!Irp)
{ {
DPRINT1("There was no pending IRP for SCE. Did the usb hub 2.0 driver (usbhub2) load?\n"); DPRINT("There was no pending IRP for SCE. Did the usb hub 2.0 driver (usbhub2) load?\n");
return; return;
} }

2
drivers/usb/usbohci/usb_device.cpp
View file

@ -275,7 +275,7 @@ CUSBDevice::GetType()
} }
DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB);
PC_ASSERT(FALSE); //PC_ASSERT(FALSE);
return Usb11Device; return Usb11Device;
} }

8
drivers/usb/usbohci/usb_queue.cpp
View file

@ -258,7 +258,7 @@ CUSBQueue::AddUSBRequest(
// //
CurrentDescriptor = (POHCI_ISO_TD)Descriptor->HeadLogicalDescriptor; CurrentDescriptor = (POHCI_ISO_TD)Descriptor->HeadLogicalDescriptor;
DPRINT1("ISO: NextFrameNumber %x\n", FrameNumber); DPRINT("ISO: NextFrameNumber %x\n", FrameNumber);
Frame = (FrameNumber & 0xFFFF); Frame = (FrameNumber & 0xFFFF);
while(CurrentDescriptor) while(CurrentDescriptor)
@ -284,7 +284,7 @@ CUSBQueue::AddUSBRequest(
// //
m_Hardware->GetCurrentFrameNumber(&FrameNumber); m_Hardware->GetCurrentFrameNumber(&FrameNumber);
DPRINT1("Hardware 1ms %p Iso %p\n",m_InterruptEndpoints[0], m_IsoHeadEndpointDescriptor); DPRINT("Hardware 1ms %p Iso %p\n",m_InterruptEndpoints[0], m_IsoHeadEndpointDescriptor);
ASSERT(m_InterruptEndpoints[0]->NextPhysicalEndpoint == m_IsoHeadEndpointDescriptor->PhysicalAddress.LowPart); ASSERT(m_InterruptEndpoints[0]->NextPhysicalEndpoint == m_IsoHeadEndpointDescriptor->PhysicalAddress.LowPart);
PrintEndpointList(m_IsoHeadEndpointDescriptor); PrintEndpointList(m_IsoHeadEndpointDescriptor);
@ -684,8 +684,8 @@ CUSBQueue::TransferDescriptorCompletionCallback(
// //
// cleanup endpoint // cleanup endpoint
// //
DPRINT1("ISO endpoint complete\n"); DPRINT("ISO endpoint complete\n");
ASSERT(FALSE); //ASSERT(FALSE);
CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor);
// //

8
drivers/usb/usbohci/usb_request.cpp
View file

@ -768,7 +768,7 @@ CUSBRequest::BuildIsochronousEndpoint(
// store buffer offset // store buffer offset
// //
CurrentDescriptor->Offset[SubIndex] = Urb->UrbIsochronousTransfer.IsoPacket[Index+SubIndex].Offset + PageOffset; CurrentDescriptor->Offset[SubIndex] = Urb->UrbIsochronousTransfer.IsoPacket[Index+SubIndex].Offset + PageOffset;
DPRINT1("Index %lu PacketOffset %lu FinalOffset %lu\n", SubIndex+Index, Urb->UrbIsochronousTransfer.IsoPacket[Index+SubIndex].Offset, CurrentDescriptor->Offset[SubIndex]); DPRINT("Index %lu PacketOffset %lu FinalOffset %lu\n", SubIndex+Index, Urb->UrbIsochronousTransfer.IsoPacket[Index+SubIndex].Offset, CurrentDescriptor->Offset[SubIndex]);
} }
// //
@ -817,7 +817,7 @@ CUSBRequest::BuildIsochronousEndpoint(
// store as previous descriptor // store as previous descriptor
// //
PreviousDescriptor = CurrentDescriptor; PreviousDescriptor = CurrentDescriptor;
DPRINT1("Current Descriptor %p Logical %lx StartAddress %x EndAddress %x\n", CurrentDescriptor, CurrentDescriptor->PhysicalAddress.LowPart, CurrentDescriptor->BufferPhysical, CurrentDescriptor->LastPhysicalByteAddress); DPRINT("Current Descriptor %p Logical %lx StartAddress %x EndAddress %x\n", CurrentDescriptor, CurrentDescriptor->PhysicalAddress.LowPart, CurrentDescriptor->BufferPhysical, CurrentDescriptor->LastPhysicalByteAddress);
// //
// fire interrupt as soon transfer is finished // fire interrupt as soon transfer is finished
@ -1575,11 +1575,11 @@ CUSBRequest::FreeEndpointDescriptor(
// //
PacketCount = OHCI_ITD_GET_FRAME_COUNT(IsoTransferDescriptor->Flags); PacketCount = OHCI_ITD_GET_FRAME_COUNT(IsoTransferDescriptor->Flags);
DPRINT1("CUSBRequest::FreeEndpointDescriptor Descriptor %p Logical %x Buffer Physical %x EndAddress %x PacketCount %lu\n", IsoTransferDescriptor, IsoTransferDescriptor->PhysicalAddress.LowPart, IsoTransferDescriptor->BufferPhysical, IsoTransferDescriptor->LastPhysicalByteAddress, PacketCount); DPRINT("CUSBRequest::FreeEndpointDescriptor Descriptor %p Logical %x Buffer Physical %x EndAddress %x PacketCount %lu\n", IsoTransferDescriptor, IsoTransferDescriptor->PhysicalAddress.LowPart, IsoTransferDescriptor->BufferPhysical, IsoTransferDescriptor->LastPhysicalByteAddress, PacketCount);
for(Index = 0; Index < PacketCount; Index++) for(Index = 0; Index < PacketCount; Index++)
{ {
DPRINT1("PSW Index %lu Value %x\n", Index, IsoTransferDescriptor->Offset[Index]); DPRINT("PSW Index %lu Value %x\n", Index, IsoTransferDescriptor->Offset[Index]);
} }
// //

2
drivers/usb/usbohci/usbohci.cpp
View file

@ -24,7 +24,7 @@ OHCI_AddDevice(
NTSTATUS Status; NTSTATUS Status;
PHCDCONTROLLER HcdController; PHCDCONTROLLER HcdController;
DPRINT1("OHCI_AddDevice\n"); DPRINT("OHCI_AddDevice\n");
/* first create the controller object */ /* first create the controller object */
Status = CreateHCDController(&HcdController); Status = CreateHCDController(&HcdController);

6
drivers/usb/usbstor/disk.c
View file

@ -251,7 +251,7 @@ USBSTOR_HandleQueryProperty(
ANSI_STRING AnsiString; ANSI_STRING AnsiString;
NTSTATUS Status; NTSTATUS Status;
DPRINT1("USBSTOR_HandleQueryProperty\n"); DPRINT("USBSTOR_HandleQueryProperty\n");
// //
// get current stack location // get current stack location
@ -305,7 +305,7 @@ USBSTOR_HandleQueryProperty(
// //
if (PropertyQuery->PropertyId == StorageDeviceProperty) if (PropertyQuery->PropertyId == StorageDeviceProperty)
{ {
DPRINT1("USBSTOR_HandleQueryProperty StorageDeviceProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); DPRINT("USBSTOR_HandleQueryProperty StorageDeviceProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength);
// //
// get device extension // get device extension
@ -467,7 +467,7 @@ USBSTOR_HandleQueryProperty(
// //
// adapter property query request // adapter property query request
// //
DPRINT1("USBSTOR_HandleQueryProperty StorageAdapterProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); DPRINT("USBSTOR_HandleQueryProperty StorageAdapterProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength);
if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_ADAPTER_DESCRIPTOR)) if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_ADAPTER_DESCRIPTOR))
{ {

4
drivers/usb/usbstor/error.c
View file

@ -23,7 +23,7 @@ USBSTOR_GetEndpointStatus(
// //
// allocate urb // allocate urb
// //
DPRINT1("Allocating URB\n"); DPRINT("Allocating URB\n");
Urb = (PURB)AllocateItem(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); Urb = (PURB)AllocateItem(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST));
if (!Urb) if (!Urb)
{ {
@ -69,7 +69,7 @@ USBSTOR_ResetPipeWithHandle(
// //
// allocate urb // allocate urb
// //
DPRINT1("Allocating URB\n"); DPRINT("Allocating URB\n");
Urb = (PURB)AllocateItem(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST)); Urb = (PURB)AllocateItem(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST));
if (!Urb) if (!Urb)
{ {

8
drivers/usb/usbstor/fdo.c
View file

@ -126,7 +126,7 @@ USBSTOR_FdoHandleRemoveDevice(
{ {
NTSTATUS Status; NTSTATUS Status;
DPRINT1("Handling FDO removal\n"); DPRINT("Handling FDO removal\n");
/* We don't need to request removal of our children here */ /* We don't need to request removal of our children here */
@ -200,7 +200,7 @@ USBSTOR_FdoHandleStartDevice(
ASSERT(InterfaceDesc->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); ASSERT(InterfaceDesc->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE);
ASSERT(InterfaceDesc->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); ASSERT(InterfaceDesc->bLength == sizeof(USB_INTERFACE_DESCRIPTOR));
DPRINT1("bInterfaceSubClass %x\n", InterfaceDesc->bInterfaceSubClass); DPRINT("bInterfaceSubClass %x\n", InterfaceDesc->bInterfaceSubClass);
if (InterfaceDesc->bInterfaceProtocol != 0x50) if (InterfaceDesc->bInterfaceProtocol != 0x50)
{ {
DPRINT1("USB Device is not a bulk only device and is not currently supported\n"); DPRINT1("USB Device is not a bulk only device and is not currently supported\n");
@ -303,7 +303,7 @@ USBSTOR_FdoHandleStartDevice(
// //
// fdo is now initialized // fdo is now initialized
// //
DPRINT1("USBSTOR_FdoHandleStartDevice FDO is initialized\n"); DPRINT("USBSTOR_FdoHandleStartDevice FDO is initialized\n");
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -346,7 +346,7 @@ USBSTOR_FdoHandlePnp(
} }
case IRP_MN_REMOVE_DEVICE: case IRP_MN_REMOVE_DEVICE:
{ {
DPRINT1("IRP_MN_REMOVE_DEVICE\n"); DPRINT("IRP_MN_REMOVE_DEVICE\n");
return USBSTOR_FdoHandleRemoveDevice(DeviceObject, DeviceExtension, Irp); return USBSTOR_FdoHandleRemoveDevice(DeviceObject, DeviceExtension, Irp);
} }

2
drivers/usb/usbstor/misc.c
View file

@ -371,7 +371,7 @@ USBSTOR_GetMaxLUN(
// //
Status = USBSTOR_ClassRequest(DeviceObject, DeviceExtension, USB_BULK_GET_MAX_LUN, DeviceExtension->InterfaceInformation->InterfaceNumber, USBD_TRANSFER_DIRECTION_IN, sizeof(UCHAR), Buffer); Status = USBSTOR_ClassRequest(DeviceObject, DeviceExtension, USB_BULK_GET_MAX_LUN, DeviceExtension->InterfaceInformation->InterfaceNumber, USBD_TRANSFER_DIRECTION_IN, sizeof(UCHAR), Buffer);
DPRINT1("MaxLUN: %x\n", *Buffer); DPRINT("MaxLUN: %x\n", *Buffer);
if (*Buffer > 0xF) if (*Buffer > 0xF)
{ {

26
drivers/usb/usbstor/pdo.c
View file

@ -196,7 +196,7 @@ USBSTOR_PdoHandleQueryDeviceText(
if (IoStack->Parameters.QueryDeviceText.DeviceTextType == DeviceTextDescription) if (IoStack->Parameters.QueryDeviceText.DeviceTextType == DeviceTextDescription)
{ {
DPRINT1("USBSTOR_PdoHandleQueryDeviceText DeviceTextDescription\n"); DPRINT("USBSTOR_PdoHandleQueryDeviceText DeviceTextDescription\n");
// //
// allocate item // allocate item
@ -224,7 +224,7 @@ USBSTOR_PdoHandleQueryDeviceText(
} }
else else
{ {
DPRINT1("USBSTOR_PdoHandleQueryDeviceText DeviceTextLocationInformation\n"); DPRINT("USBSTOR_PdoHandleQueryDeviceText DeviceTextLocationInformation\n");
// //
// allocate item // allocate item
@ -339,7 +339,7 @@ USBSTOR_PdoHandleQueryDeviceId(
Irp->IoStatus.Information = (ULONG_PTR)DeviceId.Buffer; Irp->IoStatus.Information = (ULONG_PTR)DeviceId.Buffer;
} }
DPRINT1("DeviceId %wZ Status %x\n", &DeviceId, Status); DPRINT("DeviceId %wZ Status %x\n", &DeviceId, Status);
// //
// done // done
@ -451,7 +451,7 @@ USBSTOR_PdoHandleQueryHardwareId(
Offset += CopyField(InquiryData->Product, &Id1[Offset], 16); Offset += CopyField(InquiryData->Product, &Id1[Offset], 16);
Offset += CopyField(InquiryData->Revision, &Id1[Offset], 4); Offset += CopyField(InquiryData->Revision, &Id1[Offset], 4);
Id1Length = strlen(Id1) + 1; Id1Length = strlen(Id1) + 1;
DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId1 %s\n", Id1); DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId1 %s\n", Id1);
// //
// generate id 2 // generate id 2
@ -464,7 +464,7 @@ USBSTOR_PdoHandleQueryHardwareId(
Offset += CopyField(InquiryData->Vendor, &Id2[Offset], 8); Offset += CopyField(InquiryData->Vendor, &Id2[Offset], 8);
Offset += CopyField(InquiryData->Product, &Id2[Offset], 16); Offset += CopyField(InquiryData->Product, &Id2[Offset], 16);
Id2Length = strlen(Id2) + 1; Id2Length = strlen(Id2) + 1;
DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId2 %s\n", Id2); DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId2 %s\n", Id2);
// //
// generate id 3 // generate id 3
@ -476,7 +476,7 @@ USBSTOR_PdoHandleQueryHardwareId(
Offset += sprintf(&Id3[Offset], DeviceType); Offset += sprintf(&Id3[Offset], DeviceType);
Offset += CopyField(InquiryData->Vendor, &Id3[Offset], 8); Offset += CopyField(InquiryData->Vendor, &Id3[Offset], 8);
Id3Length = strlen(Id3) + 1; Id3Length = strlen(Id3) + 1;
DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId3 %s\n", Id3); DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId3 %s\n", Id3);
// //
// generate id 4 // generate id 4
@ -490,7 +490,7 @@ USBSTOR_PdoHandleQueryHardwareId(
Offset += CopyField(InquiryData->Product, &Id4[Offset], 16); Offset += CopyField(InquiryData->Product, &Id4[Offset], 16);
Offset += CopyField(InquiryData->Revision, &Id4[Offset], 1); Offset += CopyField(InquiryData->Revision, &Id4[Offset], 1);
Id4Length = strlen(Id4) + 1; Id4Length = strlen(Id4) + 1;
DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId4 %s\n", Id4); DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId4 %s\n", Id4);
// //
// generate id 5 // generate id 5
@ -501,7 +501,7 @@ USBSTOR_PdoHandleQueryHardwareId(
Offset = sprintf(&Id5[Offset], "USBSTOR\\"); Offset = sprintf(&Id5[Offset], "USBSTOR\\");
Offset += sprintf(&Id5[Offset], GenericType); Offset += sprintf(&Id5[Offset], GenericType);
Id5Length = strlen(Id5) + 1; Id5Length = strlen(Id5) + 1;
DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId5 %s\n", Id5); DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId5 %s\n", Id5);
// //
// generate id 6 // generate id 6
@ -511,7 +511,7 @@ USBSTOR_PdoHandleQueryHardwareId(
Offset = 0; Offset = 0;
Offset = sprintf(&Id6[Offset], GenericType); Offset = sprintf(&Id6[Offset], GenericType);
Id6Length = strlen(Id6) + 1; Id6Length = strlen(Id6) + 1;
DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId6 %s\n", Id6); DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId6 %s\n", Id6);
// //
// compute total length // compute total length
@ -619,7 +619,7 @@ USBSTOR_PdoHandleQueryCompatibleId(
USBSTOR_ConvertToUnicodeString(Buffer, Length, 0, InstanceId, &Offset); USBSTOR_ConvertToUnicodeString(Buffer, Length, 0, InstanceId, &Offset);
USBSTOR_ConvertToUnicodeString(&Buffer[Offset], Length, Offset, InstanceId, &Offset); USBSTOR_ConvertToUnicodeString(&Buffer[Offset], Length, Offset, InstanceId, &Offset);
DPRINT1("USBSTOR_PdoHandleQueryCompatibleId %S\n", InstanceId); DPRINT("USBSTOR_PdoHandleQueryCompatibleId %S\n", InstanceId);
// //
// store result // store result
@ -694,7 +694,7 @@ USBSTOR_PdoHandleQueryInstanceId(
// //
wcscpy(InstanceId, Buffer); wcscpy(InstanceId, Buffer);
DPRINT1("USBSTOR_PdoHandleQueryInstanceId %S\n", InstanceId); DPRINT("USBSTOR_PdoHandleQueryInstanceId %S\n", InstanceId);
// //
// store result // store result
@ -715,7 +715,7 @@ USBSTOR_PdoHandleDeviceRelations(
PDEVICE_RELATIONS DeviceRelations; PDEVICE_RELATIONS DeviceRelations;
PIO_STACK_LOCATION IoStack; PIO_STACK_LOCATION IoStack;
DPRINT1("USBSTOR_PdoHandleDeviceRelations\n"); DPRINT("USBSTOR_PdoHandleDeviceRelations\n");
// //
// get current irp stack location // get current irp stack location
@ -844,7 +844,7 @@ USBSTOR_PdoHandlePnp(
} }
case IRP_MN_REMOVE_DEVICE: case IRP_MN_REMOVE_DEVICE:
{ {
DPRINT1("IRP_MN_REMOVE_DEVICE\n"); DPRINT("IRP_MN_REMOVE_DEVICE\n");
if(*DeviceExtension->PDODeviceObject != NULL) if(*DeviceExtension->PDODeviceObject != NULL)
{ {

6
drivers/usb/usbstor/scsi.c
View file

@ -549,7 +549,7 @@ USBSTOR_SendRequest(
Command, Command,
Context->cbw); Context->cbw);
DPRINT1("CBW %p\n", Context->cbw); DPRINT("CBW %p\n", Context->cbw);
// //
// now initialize the urb // now initialize the urb
@ -767,7 +767,7 @@ USBSTOR_SendInquiryCmd(
KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL);
KeResetEvent(&Event); KeResetEvent(&Event);
DPRINT1("Resending request\n"); DPRINT("Resending request\n");
// //
// now send the request // now send the request
@ -1204,7 +1204,7 @@ USBSTOR_HandleExecuteSCSI(
} }
else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE)
{ {
DPRINT1("SCSIOP_MODE_SENSE DataTransferLength %lu\n", Request->DataTransferLength); DPRINT("SCSIOP_MODE_SENSE DataTransferLength %lu\n", Request->DataTransferLength);
ASSERT(pCDB->MODE_SENSE.AllocationLength == Request->DataTransferLength); ASSERT(pCDB->MODE_SENSE.AllocationLength == Request->DataTransferLength);
ASSERT(Request->DataBuffer); ASSERT(Request->DataBuffer);

2
drivers/usb/usbstor/usbstor.c
View file

@ -224,7 +224,7 @@ DriverEntry(
IN PUNICODE_STRING RegPath) IN PUNICODE_STRING RegPath)
{ {
DPRINT1("********* USB Storage *********\n"); DPRINT("********* USB Storage *********\n");
// //
// driver unload routine // driver unload routine