From 999e98b9b856ae4fc75b3ad33783488e33cdd426 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sun, 17 Jan 2021 11:55:39 +0100 Subject: usbehci: use 64-bit base address, remove resetlck, simplify scanpci() --- sys/src/9/zynq/usbehcizynq.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sys/src/9/zynq') 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; } -- cgit v1.2.3