xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

usbohci, usbuhci, usbehci: use physical address of registers for matching controllers and printing

Browse source
This commit is contained in:
cinap_lenrek 2017-07-22 16:35:13 +02:00
parent ffb28698bf
commit f0217d2c3f
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/src/9/pc/usbehcipc.c
View file

@ -180,7 +180,7 @@ scanpci(void)
p->vid, p->did);
continue;
}
dprint("usbehci: %#x %#x: port %#p size %#x irq %d\n",
print("usbehci: %#x %#x: port %#p size %#x irq %d\n",
p->vid, p->did, io, p->mem[0].size, p->intl);
ctlr = malloc(sizeof(Ctlr));
@ -239,7 +239,7 @@ reset(Hci *hp)
for(i = 0; i < Nhcis && ctlrs[i] != nil; i++){
ctlr = ctlrs[i];
if(ctlr->active == 0)
if(hp->port == 0 || hp->port == (uintptr)ctlr->capio){
if(hp->port == 0 || hp->port == PADDR(ctlr->capio)){
ctlr->active = 1;
break;
}
@ -250,7 +250,7 @@ reset(Hci *hp)
p = ctlr->pcidev;
hp->aux = ctlr;
hp->port = (uintptr)ctlr->capio;
hp->port = PADDR(ctlr->capio);
hp->irq = p->intl;
hp->tbdf = p->tbdf;

4
sys/src/9/pc/usbohci.c
View file

@ -2571,7 +2571,7 @@ reset(Hci *hp)
for(i = 0; i < Nhcis && ctlrs[i] != nil; i++){
ctlr = ctlrs[i];
if(ctlr->active == 0)
if(hp->port == 0 || hp->port == (uintptr)ctlr->ohci){
if(hp->port == 0 || hp->port == PADDR(ctlr->ohci)){
ctlr->active = 1;
break;
}
@ -2585,7 +2585,7 @@ reset(Hci *hp)
p = ctlr->pcidev;
hp->aux = ctlr;
hp->port = (uintptr)ctlr->ohci;
hp->port = PADDR(ctlr->ohci);
hp->irq = p->intl;
hp->tbdf = p->tbdf;
ctlr->nports = hp->nports = ctlr->ohci->rhdesca & 0xff;

2
sys/src/9/pc/usbuhci.c
View file

@ -2144,7 +2144,7 @@ scanpci(void)
continue;
}
dprint("uhci: %#x %#x: port %#ux size %#x irq %d\n",
print("uhci: %#x %#x: port %#ux size %#x irq %d\n",
p->vid, p->did, io, p->mem[4].size, p->intl);
ctlr = malloc(sizeof(Ctlr));