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/usbf_subr.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/usbf_subr.c')
| -rw-r--r-- | sys/dev/usb/usbf_subr.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sys/dev/usb/usbf_subr.c b/sys/dev/usb/usbf_subr.c index e0fdb4ba71c..6971f1d8582 100644 --- a/sys/dev/usb/usbf_subr.c +++ b/sys/dev/usb/usbf_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbf_subr.c,v 1.8 2007/06/14 19:18:49 deraadt Exp $ */ +/* $OpenBSD: usbf_subr.c,v 1.9 2007/06/15 11:41:48 mbalmer Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -1066,7 +1066,6 @@ usbf_transfer_complete(usbf_xfer_handle xfer) usbf_status usbf_softintr_establish(struct usbf_bus *bus) { -#ifdef USB_USE_SOFTINTR #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS KASSERT(bus->soft == NULL); /* XXX we should have our own level */ @@ -1074,9 +1073,6 @@ usbf_softintr_establish(struct usbf_bus *bus) bus->methods->soft_intr, bus); if (bus->soft == NULL) return USBF_INVAL; -#else - timeout_set(&bus->softi, NULLL, NULL); -#endif #endif return USBF_NORMAL_COMPLETION; } @@ -1084,17 +1080,9 @@ usbf_softintr_establish(struct usbf_bus *bus) void usbf_schedsoftintr(struct usbf_bus *bus) { -#ifdef USB_USE_SOFTINTR #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS softintr_schedule(bus->soft); #else - if (!timeout_pending(&bus->softi)) { - timeout_del(&bus->softi); - timeout_set(&bus->softi, bus->methods->soft_intr, bus); - timeout_add(&bus->softi, 0); - } -#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ -#else bus->methods->soft_intr(bus); -#endif /* USB_USE_SOFTINTR */ +#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ } |