[USBSTOR] Weaken the type checks of a device.

This adds usb-cdrom support to usbstor.sys
This commit is contained in:
Victor Perevertkin 2019-04-27 23:29:45 +03:00
parent 7bb93db372
commit b7de5870e6
3 changed files with 6 additions and 4 deletions

View file

@ -177,12 +177,12 @@ USBSTOR_FdoHandleStartDevice(
return STATUS_NOT_SUPPORTED;
}
if (InterfaceDesc->bInterfaceSubClass != 0x06)
if (InterfaceDesc->bInterfaceSubClass == 0x04) // UFI subclass
{
// 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;
return STATUS_NOT_SUPPORTED;
}
// now select an interface

View file

@ -897,7 +897,7 @@ USBSTOR_CreatePDO(
return Status;
}
if (PDODeviceExtension->InquiryData->DeviceType == DIRECT_ACCESS_DEVICE)
if (PDODeviceExtension->InquiryData->DeviceType == DIRECT_ACCESS_DEVICE || PDODeviceExtension->InquiryData->DeviceType == READ_ONLY_DIRECT_ACCESS_DEVICE)
{
PDODeviceExtension->IsFloppy = FALSE; // TODO: implement the actual check
}

View file

@ -18,7 +18,9 @@ DefaultDestDir = 12
%GenericMfg% = GenericMfg
[GenericMfg]
%GenericBulkOnlyTransport.DeviceDesc% = USBBulkOnly_Inst,USB\Class_08&SubClass_06&Prot_50
%GenericBulkOnlyTransport.DeviceDesc% = USBBulkOnly_Inst,USB\Class_08&SubClass_06&Prot_50 ; SCSI devices
; usbstor.sys supports usb-cdroms but cdrom.sys from ReactOS does not like it
;%GenericBulkOnlyTransport.DeviceDesc% = USBBulkOnly_Inst,USB\Class_08&SubClass_02&Prot_50 ; SFF-8020i (ATAPI)
;-------------------------- USB STORAGE DRIVER --------------------------