diff options
| -rw-r--r-- | sys/dev/pci/ohci_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/ohci.c | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c index f548ccad245..861dcbb2fbd 100644 --- a/sys/dev/pci/ohci_pci.c +++ b/sys/dev/pci/ohci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci_pci.c,v 1.15 2002/03/14 01:26:59 millert Exp $ */ +/* $OpenBSD: ohci_pci.c,v 1.16 2002/06/07 22:26:33 miod Exp $ */ /* $NetBSD: ohci_pci.c,v 1.9 1999/05/20 09:52:35 augustss Exp $ */ /* @@ -138,10 +138,6 @@ ohci_pci_attach(parent, self, aux) return; } -#if defined(__OpenBSD__) - timeout_set(&sc->sc.sc_tmo_rhsc, ohci_rhsc_enable, sc); -#endif - intrstr = pci_intr_string(pc, ih); sc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, ohci_intr, sc, sc->sc.sc_bus.bdev.dv_xname); diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 008038435de..b6f3d9bf5a0 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.28 2002/05/07 18:29:18 nate Exp $ */ +/* $OpenBSD: ohci.c,v 1.29 2002/06/07 22:26:34 miod Exp $ */ /* $NetBSD: ohci.c,v 1.104 2001/09/28 23:57:21 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -871,9 +871,7 @@ ohci_init(ohci_softc_t *sc) sc->sc_powerhook = powerhook_establish(ohci_power, sc); sc->sc_shutdownhook = shutdownhook_establish(ohci_shutdown, sc); #endif -#if defined(__OpenBSD__) - timeout_set(&sc->sc_tmo_rhsc, ohci_rhsc_enable, sc); -#endif + usb_callout_init(sc->sc_tmo_rhsc); return (USBD_NORMAL_COMPLETION); @@ -1150,10 +1148,8 @@ ohci_intr1(ohci_softc_t *sc) * on until the port has been reset. */ ohci_rhsc_able(sc, 0); -#if defined (__OpenBSD__) /* Do not allow RHSC interrupts > 1 per second */ - timeout_add(&sc->sc_tmo_rhsc, hz); -#endif + usb_callout(sc->sc_tmo_rhsc, hz, ohci_rhsc_enable, sc); } sc->sc_bus.intr_context--; |