Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBEHCI_NEW]

Browse source 
- Fix IOCTL_GET_HCD_DRIVERKEY_NAME implementation
- Now needs IOCTL_USB_GET_ROOT_HUB_NAME to get further in usbview
- Tested in Windows XP SP2

svn path=/branches/usb-bringup/; revision=51350
This commit is contained in:
Johannes Anderwald 2011-04-15 14:58:50 +00:00
parent 297f2e3dd4
commit c1964ed574
1 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

39
drivers/usb/usbehci_new/hcd_controller.cpp
View file

@ -241,7 +241,7 @@ CHCDController::HandleDeviceControl(
DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
DPRINT1("HandleDeviceControl>Type: FDO %u IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n", DPRINT1("HandleDeviceControl>Type: FDO %u IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n",
DeviceExtension->IsFDO, DeviceExtension->IsFDO,
IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.IoControlCode,
IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.InputBufferLength,
@ -282,21 +282,23 @@ CHCDController::HandleDeviceControl(
// //
// it does // it does
// //
Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, IoStack->Parameters.DeviceIoControl.OutputBufferLength, DriverKey->DriverKeyName, &ResultLength); Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(ULONG), DriverKey->DriverKeyName, &ResultLength);
//DPRINT1("Result %S\n", DriverKey->DriverKeyName); if (NT_SUCCESS(Status))
{
//
// informal debug print
//
DPRINT1("Result %S\n", DriverKey->DriverKeyName);
}
} }
//
// FIXME
//
// //
// store result // store result
// //
DriverKey->ActualLength = ResultLength; DriverKey->ActualLength = ResultLength + FIELD_OFFSET(USB_HCD_DRIVERKEY_NAME, DriverKeyName) + sizeof(WCHAR);
Irp->IoStatus.Information = IoStack->Parameters.DeviceIoControl.OutputBufferLength; Irp->IoStatus.Information = IoStack->Parameters.DeviceIoControl.OutputBufferLength;
Status = STATUS_BUFFER_OVERFLOW; Status = STATUS_SUCCESS;
} }
} }
else else
@ -308,13 +310,28 @@ CHCDController::HandleDeviceControl(
Irp->IoStatus.Information = sizeof(USB_HCD_DRIVERKEY_NAME); Irp->IoStatus.Information = sizeof(USB_HCD_DRIVERKEY_NAME);
} }
} }
else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_ROOT_HUB_NAME)
{
DPRINT1("IOCTL_USB_GET_ROOT_HUB_NAME is not implemented yet\n");
}
}
else
{
//
// the PDO does not support any device IOCTLs
//
Status = STATUS_SUCCESS;
} }
// //
// complete the request
//
Irp->IoStatus.Status = Status; Irp->IoStatus.Status = Status;
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
//
// done
//
return Status; return Status;
} }