svn commit: r250202 - in head/sys: conf dev/usb

[Hans Petter Selasky]

Author: hselasky
Date: Fri May  3 08:19:09 2013
New Revision: 250202
URL: http://svnweb.freebsd.org/changeset/base/250202

Log:
  Allow the default USB template to be specified at compile time.

Modified:
  head/sys/conf/options
  head/sys/dev/usb/usb_device.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Fri May  3 07:44:58 2013	(r250201)
+++ head/sys/conf/options	Fri May  3 08:19:09 2013	(r250202)
@@ -644,6 +644,7 @@ BUS_DEBUG		opt_bus.h
 USB_DEBUG		opt_usb.h
 USB_HOST_ALIGN		opt_usb.h
 USB_REQ_DEBUG		opt_usb.h
+USB_TEMPLATE		opt_usb.h
 USB_VERBOSE		opt_usb.h
 USB_EHCI_BIG_ENDIAN_DESC	opt_usb.h
 U3G_DEBUG		opt_u3g.h

Modified: head/sys/dev/usb/usb_device.c
==============================================================================
--- head/sys/dev/usb/usb_device.c	Fri May  3 07:44:58 2013	(r250201)
+++ head/sys/dev/usb/usb_device.c	Fri May  3 08:19:09 2013	(r250202)
@@ -112,7 +112,11 @@ static void	usb_cdev_free(struct usb_dev
 
 /* This variable is global to allow easy access to it: */
 
-int	usb_template = 0;
+#ifdef	USB_TEMPLATE
+int	usb_template = USB_TEMPLATE;
+#else
+int	usb_template;
+#endif
 
 TUNABLE_INT("hw.usb.usb_template", &usb_template);
 SYSCTL_INT(_hw_usb, OID_AUTO, template, CTLFLAG_RW | CTLFLAG_TUN,