diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-08-30 19:15:41 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-08-30 19:15:41 +0000 |
| commit | 8acf7ad7da20700612be54fb6215c4129d3f5908 (patch) | |
| tree | f0c1447d57d63491c3cbb0e0d51bb803297b2c94 /sys/dev/usb/usbdi.h | |
| parent | 6ab93a2ea641207aff70046b23b1067483e0a639 (diff) | |
Reinstate SPLUSBCHECK checks (DIAGNOSTIC-only), but implemented as splassert(),
which is exactly what it was trying to do.
Tested on all *hci controllers with a bunch of usb devices by at least ckuethe@
and I.
Diffstat (limited to 'sys/dev/usb/usbdi.h')
| -rw-r--r-- | sys/dev/usb/usbdi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index b89dc40c290..f1adbcf11a5 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi.h,v 1.30 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: usbdi.h,v 1.31 2009/08/30 19:15:40 miod Exp $ */ /* $NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */ @@ -242,8 +242,10 @@ struct usb_attach_arg { /* XXX Perhaps USB should have its own levels? */ #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS #define splusb splsoftnet +#define SPLUSBCHECK splsoftassert(IPL_SOFTNET) #else #define splusb splbio +#define SPLUSBCHECK splassert(IPL_BIO) #endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ #define splhardusb splbio #define IPL_USB IPL_BIO |