Author: hselasky
Date: Fri May 30 13:45:20 2014
New Revision: 266884
URL: http://svnweb.freebsd.org/changeset/base/266884
Log:
Make driver detach code in USB mass storage test optional.
Sponsored by: DARPA, AFRL
Modified:
head/sys/dev/usb/usb_freebsd.h
head/sys/dev/usb/usb_freebsd_loader.h
head/sys/dev/usb/usb_msctest.c
Modified: head/sys/dev/usb/usb_freebsd.h
==============================================================================
--- head/sys/dev/usb/usb_freebsd.h Fri May 30 13:42:11 2014
(r266883)
+++ head/sys/dev/usb/usb_freebsd.h Fri May 30 13:45:20 2014
(r266884)
@@ -41,6 +41,7 @@
#define USB_HAVE_TT_SUPPORT 1
#define USB_HAVE_POWERD 1
#define USB_HAVE_MSCTEST 1
+#define USB_HAVE_MSCTEST_DETACH 1
#define USB_HAVE_PF 1
#define USB_HAVE_ROOT_MOUNT_HOLD 1
#define USB_HAVE_ID_SECTION 1
Modified: head/sys/dev/usb/usb_freebsd_loader.h
==============================================================================
--- head/sys/dev/usb/usb_freebsd_loader.h Fri May 30 13:42:11 2014
(r266883)
+++ head/sys/dev/usb/usb_freebsd_loader.h Fri May 30 13:45:20 2014
(r266884)
@@ -40,7 +40,8 @@
#define USB_HAVE_MBUF 0
#define USB_HAVE_TT_SUPPORT 1
#define USB_HAVE_POWERD 1
-#define USB_HAVE_MSCTEST 0
+#define USB_HAVE_MSCTEST 1
+#define USB_HAVE_MSCTEST_DETACH 0
#define USB_HAVE_PF 0
#define USB_HAVE_ROOT_MOUNT_HOLD 0
#define USB_HAVE_ID_SECTION 0
Modified: head/sys/dev/usb/usb_msctest.c
==============================================================================
--- head/sys/dev/usb/usb_msctest.c Fri May 30 13:42:11 2014
(r266883)
+++ head/sys/dev/usb/usb_msctest.c Fri May 30 13:45:20 2014
(r266884)
@@ -507,6 +507,8 @@ bbb_attach(struct usb_device *udev, uint
struct usb_interface_descriptor *id;
struct bbb_transfer *sc;
usb_error_t err;
+
+#if USB_HAVE_MSCTEST_DETACH
uint8_t do_unlock;
/* Prevent re-enumeration */
@@ -520,6 +522,7 @@ bbb_attach(struct usb_device *udev, uint
if (do_unlock)
usbd_enum_unlock(udev);
+#endif
iface = usbd_get_iface(udev, iface_index);
if (iface == NULL)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
