diff options
| author |   mbalmer <mbalmer@openbsd.org> | 2007-06-15 11:41:47 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@openbsd.org> | 2007-06-15 11:41:47 +0000 |
| commit | 553f3c93ebab1cd19a85340a3ab332f0c1b84dfc (patch) | |
| tree | f1b0416776a4d2a2814614c4143e53ea323d206d /sys/dev/usb/uhci.c | |
| parent | in pf_test_rule, before handling IPPROTO_ICMP / IPPROTO_ICMPV6, check that (diff) | |
| download | wireguard-openbsd-553f3c93ebab1cd19a85340a3ab332f0c1b84dfc.tar.xz wireguard-openbsd-553f3c93ebab1cd19a85340a3ab332f0c1b84dfc.zip | |
Replace the USB_USE_SOFTINTR macro with __HAVE_GENERIC_SOFT_INTTERUPTS
(which was used to define USB_USE_SOFTINTR).
No binary changes.
ok dlg, mk.
Diffstat (limited to 'sys/dev/usb/uhci.c')
| -rw-r--r-- | sys/dev/usb/uhci.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index afb00e99c6e..3a69c6c43ec 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.59 2007/06/14 12:58:09 mbalmer Exp $ */ +/* $OpenBSD: uhci.c,v 1.60 2007/06/15 11:41:48 mbalmer 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 $ */ @@ -1255,12 +1255,12 @@ uhci_softintr(void *v) uhci_check_intr(sc, ii); } -#ifdef USB_USE_SOFTINTR +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS if (sc->sc_softwake) { sc->sc_softwake = 0; wakeup(&sc->sc_softwake); } -#endif /* USB_USE_SOFTINTR */ +#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ sc->sc_bus.intr_context--; } @@ -1926,14 +1926,14 @@ 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 USB_USE_SOFTINTR +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS sc->sc_softwake = 1; -#endif /* USB_USE_SOFTINTR */ +#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ usb_schedsoftintr(&sc->sc_bus); -#ifdef USB_USE_SOFTINTR +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS DPRINTFN(1,("uhci_abort_xfer: tsleep\n")); tsleep(&sc->sc_softwake, PZERO, "uhciab", 0); -#endif /* USB_USE_SOFTINTR */ +#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ splx(s); /* |