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).
This commit is contained in:
Josef Karthauser 2002-01-03 00:37:56 +00:00
parent 7ff48af704
commit b992262bcf
2 changed files with 3 additions and 2 deletions

View File

@ -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;
}

View File

@ -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);