Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-04 18:40:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[LIBUSB][USBCCGP]

Browse source 
- Whitespace and DPRINT fixes

svn path=/trunk/; revision=56668
This commit is contained in:
Thomas Faber 2012-05-28 10:49:44 +00:00
parent a426102b3a
commit 7803f2678f
5 changed files with 155 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/drivers/usb/usbccgp/function.c
View file

@ -123,7 +123,7 @@ USBCCGP_CustomEnumWithInterface(
DeviceObject, DeviceObject,
FDODeviceExtension->PhysicalDeviceObject); FDODeviceExtension->PhysicalDeviceObject);
DPRINT("USBCCGP_CustomEnumWithInterface Status %x\n", Status); DPRINT("USBCCGP_CustomEnumWithInterface Status %lx\n", Status);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
// //
@ -406,7 +406,6 @@ USBCCGP_InitFunctionDescriptor(
FunctionDescriptor->HardwareId.Length = Index * sizeof(WCHAR); FunctionDescriptor->HardwareId.Length = Index * sizeof(WCHAR);
FunctionDescriptor->HardwareId.MaximumLength = (Index + 1) * sizeof(WCHAR); FunctionDescriptor->HardwareId.MaximumLength = (Index + 1) * sizeof(WCHAR);
// //
// now init the compatible id // now init the compatible id
// //
@ -679,7 +678,7 @@ USBCCGP_LegacyEnum(
// //
// failed to init ids // failed to init ids
// //
DPRINT1("[USBCCGP] Failed to init ids with %x\n", Status); DPRINT1("[USBCCGP] Failed to init ids with %lx\n", Status);
return Status; return Status;
} }
@ -789,7 +788,7 @@ USBCCGP_EnumWithAudioLegacy(
// //
// failed to allocate descriptor array // failed to allocate descriptor array
// //
DPRINT1("[USBCCGP] Failed to allocate descriptor array %x\n", Status); DPRINT1("[USBCCGP] Failed to allocate descriptor array %lx\n", Status);
return Status; return Status;
} }
@ -802,7 +801,7 @@ USBCCGP_EnumWithAudioLegacy(
// //
// failed to init ids // failed to init ids
// //
DPRINT1("[USBCCGP] Failed to init ids with %x\n", Status); DPRINT1("[USBCCGP] Failed to init ids with %lx\n", Status);
return Status; return Status;
} }

4
reactos/drivers/usb/usbccgp/pdo.c
View file

@ -786,7 +786,6 @@ USBCCGP_PDOSelectConfiguration(
NeedSelect = FALSE; NeedSelect = FALSE;
if (Entry->InterfaceDescriptor->bAlternateSetting == InterfaceInformation->AlternateSetting) if (Entry->InterfaceDescriptor->bAlternateSetting == InterfaceInformation->AlternateSetting)
{ {
for(InterfaceIndex = 0; InterfaceIndex < InterfaceInformation->NumberOfPipes; InterfaceIndex++) for(InterfaceIndex = 0; InterfaceIndex < InterfaceInformation->NumberOfPipes; InterfaceIndex++)
{ {
if (InterfaceInformation->Pipes[InterfaceIndex].MaximumTransferSize != Entry->Interface->Pipes[InterfaceIndex].MaximumTransferSize) if (InterfaceInformation->Pipes[InterfaceIndex].MaximumTransferSize != Entry->Interface->Pipes[InterfaceIndex].MaximumTransferSize)
@ -1047,8 +1046,6 @@ PDO_HandleInternalDeviceControl(
return Status; return Status;
} }
DPRINT1("IOCTL %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); DPRINT1("IOCTL %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode);
DPRINT1("InputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.InputBufferLength); DPRINT1("InputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.InputBufferLength);
DPRINT1("OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); DPRINT1("OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength);
@ -1085,5 +1082,4 @@ PDO_Dispatch(
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
return Status; return Status;
} }
} }

1
reactos/lib/drivers/libusb/hub_controller.cpp
View file

@ -1219,7 +1219,6 @@ CHubController::HandleGetStatusFromDevice(
CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength;
CtrlSetup.bmRequestType.B = 0x80; CtrlSetup.bmRequestType.B = 0x80;
if (Urb->UrbHeader.Function == URB_FUNCTION_GET_STATUS_FROM_INTERFACE) if (Urb->UrbHeader.Function == URB_FUNCTION_GET_STATUS_FROM_INTERFACE)
{ {
// //

12
reactos/lib/drivers/libusb/usb_device.cpp
View file

@ -1041,7 +1041,7 @@ CUSBDevice::SelectConfiguration(
if (!Found) if (!Found)
{ {
DPRINT1("[USBLIB] invalid configuration value %lu\n", ConfigurationDescriptor->bConfigurationValue); DPRINT1("[USBLIB] invalid configuration value %u\n", ConfigurationDescriptor->bConfigurationValue);
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
@ -1063,13 +1063,13 @@ CUSBDevice::SelectConfiguration(
if (!ConfigurationDescriptor) if (!ConfigurationDescriptor)
{ {
// unconfigure request // unconfigure request
DPRINT1("CUSBDevice::SelectConfiguration Unconfigure Request Status %x\n", Status); DPRINT1("CUSBDevice::SelectConfiguration Unconfigure Request Status %lx\n", Status);
m_ConfigurationIndex = 0; m_ConfigurationIndex = 0;
return Status; return Status;
} }
// informal debug print // informal debug print
DPRINT1("CUSBDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %x\n", ConfigurationIndex, m_ConfigurationIndex, Status); DPRINT1("CUSBDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %lx\n", ConfigurationIndex, m_ConfigurationIndex, Status);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
// //
@ -1180,7 +1180,7 @@ CUSBDevice::SelectInterface(
Status = CommitSetupPacket(&CtrlSetup, NULL, 0, NULL); Status = CommitSetupPacket(&CtrlSetup, NULL, 0, NULL);
// informal debug print // informal debug print
DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %x\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %lx\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status);
#if 0 #if 0
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
@ -1191,7 +1191,6 @@ CUSBDevice::SelectInterface(
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
// find interface // find interface
Found = FALSE; Found = FALSE;
Entry = m_ConfigurationDescriptors[ConfigurationIndex].InterfaceList.Flink; Entry = m_ConfigurationDescriptors[ConfigurationIndex].InterfaceList.Flink;
@ -1250,7 +1249,7 @@ CUSBDevice::SelectInterface(
DPRINT1("MaximumPacketSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize); DPRINT1("MaximumPacketSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize);
DPRINT1("MaximumTransferSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumTransferSize); DPRINT1("MaximumTransferSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumTransferSize);
DPRINT1("PipeFlags %d\n", InterfaceInfo->Pipes[PipeIndex].PipeFlags); DPRINT1("PipeFlags %d\n", InterfaceInfo->Pipes[PipeIndex].PipeFlags);
DPRINT1("PipeType %dd\n", InterfaceInfo->Pipes[PipeIndex].PipeType); DPRINT1("PipeType %d\n", InterfaceInfo->Pipes[PipeIndex].PipeType);
DPRINT1("UsbEndPoint %x\n", InterfaceInfo->Pipes[PipeIndex].EndpointAddress); DPRINT1("UsbEndPoint %x\n", InterfaceInfo->Pipes[PipeIndex].EndpointAddress);
// sanity checks // sanity checks
@ -1264,7 +1263,6 @@ CUSBDevice::SelectInterface(
UsbInterface->EndPoints[PipeIndex].DataToggle = FALSE; UsbInterface->EndPoints[PipeIndex].DataToggle = FALSE;
} }
// //
// done // done
// //