summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjoe <joe@FreeBSD.org>2002-04-02 10:53:42 +0000
committerjoe <joe@FreeBSD.org>2002-04-02 10:53:42 +0000
commit1ce083b959d0d345bfb3b9b284ef6458e93f1b87 (patch)
treece546b2524e75cc1b61d963435e25982da231dc2 /sys
parentb09f57883b0ea400be19cba5da214dbe0f17c98d (diff)
downloadFreeBSD-src-1ce083b959d0d345bfb3b9b284ef6458e93f1b87.zip
FreeBSD-src-1ce083b959d0d345bfb3b9b284ef6458e93f1b87.tar.gz
MFNetBSD:
revision 1.50 date: 2001/04/12 01:18:24; author: thorpej; state: Exp; lines: +6 -2 Only if __HAVE_GENERIC_SOFT_INTERRUPTS is then splusb == splsoftnet (because we register the interrupt with IPL_SOFTNET). However, if we're using a callout, then splusb == splsoftclock (because the callouts happen from the softclock interrupt). Note that splsoftnet blocks softclock interrupts, but this is meant to better describe what's going on.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/usbdi.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 9d718a9..a1cbf33 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.h,v 1.49 2001/01/23 17:04:30 augustss Exp $ */
+/* $NetBSD: usbdi.h,v 1.50 2001/04/12 01:18:24 thorpej Exp $ */
/* $FreeBSD$ */
/*
@@ -268,9 +268,13 @@ int usbd_driver_load(module_t mod, int what, void *arg);
/* XXX Perhaps USB should have its own levels? */
#ifdef USB_USE_SOFTINTR
+#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
#define splusb splsoftnet
#else
+#define splusb splsoftclock
+#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */
+#else
#define splusb splbio
-#endif
+#endif /* USB_USE_SOFTINTR */
#define splhardusb splbio
#define IPL_USB IPL_BIO
OpenPOWER on IntegriCloud