Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 20:36:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBUHCI]

Browse source 
- Enable usbuhci for testing
[USBOHCI]
- Add back getting port count in a loop to work around AMD chipset errata

svn path=/trunk/; revision=55959
This commit is contained in:
Cameron Gutman 2012-03-02 18:02:50 +00:00
parent 29571a7f78
commit ae6b312494
4 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/boot/bootdata/hivesys_i386.inf
View file

@ -16,8 +16,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","ClassGU
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","Service",0x00000000,"acpi" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","Service",0x00000000,"acpi"
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}"
;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","Service",0x00000000,"usbuhci" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","Service",0x00000000,"usbuhci"
;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","Service",0x00000000,"usbohci" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","Service",0x00000000,"usbohci"
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
@ -1511,11 +1511,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Start",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001
; UHCI controller driver ; UHCI controller driver
;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001
;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus Extender"
;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys"
;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000
;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00000001
; USB storage driver ; USB storage driver
HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000001

4
reactos/boot/bootdata/txtsetup.sif
View file

@ -39,7 +39,7 @@ hidusb.sys=,,,,,,,,,,,,4
usbccgp.sys=,,,,,,x,,,,,,4 usbccgp.sys=,,,,,,x,,,,,,4
usbd.sys=,,,,,,x,,,,,,4 usbd.sys=,,,,,,x,,,,,,4
usbhub.sys=,,,,,,x,,,,,,4 usbhub.sys=,,,,,,x,,,,,,4
;usbuhci.sys=,,,,,,x,,,,,,4 usbuhci.sys=,,,,,,x,,,,,,4
usbohci.sys=,,,,,,x,,,,,,4 usbohci.sys=,,,,,,x,,,,,,4
usbehci.sys=,,,,,,x,,,,,,4 usbehci.sys=,,,,,,x,,,,,,4
usbstor.sys=,,,,,,x,,,,,,4 usbstor.sys=,,,,,,x,,,,,,4
@ -75,7 +75,7 @@ PCI\CC_0106 = uniata
;USB\CLASS_09 = usbhub ;USB\CLASS_09 = usbhub
USB\ROOT_HUB = usbhub USB\ROOT_HUB = usbhub
USB\ROOT_HUB20 = usbhub USB\ROOT_HUB20 = usbhub
;PCI\CC_0C0300 = usbuhci PCI\CC_0C0300 = usbuhci
PCI\CC_0C0310 = usbohci PCI\CC_0C0310 = usbohci
PCI\CC_0C0320 = usbehci PCI\CC_0C0320 = usbehci
USB\Class_08&SubClass_06&Prot_50 = usbstor USB\Class_08&SubClass_06&Prot_50 = usbstor

9
reactos/drivers/usb/usbohci/hardware.cpp
View file

@ -662,9 +662,14 @@ retry:
Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET));
// //
// get port count // get port count (in a loop due to AMD errata)
// //
m_NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor); do
{
KeStallExecutionProcessor(20);
m_NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor);
} while (m_NumberOfPorts == 0);
DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts); DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts);
ASSERT(m_NumberOfPorts < OHCI_MAX_PORT_COUNT); ASSERT(m_NumberOfPorts < OHCI_MAX_PORT_COUNT);

BIN
reactos/media/inf/usbport.inf
View file

Binary file not shown.