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

[USBSTOR]

Browse source 
- Add sanity checks
- Check if device needs CDB padding and return error in that case

svn path=/branches/usb-bringup-trunk/; revision=55381
This commit is contained in:
Johannes Anderwald 2012-02-02 19:37:38 +00:00
parent 087dfd04c9
commit 59de50814d
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,13 +193,29 @@ USBSTOR_FdoHandleStartDevice(
// Check that this device uses bulk transfers and is SCSI // Check that this device uses bulk transfers and is SCSI
// //
InterfaceDesc = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)DeviceExtension->ConfigurationDescriptor + sizeof(USB_CONFIGURATION_DESCRIPTOR)); InterfaceDesc = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)DeviceExtension->ConfigurationDescriptor + sizeof(USB_CONFIGURATION_DESCRIPTOR));
//
// sanity check
//
ASSERT(InterfaceDesc->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE);
ASSERT(InterfaceDesc->bLength == sizeof(USB_INTERFACE_DESCRIPTOR));
DPRINT1("bInterfaceSubClass %x\n", InterfaceDesc->bInterfaceSubClass); DPRINT1("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");
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }
if (InterfaceDesc->bInterfaceSubClass != 0x06)
{
//
// FIXME: need to pad CDBs to 12 byte
// mode select commands must be translated from 1AH / 15h to 5AH / 55h
//
DPRINT1("[USBSTOR] Error: need to pad CDBs\n");
return STATUS_NOT_IMPLEMENTED;
}
// //
// now select an interface // now select an interface