diff options
| author | joe <joe@FreeBSD.org> | 2002-01-03 00:37:56 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2002-01-03 00:37:56 +0000 |
| commit | fe44d3773b9870055a264ca6a12df6616cece28e (patch) | |
| tree | aafeb51d9591147817454ae8e5ae0ab5c13fc416 /sys | |
| parent | 6634eb9e133bdb27edb446bd680927cab8e54fdd (diff) | |
| download | FreeBSD-src-fe44d3773b9870055a264ca6a12df6616cece28e.zip FreeBSD-src-fe44d3773b9870055a264ca6a12df6616cece28e.tar.gz | |
Merge from NetBSD:
date: 2001/11/20 16:08:10; author: augustss; state: Exp;
Use longer reset for root hubs (as told in the spec).
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/ohci.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/uhci.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 987b611..debe3a0 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -2308,7 +2308,8 @@ ohci_root_ctrl_start(xfer) index)); OWRITE4(sc, port, UPS_RESET); for (i = 0; i < 10; i++) { - usb_delay_ms(&sc->sc_bus, 10); + usb_delay_ms(&sc->sc_bus, + USB_PORT_ROOT_RESET_DELAY); if ((OREAD4(sc, port) & UPS_RESET) == 0) break; } diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index a98f28d..27ae977 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -2918,7 +2918,7 @@ uhci_root_ctrl_start(usbd_xfer_handle xfer) case UHF_PORT_RESET: x = UREAD2(sc, port); UWRITE2(sc, port, x | UHCI_PORTSC_PR); - usb_delay_ms(&sc->sc_bus, 10); + usb_delay_ms(&sc->sc_bus, USB_PORT_ROOT_RESET_DELAY); UWRITE2(sc, port, x & ~UHCI_PORTSC_PR); delay(100); x = UREAD2(sc, port); |
