svn commit: r188746 - in head/sys: conf dev/usb2/bluetooth dev/usb2/core dev/usb2/ethernet dev/usb2/image dev/usb2/include dev/usb2/input dev/usb2/misc dev/usb2/quirk dev/usb2/serial dev/usb2/sound...

Andrew Thompson thompsa at FreeBSD.org
Tue Feb 17 22:33:15 PST 2009 

Author: thompsa
Date: Wed Feb 18 06:33:10 2009
New Revision: 188746
URL: http://svn.freebsd.org/changeset/base/188746

Log:
  Switch over to usbdevs.h generated at compile time.

Deleted:
  head/sys/dev/usb2/include/Makefile
  head/sys/dev/usb2/include/usb2_devid.h
  head/sys/dev/usb2/include/usb2_devtable.h
Modified:
  head/sys/conf/files
  head/sys/dev/usb2/bluetooth/ng_ubt2.c
  head/sys/dev/usb2/bluetooth/ubtbcmfw2.c
  head/sys/dev/usb2/core/usb2_device.c
  head/sys/dev/usb2/ethernet/if_aue2.c
  head/sys/dev/usb2/ethernet/if_axe2.c
  head/sys/dev/usb2/ethernet/if_cdce2.c
  head/sys/dev/usb2/ethernet/if_cue2.c
  head/sys/dev/usb2/ethernet/if_kue2.c
  head/sys/dev/usb2/ethernet/if_rue2.c
  head/sys/dev/usb2/ethernet/if_udav2.c
  head/sys/dev/usb2/image/uscanner2.c
  head/sys/dev/usb2/input/uhid2.c
  head/sys/dev/usb2/input/ums2.c
  head/sys/dev/usb2/misc/udbp2.c
  head/sys/dev/usb2/misc/ufm2.c
  head/sys/dev/usb2/quirk/usb2_quirk.c
  head/sys/dev/usb2/serial/u3g2.c
  head/sys/dev/usb2/serial/uark2.c
  head/sys/dev/usb2/serial/ubsa2.c
  head/sys/dev/usb2/serial/uchcom2.c
  head/sys/dev/usb2/serial/ucycom2.c
  head/sys/dev/usb2/serial/ufoma2.c
  head/sys/dev/usb2/serial/uftdi2.c
  head/sys/dev/usb2/serial/ugensa2.c
  head/sys/dev/usb2/serial/uipaq2.c
  head/sys/dev/usb2/serial/ulpt2.c
  head/sys/dev/usb2/serial/umct2.c
  head/sys/dev/usb2/serial/umodem2.c
  head/sys/dev/usb2/serial/umoscom2.c
  head/sys/dev/usb2/serial/uplcom2.c
  head/sys/dev/usb2/serial/uslcom2.c
  head/sys/dev/usb2/serial/uvisor2.c
  head/sys/dev/usb2/serial/uvscom2.c
  head/sys/dev/usb2/sound/uaudio2.c
  head/sys/dev/usb2/storage/ata-usb2.c
  head/sys/dev/usb2/storage/umass2.c
  head/sys/dev/usb2/storage/urio2.c
  head/sys/dev/usb2/storage/ustorage2_fs.c
  head/sys/dev/usb2/wlan/if_rum2.c
  head/sys/dev/usb2/wlan/if_ural2.c
  head/sys/dev/usb2/wlan/if_zyd2.c
  head/sys/modules/usb2/bluetooth_fw/Makefile
  head/sys/modules/usb2/bluetooth_ng/Makefile
  head/sys/modules/usb2/core/Makefile
  head/sys/modules/usb2/ethernet_aue/Makefile
  head/sys/modules/usb2/ethernet_axe/Makefile
  head/sys/modules/usb2/ethernet_cdce/Makefile
  head/sys/modules/usb2/ethernet_cue/Makefile
  head/sys/modules/usb2/ethernet_dav/Makefile
  head/sys/modules/usb2/ethernet_kue/Makefile
  head/sys/modules/usb2/ethernet_rue/Makefile
  head/sys/modules/usb2/input_hid/Makefile
  head/sys/modules/usb2/input_kbd/Makefile
  head/sys/modules/usb2/input_ms/Makefile
  head/sys/modules/usb2/misc_dbp/Makefile
  head/sys/modules/usb2/misc_fm/Makefile
  head/sys/modules/usb2/quirk/Makefile
  head/sys/modules/usb2/scanner/Makefile
  head/sys/modules/usb2/serial_3g/Makefile
  head/sys/modules/usb2/serial_ark/Makefile
  head/sys/modules/usb2/serial_bsa/Makefile
  head/sys/modules/usb2/serial_bser/Makefile
  head/sys/modules/usb2/serial_chcom/Makefile
  head/sys/modules/usb2/serial_cycom/Makefile
  head/sys/modules/usb2/serial_foma/Makefile
  head/sys/modules/usb2/serial_ftdi/Makefile
  head/sys/modules/usb2/serial_gensa/Makefile
  head/sys/modules/usb2/serial_ipaq/Makefile
  head/sys/modules/usb2/serial_lpt/Makefile
  head/sys/modules/usb2/serial_mct/Makefile
  head/sys/modules/usb2/serial_modem/Makefile
  head/sys/modules/usb2/serial_moscom/Makefile
  head/sys/modules/usb2/serial_plcom/Makefile
  head/sys/modules/usb2/serial_slcom/Makefile
  head/sys/modules/usb2/serial_visor/Makefile
  head/sys/modules/usb2/serial_vscom/Makefile
  head/sys/modules/usb2/sound/Makefile
  head/sys/modules/usb2/storage_ata/Makefile
  head/sys/modules/usb2/storage_fs/Makefile
  head/sys/modules/usb2/storage_mass/Makefile
  head/sys/modules/usb2/storage_rio/Makefile
  head/sys/modules/usb2/template/Makefile
  head/sys/modules/usb2/wlan_ral/Makefile
  head/sys/modules/usb2/wlan_rum/Makefile
  head/sys/modules/usb2/wlan_zyd/Makefile

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/conf/files	Wed Feb 18 06:33:10 2009	(r188746)
@@ -80,12 +80,12 @@ teken_state.h		optional sc					   \
 	compile-with	"${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"teken_state.h"
-usbdevs.h			optional usb				   \
+usbdevs.h			optional usb | usb2_core		   \
 	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"usbdevs.h"
-usbdevs_data.h			optional usb				   \
+usbdevs_data.h			optional usb | usb2_core		   \
 	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \
 	no-obj no-implicit-rule before-depend				   \

Modified: head/sys/dev/usb2/bluetooth/ng_ubt2.c
==============================================================================
--- head/sys/dev/usb2/bluetooth/ng_ubt2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/bluetooth/ng_ubt2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -92,7 +92,7 @@
  * that this pointer is valid.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/bluetooth/ubtbcmfw2.c
==============================================================================
--- head/sys/dev/usb2/bluetooth/ubtbcmfw2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/bluetooth/ubtbcmfw2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -31,7 +31,7 @@
  * $FreeBSD$
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/core/usb2_device.c
==============================================================================
--- head/sys/dev/usb2/core/usb2_device.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/core/usb2_device.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -29,7 +29,7 @@
 #include <dev/usb2/include/usb2_error.h>
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_ioctl.h>
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 
 #define	USB_DEBUG_VAR usb2_debug
 
@@ -1869,8 +1869,8 @@ struct usb_knowndev {
 
 #define	USB_KNOWNDEV_NOPROD	0x01	/* match on vendor only */
 
-#include <dev/usb2/include/usb2_devid.h>
-#include <dev/usb2/include/usb2_devtable.h>
+#include "usbdevs.h"
+#include "usbdevs_data.h"
 #endif					/* USB_VERBOSE */
 
 /*------------------------------------------------------------------------*

Modified: head/sys/dev/usb2/ethernet/if_aue2.c
==============================================================================
--- head/sys/dev/usb2/ethernet/if_aue2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/ethernet/if_aue2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$");
  * transfers are done using usb2_transfer() and friends.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/ethernet/if_axe2.c
==============================================================================
--- head/sys/dev/usb2/ethernet/if_axe2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/ethernet/if_axe2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$");
  * http://www.asix.com.tw/FrootAttach/datasheet/AX88772_datasheet_Rev10.pdf
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/ethernet/if_cdce2.c
==============================================================================
--- head/sys/dev/usb2/ethernet/if_cdce2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/ethernet/if_cdce2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -43,7 +43,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/ethernet/if_cue2.c
==============================================================================
--- head/sys/dev/usb2/ethernet/if_cue2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/ethernet/if_cue2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
  * transaction, which helps performance a great deal.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/ethernet/if_kue2.c
==============================================================================
--- head/sys/dev/usb2/ethernet/if_kue2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/ethernet/if_kue2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
  * the development of this driver.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/ethernet/if_rue2.c
==============================================================================
--- head/sys/dev/usb2/ethernet/if_rue2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/ethernet/if_rue2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
  * ftp://ftp.realtek.com.tw/lancard/data_sheet/8150/.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/ethernet/if_udav2.c
==============================================================================
--- head/sys/dev/usb2/ethernet/if_udav2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/ethernet/if_udav2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -46,7 +46,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/image/uscanner2.c
==============================================================================
--- head/sys/dev/usb2/image/uscanner2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/image/uscanner2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/input/uhid2.c
==============================================================================
--- head/sys/dev/usb2/input/uhid2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/input/uhid2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/input/ums2.c
==============================================================================
--- head/sys/dev/usb2/input/ums2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/input/ums2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/misc/udbp2.c
==============================================================================
--- head/sys/dev/usb2/misc/udbp2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/misc/udbp2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
  *
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/misc/ufm2.c
==============================================================================
--- head/sys/dev/usb2/misc/ufm2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/misc/ufm2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@
 __FBSDID("$FreeBSD$");
 
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/quirk/usb2_quirk.c
==============================================================================
--- head/sys/dev/usb2/quirk/usb2_quirk.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/quirk/usb2_quirk.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -29,7 +29,7 @@
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_ioctl.h>
 #include <dev/usb2/include/usb2_mfunc.h>
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 
 #define	USB_DEBUG_VAR usb2_debug
 

Modified: head/sys/dev/usb2/serial/u3g2.c
==============================================================================
--- head/sys/dev/usb2/serial/u3g2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/u3g2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -33,7 +33,7 @@
  * - The device ID's are stored in "core/usb2_msctest.c"
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/uark2.c
==============================================================================
--- head/sys/dev/usb2/serial/uark2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/uark2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -23,7 +23,7 @@
  * be called from within the config thread function !
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/ubsa2.c
==============================================================================
--- head/sys/dev/usb2/serial/ubsa2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/ubsa2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/uchcom2.c
==============================================================================
--- head/sys/dev/usb2/serial/uchcom2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/uchcom2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$");
  * driver for WinChipHead CH341/340, the worst USB-serial chip in the world.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/ucycom2.c
==============================================================================
--- head/sys/dev/usb2/serial/ucycom2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/ucycom2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
  * RS232 bridges.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/ufoma2.c
==============================================================================
--- head/sys/dev/usb2/serial/ufoma2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/ufoma2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$");
  * be called from within the config thread function !
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/uftdi2.c
==============================================================================
--- head/sys/dev/usb2/serial/uftdi2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/uftdi2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
  * FTDI FT8U100AX serial adapter driver
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/ugensa2.c
==============================================================================
--- head/sys/dev/usb2/serial/ugensa2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/ugensa2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -42,7 +42,7 @@
  * be called from within the config thread function !
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/uipaq2.c
==============================================================================
--- head/sys/dev/usb2/serial/uipaq2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/uipaq2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -51,7 +51,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/ulpt2.c
==============================================================================
--- head/sys/dev/usb2/serial/ulpt2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/ulpt2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
  * Printer Class spec: http://www.usb.org/developers/devclass_docs/usbprint11.pdf
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/umct2.c
==============================================================================
--- head/sys/dev/usb2/serial/umct2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/umct2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
  * be called from within the config thread function !
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/umodem2.c
==============================================================================
--- head/sys/dev/usb2/serial/umodem2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/umodem2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$");
  *
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/umoscom2.c
==============================================================================
--- head/sys/dev/usb2/serial/umoscom2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/umoscom2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -17,7 +17,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/uplcom2.c
==============================================================================
--- head/sys/dev/usb2/serial/uplcom2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/uplcom2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$");
  * documented in the datasheet.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/uslcom2.c
==============================================================================
--- head/sys/dev/usb2/serial/uslcom2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/uslcom2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -19,7 +19,7 @@ __FBSDID("$FreeBSD$");
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/uvisor2.c
==============================================================================
--- head/sys/dev/usb2/serial/uvisor2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/uvisor2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -54,7 +54,7 @@
  * Handspring Visor (Palmpilot compatible PDA) driver
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/serial/uvscom2.c
==============================================================================
--- head/sys/dev/usb2/serial/uvscom2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/serial/uvscom2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
  * P-in m at ater and various data communication card adapters.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/sound/uaudio2.c
==============================================================================
--- head/sys/dev/usb2/sound/uaudio2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/sound/uaudio2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -52,7 +52,7 @@
  *  $NetBSD: uaudio.c,v 1.97 2005/02/24 08:19:38 martin Exp $
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/storage/ata-usb2.c
==============================================================================
--- head/sys/dev/usb2/storage/ata-usb2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/storage/ata-usb2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -30,7 +30,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/storage/umass2.c
==============================================================================
--- head/sys/dev/usb2/storage/umass2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/storage/umass2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -102,7 +102,7 @@ __FBSDID("$FreeBSD$");
  * umass_cam_cb again to complete the CAM command.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/storage/urio2.c
==============================================================================
--- head/sys/dev/usb2/storage/urio2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/storage/urio2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
  * 2000/2/24  first version.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/storage/ustorage2_fs.c
==============================================================================
--- head/sys/dev/usb2/storage/ustorage2_fs.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/storage/ustorage2_fs.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -35,7 +35,7 @@
  * NOTE: Much of the SCSI statemachine handling code derives from the
  * Linux USB gadget stack.
  */
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/wlan/if_rum2.c
==============================================================================
--- head/sys/dev/usb2/wlan/if_rum2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/wlan/if_rum2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
  * http://www.ralinktech.com.tw/
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/wlan/if_ural2.c
==============================================================================
--- head/sys/dev/usb2/wlan/if_ural2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/wlan/if_ural2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$");
  * http://www.ralinktech.com/
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/dev/usb2/wlan/if_zyd2.c
==============================================================================
--- head/sys/dev/usb2/wlan/if_zyd2.c	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/dev/usb2/wlan/if_zyd2.c	Wed Feb 18 06:33:10 2009	(r188746)
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
  * ZyDAS ZD1211/ZD1211B USB WLAN driver.
  */
 
-#include <dev/usb2/include/usb2_devid.h>
+#include "usbdevs.h"
 #include <dev/usb2/include/usb2_standard.h>
 #include <dev/usb2/include/usb2_mfunc.h>
 #include <dev/usb2/include/usb2_error.h>

Modified: head/sys/modules/usb2/bluetooth_fw/Makefile
==============================================================================
--- head/sys/modules/usb2/bluetooth_fw/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/bluetooth_fw/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_bluetooth_fw
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_netgraph.h
+SRCS+= opt_usb.h opt_bus.h opt_netgraph.h usbdevs.h
 SRCS+= ubtbcmfw2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/bluetooth_ng/Makefile
==============================================================================
--- head/sys/modules/usb2/bluetooth_ng/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/bluetooth_ng/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_bluetooth_ng
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_netgraph.h
+SRCS+= opt_usb.h opt_bus.h opt_netgraph.h usbdevs.h
 SRCS+= ng_ubt2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/core/Makefile
==============================================================================
--- head/sys/modules/usb2/core/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/core/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,6 +32,7 @@ S=     ${.CURDIR}/../../..
 KMOD=  usb2_core
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h opt_usb.h opt_bus.h
+SRCS+= usbdevs.h usbdevs_data.h
 SRCS+= usb2_if.c
 SRCS+= usb2_busdma.c
 SRCS+= usb2_compat_linux.c

Modified: head/sys/modules/usb2/ethernet_aue/Makefile
==============================================================================
--- head/sys/modules/usb2/ethernet_aue/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/ethernet_aue/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_aue
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_aue2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/ethernet_axe/Makefile
==============================================================================
--- head/sys/modules/usb2/ethernet_axe/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/ethernet_axe/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_axe
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_axe2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/ethernet_cdce/Makefile
==============================================================================
--- head/sys/modules/usb2/ethernet_cdce/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/ethernet_cdce/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_cdce
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_cdce2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/ethernet_cue/Makefile
==============================================================================
--- head/sys/modules/usb2/ethernet_cue/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/ethernet_cue/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_cue
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_cue2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/ethernet_dav/Makefile
==============================================================================
--- head/sys/modules/usb2/ethernet_dav/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/ethernet_dav/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_dav
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_udav2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/ethernet_kue/Makefile
==============================================================================
--- head/sys/modules/usb2/ethernet_kue/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/ethernet_kue/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_kue
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_kue2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/ethernet_rue/Makefile
==============================================================================
--- head/sys/modules/usb2/ethernet_rue/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/ethernet_rue/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_rue
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_rue2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/input_hid/Makefile
==============================================================================
--- head/sys/modules/usb2/input_hid/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/input_hid/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_input_hid
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h usbdevs.h
 SRCS+= uhid2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/input_kbd/Makefile
==============================================================================
--- head/sys/modules/usb2/input_kbd/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/input_kbd/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_input_kbd
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h usbdevs.h
 SRCS+= ukbd2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/input_ms/Makefile
==============================================================================
--- head/sys/modules/usb2/input_ms/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/input_ms/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_input_ms
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h usbdevs.h
 SRCS+= ums2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/misc_dbp/Makefile
==============================================================================
--- head/sys/modules/usb2/misc_dbp/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/misc_dbp/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_misc_dbp
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_netgraph.h
+SRCS+= opt_usb.h opt_bus.h opt_netgraph.h usbdevs.h
 SRCS+= udbp2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/misc_fm/Makefile
==============================================================================
--- head/sys/modules/usb2/misc_fm/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/misc_fm/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_misc_fm
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_netgraph.h
+SRCS+= opt_usb.h opt_bus.h opt_netgraph.h usbdevs.h
 SRCS+= ufm2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/quirk/Makefile
==============================================================================
--- head/sys/modules/usb2/quirk/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/quirk/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -31,7 +31,7 @@ S=     ${.CURDIR}/../../..
 
 KMOD=  usb2_quirk
 SRCS= 
-SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h opt_usb.h opt_bus.h
+SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h opt_usb.h opt_bus.h usbdevs.h
 SRCS+= usb2_quirk.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/scanner/Makefile
==============================================================================
--- head/sys/modules/usb2/scanner/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/scanner/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_scanner
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h 
+SRCS+= opt_usb.h opt_bus.h  usbdevs.h
 SRCS+= uscanner2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_3g/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_3g/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_3g/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_3g
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= u3g2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_ark/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_ark/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_ark/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_ark
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uark2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_bsa/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_bsa/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_bsa/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_bsa
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ubsa2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_bser/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_bser/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_bser/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_bser
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ubser2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_chcom/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_chcom/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_chcom/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_chcom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uchcom2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_cycom/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_cycom/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_cycom/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_cycom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ucycom2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_foma/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_foma/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_foma/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_foma
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ufoma2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_ftdi/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_ftdi/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_ftdi/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_ftdi
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uftdi2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_gensa/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_gensa/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_gensa/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_gensa
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ugensa2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_ipaq/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_ipaq/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_ipaq/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_ipaq
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uipaq2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_lpt/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_lpt/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_lpt/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_lpt
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ulpt2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_mct/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_mct/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_mct/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_mct
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= umct2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_modem/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_modem/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_modem/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_modem
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= umodem2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_moscom/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_moscom/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_moscom/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_moscom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= umoscom2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_plcom/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_plcom/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_plcom/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_plcom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uplcom2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_slcom/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_slcom/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_slcom/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_slcom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uslcom2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_visor/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_visor/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_visor/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_visor
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uvisor2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/serial_vscom/Makefile
==============================================================================
--- head/sys/modules/usb2/serial_vscom/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/serial_vscom/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_vscom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uvscom2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/sound/Makefile
==============================================================================
--- head/sys/modules/usb2/sound/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/sound/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=     ${.CURDIR}/../../..
 KMOD=  usb2_sound
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h feeder_if.h channel_if.h
+SRCS+= opt_usb.h opt_bus.h feeder_if.h channel_if.h usbdevs.h
 SRCS+= mixer_if.h
 
 SRCS+= usb2_sound.c

Modified: head/sys/modules/usb2/storage_ata/Makefile
==============================================================================
--- head/sys/modules/usb2/storage_ata/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/storage_ata/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_storage_ata
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h
+SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h
 SRCS+= ata-usb2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/storage_fs/Makefile
==============================================================================
--- head/sys/modules/usb2/storage_fs/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/storage_fs/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_storage_fs
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h
+SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h
 SRCS+= ustorage2_fs.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/storage_mass/Makefile
==============================================================================
--- head/sys/modules/usb2/storage_mass/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/storage_mass/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_storage_mass
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h
+SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h
 SRCS+= umass2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/storage_rio/Makefile
==============================================================================
--- head/sys/modules/usb2/storage_rio/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/storage_rio/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_storage_rio
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h
+SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h
 SRCS+= urio2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/template/Makefile
==============================================================================
--- head/sys/modules/usb2/template/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/template/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -31,7 +31,7 @@ S=     ${.CURDIR}/../../..
 
 KMOD=  usb2_template
 SRCS= 
-SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h opt_usb.h opt_bus.h
+SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h opt_usb.h opt_bus.h usbdevs.h
 SRCS+= usb2_template.c
 SRCS+= usb2_template_cdce.c
 SRCS+= usb2_template_msc.c

Modified: head/sys/modules/usb2/wlan_ral/Makefile
==============================================================================
--- head/sys/modules/usb2/wlan_ral/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/wlan_ral/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_wlan_ral
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_ural2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/wlan_rum/Makefile
==============================================================================
--- head/sys/modules/usb2/wlan_rum/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/wlan_rum/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_wlan_rum
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_rum2.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb2/wlan_zyd/Makefile
==============================================================================
--- head/sys/modules/usb2/wlan_zyd/Makefile	Wed Feb 18 06:17:13 2009	(r188745)
+++ head/sys/modules/usb2/wlan_zyd/Makefile	Wed Feb 18 06:33:10 2009	(r188746)
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_wlan_zyd
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_zyd2.c
 
 .include <bsd.kmod.mk>

More information about the svn-src-head mailing list