[ros-diffs] [reactos] 01/01: [USBHUB_NEW] Enable generic USB hubs (USB class 09) They actually work, tested on a couple of real devices

[Victor Perevertkin]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6392c5a78c06ad8460dea…

commit 6392c5a78c06ad8460deae47e90406fba0412bb5
Author:     Victor Perevertkin <victor(a)perevertkin.ru>
AuthorDate: Wed Sep 4 05:26:02 2019 +0300
Commit:     Victor Perevertkin <victor(a)perevertkin.ru>
CommitDate: Wed Sep 4 05:26:02 2019 +0300

    [USBHUB_NEW] Enable generic USB hubs (USB class 09)
    They actually work, tested on a couple of real devices
---
 boot/bootdata/hivesys.inf  | 4 ++--
 boot/bootdata/setupreg.inf | 2 +-
 boot/bootdata/txtsetup.sif | 4 ++--
 media/inf/usb.inf          | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf
index 983c6317840..a30fb55aae1 100644
--- a/boot/bootdata/hivesys.inf
+++ b/boot/bootdata/hivesys.inf
@@ -38,8 +38,8 @@
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubCl

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

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
 
-;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","Service",0x00000000,"usbhub"
-;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","Service",0x00000000,"usbhub"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
 

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","Service",0x00000000,"usbhub"

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
diff --git a/boot/bootdata/setupreg.inf b/boot/bootdata/setupreg.inf
index 197918f13b1..ed841fdd044 100644
--- a/boot/bootdata/setupreg.inf
+++ b/boot/bootdata/setupreg.inf
@@ -17,7 +17,7 @@
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0320"

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_06&Prot_50"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE"
-;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk"
diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index feeae2404fa..59977b553f9 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -161,7 +161,7 @@ PCI\CC_0105 = uniata
 PCI\CC_0106 = uniata
 ;PCI\CC_0106 = storahci
 *PNP0600 = uniata
-;USB\CLASS_09 = usbhub
+USB\CLASS_09 = usbhub
 USB\ROOT_HUB = usbhub
 USB\ROOT_HUB20 = usbhub
 PCI\CC_0C0300 = usbuhci
@@ -208,7 +208,7 @@ Cabinet=reactos.cab
 
 [SetupData]
 DefaultPath = \ReactOS
-OsLoadOptions = "/NOGUIBOOT /NODEBUG"
+OsLoadOptions = "/NOGUIBOOT"
 DbgOsLoadOptions = "/NOGUIBOOT /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE"
 ;DbgOsLoadOptions = "/SOS /DEBUGPORT=SCREEN"
 ;DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS"
diff --git a/media/inf/usb.inf b/media/inf/usb.inf
index 9efaaec7eb3..01f03500a91 100644
--- a/media/inf/usb.inf
+++ b/media/inf/usb.inf
@@ -28,8 +28,7 @@ CopyFiles = usbhub_CopyFiles.NT
 usbhub.sys
 
 [usbhub_Inst.NT.Services]
-;AddService = usbhub, 0x00000002, usbhub_Service_Inst
-AddService = , 0x00000002
+AddService = usbhub, 0x00000002, usbhub_Service_Inst
 
 [usbhub_Service_Inst]
 ServiceType   = 1