diff options
| -rw-r--r-- | sys/dev/usb/ohci.c | 9 | ||||
| -rw-r--r-- | sys/dev/usb/ohcireg.h | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 145590ee6655..891a025f4d10 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.83 2000/03/29 01:46:26 augustss Exp $ */ +/* $NetBSD: ohci.c,v 1.85 2000/04/01 09:27:35 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -831,9 +831,14 @@ ohci_init(ohci_softc_t *sc) desca = OREAD4(sc, OHCI_RH_DESCRIPTOR_A); OWRITE4(sc, OHCI_RH_DESCRIPTOR_A, desca | OHCI_NOCP); OWRITE4(sc, OHCI_RH_STATUS, OHCI_LPSC); /* Enable port power */ - usb_delay_ms(&sc->sc_bus, 5); + usb_delay_ms(&sc->sc_bus, OHCI_ENABLE_POWER_DELAY); OWRITE4(sc, OHCI_RH_DESCRIPTOR_A, desca); + /* + * The AMD756 requires a delay before re-reading the register, + * otherwise it will occasionally report 0 ports. + */ + usb_delay_ms(&sc->sc_bus, OHCI_READ_DESC_DELAY); sc->sc_noport = OHCI_GET_NDP(OREAD4(sc, OHCI_RH_DESCRIPTOR_A)); #ifdef OHCI_DEBUG diff --git a/sys/dev/usb/ohcireg.h b/sys/dev/usb/ohcireg.h index dfee37cb8166..f620a9b36f46 100644 --- a/sys/dev/usb/ohcireg.h +++ b/sys/dev/usb/ohcireg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ohcireg.h,v 1.16 2000/03/29 01:46:27 augustss Exp $ */ +/* $NetBSD: ohcireg.h,v 1.17 2000/04/01 09:27:35 augustss Exp $ */ /* $FreeBSD$ */ @@ -240,4 +240,8 @@ typedef struct { #define OHCI_CC_BUFFER_UNDERRUN 13 #define OHCI_CC_NOT_ACCESSED 15 +/* Some delay needed when changing certain registers. */ +#define OHCI_ENABLE_POWER_DELAY 5 +#define OHCI_READ_DESC_DELAY 5 + #endif /* _DEV_PCI_OHCIREG_H_ */ |