[ros-diffs] [reactos] 01/01: [BOOTDATA][USBSTOR] Add device definitions for SFF-8070i (ARMD-style devices)

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07c534c8639cf916cbf94…

commit 07c534c8639cf916cbf943135eea5a4bc1005bcf
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Wed Dec 8 17:52:07 2021 +0300
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Wed Dec 8 17:52:07 2021 +0300

    [BOOTDATA][USBSTOR] Add device definitions for SFF-8070i (ARMD-style devices)
    
    Confirmed working with our usbstor driver by Vort.
    
    CORE-17895
---
 boot/bootdata/hivesys.inf       | 3 +++
 boot/bootdata/txtsetup.sif      | 1 +
 drivers/usb/usbstor/usbstor.inf | 1 +
 3 files changed, 5 insertions(+)

diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf
index 4f2024799b2..39b0175b8b7 100644
--- a/boot/bootdata/hivesys.inf
+++ b/boot/bootdata/hivesys.inf
@@ -50,6 +50,9 @@
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubCl

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_02&Prot_50","Service",0x00000000,"usbstor"

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_02&Prot_50","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
 
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_05&Prot_50","Service",0x00000000,"usbstor"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_05&Prot_50","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
+

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","Service",0x00000000,"usbccgp"

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
 
diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 8929c94a698..f4930254853 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -168,6 +168,7 @@ PCI\CC_0C0300 = usbuhci
 PCI\CC_0C0310 = usbohci
 PCI\CC_0C0320 = usbehci
 USB\Class_08&SubClass_06&Prot_50 = usbstor
+USB\Class_08&SubClass_05&Prot_50 = usbstor
 HID_DEVICE_SYSTEM_KEYBOARD = kbdhid,{4D36E96B-E325-11CE-BFC1-08002BE10318}
 USB\COMPOSITE = usbccgp
 GenDisk = disk,{4D36E967-E325-11CE-BFC1-08002BE10318}
diff --git a/drivers/usb/usbstor/usbstor.inf b/drivers/usb/usbstor/usbstor.inf
index a42f5371ef4..d6bc94ac7b6 100644
--- a/drivers/usb/usbstor/usbstor.inf
+++ b/drivers/usb/usbstor/usbstor.inf
@@ -21,6 +21,7 @@ DefaultDestDir = 12
 %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)
+%GenericBulkOnlyTransport.DeviceDesc% =
USBBulkOnly_Inst,USB\Class_08&SubClass_05&Prot_50 ; SFF-8070i (ATAPI
Removable/Rewritable)
 
 ;-------------------------- USB STORAGE DRIVER --------------------------