summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/usbdivar.h
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2009-08-30 19:15:40 +0000
committermiod <miod@openbsd.org>2009-08-30 19:15:40 +0000
commitaf5d16e89062012fc3488943bc6c7568265458cc (patch)
tree4222967d51a418d1b4b2066b6254f68d76fabd39 /sys/dev/usb/usbdivar.h
parentlock the vnode before calling VOP_CLOSE() in msdofs_unmount(). (diff)
downloadwireguard-openbsd-af5d16e89062012fc3488943bc6c7568265458cc.tar.xz
wireguard-openbsd-af5d16e89062012fc3488943bc6c7568265458cc.zip
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/usbdivar.h')
-rw-r--r--sys/dev/usb/usbdivar.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index feed6655134..9d44ae0191a 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdivar.h,v 1.34 2008/06/29 10:04:15 yuo Exp $ */
+/* $OpenBSD: usbdivar.h,v 1.35 2009/08/30 19:15:40 miod Exp $ */
/* $NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */
@@ -254,20 +254,6 @@ void usb_needs_explore(usbd_device_handle);
void usb_needs_reattach(usbd_device_handle);
void usb_schedsoftintr(struct usbd_bus *);
-/*
- * XXX This check is extremely bogus. Bad Bad Bad.
- */
-#if defined(DIAGNOSTIC) && 0
-#define SPLUSBCHECK \
- do { int _s = splusb(), _su = splusb(); \
- if (!cold && _s != _su) printf("SPLUSBCHECK failed 0x%x!=0x%x, %s:%d\n", \
- _s, _su, __FILE__, __LINE__); \
- splx(_s); \
- } while (0)
-#else
-#define SPLUSBCHECK
-#endif
-
/* Locator stuff. */
/* XXX these values are used to statically bind some elements in the USB tree