Skip to content

Commit b10ff50

Browse files
committed
Revert "[USB] Remove USB 1.1 OHCI driver"
This reverts commit 3b7a152.
1 parent 5b51f83 commit b10ff50

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

boot/bootdata/hivesys.inf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGU
3838
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","Service",0x00000000,"usbuhci"
3939
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
4040

41-
;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","Service",0x00000000,"usbohci"
42-
;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
41+
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","Service",0x00000000,"usbohci"
42+
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
4343

4444
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0320","Service",0x00000000,"usbehci"
4545
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0320","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
@@ -1785,11 +1785,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Start",0x00010001,0x00000000
17851785
HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Type",0x00010001,0x00000001
17861786

17871787
; OHCI controller driver
1788-
;HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ErrorControl",0x00010001,0x00000001
1789-
;HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Group",0x00000000,"Boot Bus Extender"
1790-
;HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ImagePath",0x00020000,"system32\drivers\usbohci.sys"
1791-
;HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Start",0x00010001,0x00000000
1792-
;HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001
1788+
HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ErrorControl",0x00010001,0x00000001
1789+
HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Group",0x00000000,"Boot Bus Extender"
1790+
HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ImagePath",0x00020000,"system32\drivers\usbohci.sys"
1791+
HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Start",0x00010001,0x00000000
1792+
HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001
17931793

17941794
; UHCI controller driver
17951795
HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001

boot/bootdata/txtsetup.sif

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ usbd.sys = 1,,,,,,,4,,,,1,4
114114
usbhub.sys = 1,,,,,,x,4,,,,1,4
115115
usbport.sys = 1,,,,,,,4,,,,1,4
116116
usbuhci.sys = 1,,,,,,x,4,,,,1,4
117-
;usbohci.sys = 1,,,,,,x,4,,,,1,4
117+
usbohci.sys = 1,,,,,,x,4,,,,1,4
118118
usbehci.sys = 1,,,,,,x,4,,,,1,4
119119
usbstor.sys = 1,,,,,,x,4,,,,1,4
120120
kbdhid.sys = 1,,,,,,,4,,,,1,4

drivers/usb/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_subdirectory(usbccgp)
22
add_subdirectory(usbd)
33
add_subdirectory(usbehci)
44
add_subdirectory(usbhub)
5-
#add_subdirectory(usbohci)
5+
add_subdirectory(usbohci)
66
add_subdirectory(usbport)
77
add_subdirectory(usbstor)
88
#add_subdirectory(usbstor_new)

media/inf/usbport.inf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ usbport.sys
6666
usbohci.sys
6767

6868
[OHCI_Inst.NT.Services]
69-
;AddService = usbohci, 0x00000002, usbohci_Service_Inst
69+
AddService = usbohci, 0x00000002, usbohci_Service_Inst
7070

7171
[usbohci_Service_Inst]
7272
ServiceType = 1

0 commit comments

Comments
 (0)