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

Messed up those numbers. The interval can range from 0 to 16 and we can use 0 to 10 with the 1024 frame list. So it's obviously 11 entries and not 10. Fixes the wrong tree layout and the doubled polling intervals of interrupts.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23035 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2007-12-01 10:18:27 +00:00
parent 90e2260736
commit 3bd7e77cfa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,7 +254,7 @@ EHCI::EHCI(pci_info *info, Stack *stack)
memset(logicalBase, 0, B_PAGE_SIZE);
fInterruptEntries = (interrupt_entry *)logicalBase;
for (int32 i = 0; i < 10; i++) {
for (int32 i = 0; i < 11; i++) {
ehci_qh *queueHead = &fInterruptEntries[i].queue_head;
queueHead->this_phy = physicalBase;
queueHead->current_qtd_phy = EHCI_QTD_TERMINATE;
@ -275,7 +275,7 @@ EHCI::EHCI(pci_info *info, Stack *stack)
// build flat interrupt tree
TRACE(("usb_ehci: build up interrupt links\n"));
uint32 interval = 1024;
uint32 intervalIndex = 9;
uint32 intervalIndex = 10;
while (interval > 1) {
uint32 insertIndex = interval / 2;
while (insertIndex < 1024) {
@ -292,7 +292,7 @@ EHCI::EHCI(pci_info *info, Stack *stack)
ehci_qh *firstLogical = &fInterruptEntries[0].queue_head;
uint32 firstPhysical = firstLogical->this_phy | EHCI_QH_TYPE_QH;
fPeriodicFrameList[0] = firstPhysical;
for (int32 i = 1; i < 10; i++) {
for (int32 i = 1; i < 11; i++) {
fInterruptEntries[i].queue_head.next_phy = firstPhysical;
fInterruptEntries[i].queue_head.next_log = firstLogical;
}
@ -1267,10 +1267,10 @@ EHCI::LinkInterruptQueueHead(ehci_qh *queueHead, uint8 interval)
interval = 1;
// this may happen as intervals can go up to 16; we limit the value to
// 10 as you cannot support intervals above that with a frame list of
// 11 as you cannot support intervals above that with a frame list of
// just 1024 entries...
if (interval > 10)
interval = 10;
if (interval > 11)
interval = 11;
ehci_qh *interruptQueue = &fInterruptEntries[interval - 1].queue_head;
queueHead->next_log = interruptQueue->next_log;