Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Increase the amount of tries in the EHCI BIOS handover so it lasts for up to

Browse Source 
1 second instead of half a second. Might help with slow BIOSes.
* Disable EHCI interrupts if the BIOS handover fails so that we do not flood
  the system with interrupts if the BIOS later on decides to still comply with
  our handover request.
* Add an unconditional success message to EHCI and UHCI to better see if
  controllers are present/initialized correctly at all.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24980 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2008-04-16 08:16:14 +00:00
parent 044f45b2db
commit f3283bfa83
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/add-ons/kernel/busses/usb/ehci.cpp
View File

@ -181,7 +181,7 @@ EHCI::EHCI(pci_info *info, Stack *stack)
sPCIModule->write_pci_config(fPCIInfo->bus, fPCIInfo->device,
fPCIInfo->function, extendedCapPointer + 3, 1, 1);
for (int32 i = 0; i < 10; i++) {
for (int32 i = 0; i < 20; i++) {
legacySupport = sPCIModule->read_pci_config(fPCIInfo->bus,
fPCIInfo->device, fPCIInfo->function, extendedCapPointer, 4);
@ -193,6 +193,9 @@ EHCI::EHCI(pci_info *info, Stack *stack)
}
if (legacySupport & EHCI_LEGSUP_BIOSOWNED) {
// in any case disable interrupts so we do not flood the system
// if the BIOS still decides to give up control
WriteOpReg(EHCI_USBINTR, 0);
TRACE_ERROR(("usb_ehci: bios won't give up control over the host controller\n"));
return;
} else if (legacySupport & EHCI_LEGSUP_OSOWNED) {
@ -404,7 +407,7 @@ EHCI::Start()
}
SetRootHub(fRootHub);
TRACE(("usb_ehci: Host Controller started\n"));
dprintf("usb_ehci: successfully started the controller\n");
return BusManager::Start();
}

1
src/add-ons/kernel/busses/usb/uhci.cpp
View File

@ -558,6 +558,7 @@ UHCI::Start()
TRACE(("usb_uhci: controller is started. status: %u curframe: %u\n",
ReadReg16(UHCI_USBSTS), ReadReg16(UHCI_FRNUM)));
dprintf("usb_uhci: successfully started the controller\n");
return BusManager::Start();
}