diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-11-04 19:14:11 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-11-04 19:14:11 +0000 |
| commit | 977663b99170667667569e24c3cc3c783721c5d2 (patch) | |
| tree | 074971fd3c83c1872e970f2ad03edf724c909540 /sys/dev/usb/uhci.c | |
| parent | 6c3b6a695dfbbd617cb55229859fc54028fa1dc0 (diff) | |
Get rid of __HAVE_GENERIC_SOFT_INTERRUPTS now that all our platforms support it.
ok jsing@, miod@
Diffstat (limited to 'sys/dev/usb/uhci.c')
| -rw-r--r-- | sys/dev/usb/uhci.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 8afa70119bf..58c24368ad3 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.72 2009/10/13 19:33:17 pirofti Exp $ */ +/* $OpenBSD: uhci.c,v 1.73 2009/11/04 19:14:10 kettenis Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -1251,12 +1251,10 @@ uhci_softintr(void *v) uhci_check_intr(sc, ii); } -#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS if (sc->sc_softwake) { sc->sc_softwake = 0; wakeup(&sc->sc_softwake); } -#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ sc->sc_bus.intr_context--; } @@ -1923,14 +1921,10 @@ uhci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) */ usb_delay_ms(upipe->pipe.device->bus, 2); /* Hardware finishes in 1ms */ s = splusb(); -#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS sc->sc_softwake = 1; -#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ usb_schedsoftintr(&sc->sc_bus); -#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS DPRINTFN(1,("uhci_abort_xfer: tsleep\n")); tsleep(&sc->sc_softwake, PZERO, "uhciab", 0); -#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ splx(s); /* |