summaryrefslogtreecommitdiff
path: root/sys/src/9/zynq
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2021-01-17 11:55:39 +0100
committercinap_lenrek <cinap_lenrek@felloff.net>2021-01-17 11:55:39 +0100
commit999e98b9b856ae4fc75b3ad33783488e33cdd426 (patch)
treec33439781b7342456c41b7f8982e3e26174f7efd /sys/src/9/zynq
parent3240008dd182a0d88fb2d0d5ffc5e88accdd957f (diff)
usbehci: use 64-bit base address, remove resetlck, simplify scanpci()
Diffstat (limited to 'sys/src/9/zynq')
-rw-r--r--sys/src/9/zynq/usbehcizynq.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/src/9/zynq/usbehcizynq.c b/sys/src/9/zynq/usbehcizynq.c
index cb1562a43..be5053fa5 100644
--- a/sys/src/9/zynq/usbehcizynq.c
+++ b/sys/src/9/zynq/usbehcizynq.c
@@ -105,16 +105,13 @@ portstatus(Hci *hp, int port)
static int
reset(Hci *hp)
{
- static Lock resetlck;
Ctlr *ctlr;
- ilock(&resetlck);
for(ctlr = ctlrs; ctlr->base != 0; ctlr++)
if(!ctlr->active && (hp->port == 0 || hp->port == ctlr->base)){
ctlr->active = 1;
break;
}
- iunlock(&resetlck);
if(ctlr->base == 0)
return -1;
hp->port = ctlr->base;
@@ -140,8 +137,7 @@ reset(Hci *hp)
ehciportstatus = hp->portstatus;
hp->portstatus = portstatus;
- if(hp->interrupt != nil)
- intrenable(hp->irq, hp->interrupt, hp, LEVEL, hp->type);
+ intrenable(hp->irq, hp->interrupt, hp, LEVEL, hp->type);
return 0;
}