diff options
| author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2005-04-05 13:12:06 +0000 |
|---|---|---|
| committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2005-04-05 13:12:06 +0000 |
| commit | c533bfab80611686c73789b4f6df9b22f329c21c (patch) | |
| tree | d896f1937a6a7a57a6b236df7164e8ed09bcbd0f /sys | |
| parent | c4bef21686f6c56c326ce78404e1621fc340958a (diff) | |
Argument to DELAY should be usecs, not hz.
ok dlg@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_ohci.c | 6 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0reg.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_ohci.c b/sys/arch/arm/xscale/pxa2x0_ohci.c index 36bf5b68c4a..7a601e3f8a7 100644 --- a/sys/arch/arm/xscale/pxa2x0_ohci.c +++ b/sys/arch/arm/xscale/pxa2x0_ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_ohci.c,v 1.17 2005/04/03 23:47:36 uwe Exp $ */ +/* $OpenBSD: pxa2x0_ohci.c,v 1.18 2005/04/05 13:12:05 pascoe Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -144,7 +144,7 @@ pxaohci_detach(struct device *self, int flags) bus_space_write_4(sc->sc.iot, sc->sc.ioh, USBHC_HR, (hr & USBHC_HR_MASK) | USBHC_HR_FHR); - DELAY(mstohz(USBHC_RST_WAIT)); + DELAY(USBHC_RST_WAIT); hr = bus_space_read_4(sc->sc.iot, sc->sc.ioh, USBHC_HR); bus_space_write_4(sc->sc.iot, sc->sc.ioh, USBHC_HR, @@ -197,7 +197,7 @@ pxaohci_enable(struct pxaohci_softc *sc) bus_space_write_4(sc->sc.iot, sc->sc.ioh, USBHC_HR, (hr & USBHC_HR_MASK) | USBHC_HR_FHR); - DELAY(mstohz(USBHC_RST_WAIT)); + DELAY(USBHC_RST_WAIT); hr = bus_space_read_4(sc->sc.iot, sc->sc.ioh, USBHC_HR); bus_space_write_4(sc->sc.iot, sc->sc.ioh, USBHC_HR, diff --git a/sys/arch/arm/xscale/pxa2x0reg.h b/sys/arch/arm/xscale/pxa2x0reg.h index 59ddcbef199..f7ac066886c 100644 --- a/sys/arch/arm/xscale/pxa2x0reg.h +++ b/sys/arch/arm/xscale/pxa2x0reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0reg.h,v 1.14 2005/03/30 13:37:34 dlg Exp $ */ +/* $OpenBSD: pxa2x0reg.h,v 1.15 2005/04/05 13:12:05 pascoe Exp $ */ /* $NetBSD: pxa2x0reg.h,v 1.4 2003/06/11 20:43:01 scw Exp $ */ /* @@ -740,7 +740,7 @@ struct pxa2x0_dma_desc { #define USBHC_HIT_MASK (USBHC_HIT_RWUT | USBHC_HIT_BAT | \ USBHC_HIT_IRQT | USBHC_HIT_TAT | USBHC_HIT_UPS1T | USBHC_HIT_UPS2T | \ USBHC_HIT_UPRT | USBHC_HIT_STAT | USBHC_HIT_SMAT | USBHC_HIT_UPS3T) -#define USBHC_RST_WAIT 10 /* ms to wait for reset */ +#define USBHC_RST_WAIT 10000 /* usecs to wait for reset */ /* OS Timer */ #define OST_OSMR0 0x0000 /* Match 0 */ |