2 files changed, 87 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index e26a756e053e..7fb406e5625e 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.11.2.36 2003/02/11 12:37:58 sanpei Exp 
  */
 
 /*
@@ -115,6 +115,7 @@
 #define	USB_VENDOR_LOGITECH	0x046d		/* Logitech */
 #define	USB_VENDOR_BTC	0x046e		/* Behavior Tech. Computer */
 #define	USB_VENDOR_PHILIPS	0x0471		/* Philips */
+#define	USB_VENDOR_SANYO	0x0474		/* Sanyo Electric */
 #define	USB_VENDOR_CONNECTIX	0x0478		/* Connectix */
 #define	USB_VENDOR_KENSINGTON	0x047d		/* Kensington */
 #define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
@@ -335,6 +336,7 @@
 #define	USB_VENDOR_BROADCOM	0x0a5c		/* Broadcom */
 #define	USB_VENDOR_GREENHOUSE	0x0a6b		/* GREENHOUSE */
 #define	USB_VENDOR_GEOCAST	0x0a79		/* Geocast Network Systems */
+#define	USB_VENDOR_NEODIO	0x0aec		/* Neodio */
 #define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
 #define	USB_VENDOR_NEC2	0x0b62		/* NEC */
 #define	USB_VENDOR_ATI2	0x0b6f		/* ATI */
@@ -631,6 +633,14 @@
 /* Fuji photo products */
 #define	USB_PRODUCT_FUJIPHOTO_MASS0100	0x0100		/* Mass Storage */
 
+/* Fujitsu protducts */
+#define	USB_PRODUCT_FUJITSU_AH_F401U	0x105b		/* AH-F401U Air H device */
+
+/* Genesys Logic products */
+#define	USB_PRODUCT_GENESYS_GL650	0x0604		/* GL650 Hub */
+#define	USB_PRODUCT_GENESYS_GL641USB	0x0700		/* GL641USB CompactFlash Card Reader */
+#define	USB_PRODUCT_GENESYS_GL641USB2IDE	0x0702		/* GL641USB USB-IDE Bridge */
+
 /* Hagiwara products */
 #define	USB_PRODUCT_HAGIWARA_FGSM	0x0002		/* FlashGate SmartMedia Card Reader */
 #define	USB_PRODUCT_HAGIWARA_FGCF	0x0003		/* FlashGate CompactFlash Card Reader */
@@ -807,6 +817,7 @@
 #define	USB_PRODUCT_MELCO_LUATX1	0x0001		/* LUA-TX Ethernet */
 #define	USB_PRODUCT_MELCO_LUATX5	0x0005		/* LUA-TX Ethernet */
 #define	USB_PRODUCT_MELCO_LUA2TX5	0x0009		/* LUA2-TX Ethernet */
+#define	USB_PRODUCT_MELCO_DUBPXXG	0x001c		/* USB-IDE Bridge: DUB-PxxG */
 
 /* Metricom products */
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
@@ -874,6 +885,9 @@
 #define	USB_PRODUCT_NEC_HUB	0x55aa		/* hub */
 #define	USB_PRODUCT_NEC_HUB_B	0x55ab		/* hub */
 
+/* NEODIO products */
+#define	USB_PRODUCT_NEODIO_ND5010	0x5010		/* Multi-format Flash Controller */
+
 /* NetChip Technology Products */
 #define	USB_PRODUCT_NETCHIP_TURBOCONNECT	0x1080		/* Turbo-Connect */
 
@@ -980,6 +994,9 @@
 #define	USB_PRODUCT_SANDISK_SDDR12	0x0100		/* ImageMate SDDR-12 */
 #define	USB_PRODUCT_SANDISK_SDDR09	0x0200		/* ImageMate SDDR-09 */
 
+/* Sanyo Electric products */
+#define	USB_PRODUCT_SANYO_SCP4900	0x0701		/* Sanyo SCP-4900 USB Phone */
+
 /* ScanLogic products */
 #define	USB_PRODUCT_SCANLOGIC_SL11R	0x0002		/* SL11R IDE Adapter */
 #define	USB_PRODUCT_SCANLOGIC_336CX	0x0300		/* Phantom 336CX - C3 scanner */
@@ -1039,6 +1056,7 @@
 #define	USB_PRODUCT_STSN_STSN0001	0x0001		/* Internet Access Device */
 
 /* SUN Corporation products */
+#define	USB_PRODUCT_SUNTAC_DS96L	0x0003		/* SUNTAC U-Cable type D2 */
 #define	USB_PRODUCT_SUNTAC_PS64P1	0x0005		/* SUNTAC U-Cable type P1 */
 #define	USB_PRODUCT_SUNTAC_VS10U	0x0009		/* SUNTAC Slipper U */
 
@@ -1077,8 +1095,7 @@
 
 /* Trek Technology products */
 #define	USB_PRODUCT_TREK_THUMBDRIVE	0x1111		/* ThumbDrive */
-
-#define USB_PRODUCT_TREK_THUMBDRIVE_8MB	0x9988		/* ThumbDrive */
+#define	USB_PRODUCT_TREK_THUMBDRIVE_8MB	0x9988		/* ThumbDrive_8MB */
 
 /* Ultima products */
 #define	USB_PRODUCT_ULTIMA_1200UBPLUS	0x4002		/* 1200 UB Plus scanner */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index edfa4e2495b7..ba7d65b80c8f 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.11.2.36 2003/02/11 12:37:58 sanpei Exp 
  */
 
 /*
@@ -976,6 +976,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Mass Storage",
 	},
 	{
+	    USB_VENDOR_FUJITSU, USB_PRODUCT_FUJITSU_AH_F401U,
+	    0,
+	    "Fujitsu",
+	    "AH-F401U Air H device",
+	},
+	{
+	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL650,
+	    0,
+	    "Genesys Logic",
+	    "GL650 Hub",
+	},
+	{
+	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB,
+	    0,
+	    "Genesys Logic",
+	    "GL641USB CompactFlash Card Reader",
+	},
+	{
+	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB2IDE,
+	    0,
+	    "Genesys Logic",
+	    "GL641USB USB-IDE Bridge",
+	},
+	{
 	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,
 	    0,
 	    "Hagiwara Sys-Com",
@@ -1666,6 +1690,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "LUA2-TX Ethernet",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_DUBPXXG,
+	    0,
+	    "Melco",
+	    "USB-IDE Bridge: DUB-PxxG",
+	},
+	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
 	    0,
 	    "Metricom",
@@ -1906,6 +1936,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "hub",
 	},
 	{
+	    USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND5010,
+	    0,
+	    "Neodio",
+	    "Multi-format Flash Controller",
+	},
+	{
 	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT,
 	    0,
 	    "NetChip Technology",
@@ -2278,6 +2314,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "ImageMate SDDR-09",
 	},
 	{
+	    USB_VENDOR_SANYO, USB_PRODUCT_SANYO_SCP4900,
+	    0,
+	    "Sanyo Electric",
+	    "Sanyo SCP-4900 USB Phone",
+	},
+	{
 	    USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R,
 	    0,
 	    "ScanLogic",
@@ -2470,6 +2512,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Internet Access Device",
 	},
 	{
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_DS96L,
+	    0,
+	    "SUN Corporation",
+	    "SUNTAC U-Cable type D2",
+	},
+	{
 	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
 	    0,
 	    "SUN Corporation",
@@ -2584,6 +2632,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "ThumbDrive",
 	},
 	{
+	    USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB,
+	    0,
+	    "Trek Technology",
+	    "ThumbDrive_8MB",
+	},
+	{
 	    USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS,
 	    0,
 	    "Ultima",
@@ -2956,6 +3010,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SANYO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Sanyo Electric",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CONNECTIX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Connectix",
@@ -4276,6 +4336,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_NEODIO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Neodio",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_TODOS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Todos Data System",