diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-02-09 21:47:39 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-02-09 21:47:39 +0000 |
| commit | 306b60ddba9baf140651cc54dbea5c59fc11e3c7 (patch) | |
| tree | 150faef8122b55548dbf6b1dace7519b78d147e9 /sys/dev/usb2/controller/at91dci.c | |
| parent | 1d90e269afc22a6d75affcfa622f167d4c18c03a (diff) | |
| download | FreeBSD-src-306b60ddba9baf140651cc54dbea5c59fc11e3c7.zip FreeBSD-src-306b60ddba9baf140651cc54dbea5c59fc11e3c7.tar.gz | |
MFp4 //depot/projects/usb; 157069,157296,157375,157384,157430
- Change "usb2_pause_mtx" so that it takes the timeout value in ticks
- USB controller: EHCI High Speed Interrupt endpoint fix.
- Fix OHCI and EHCI counting bug when multiple TD's are involved in
a short USB transfer and a short packet happens on the non-last TD in the
USB transfer frame.
- USB process naming cleanup.
Submitted by: Hans Petter Selasky
Diffstat (limited to 'sys/dev/usb2/controller/at91dci.c')
| -rw-r--r-- | sys/dev/usb2/controller/at91dci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb2/controller/at91dci.c b/sys/dev/usb2/controller/at91dci.c index 3c4b430..501d0c0 100644 --- a/sys/dev/usb2/controller/at91dci.c +++ b/sys/dev/usb2/controller/at91dci.c @@ -275,7 +275,7 @@ at91dci_wakeup_peer(struct usb2_xfer *xfer) DELAY(8000); } else { /* Wait for reset to complete. */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, 8); + usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125); } AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, 0); @@ -1395,7 +1395,7 @@ at91dci_init(struct at91dci_softc *sc) (sc->sc_clocks_on) (sc->sc_clocks_arg); } /* wait a little for things to stabilise */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1); + usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); /* disable and clear all interrupts */ |
