Regen

2 files changed, 49 insertions, 14 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index f7caad7..0064df8 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: src/sys/dev/usb/usbdevs,v 1.106 2003/01/21 11:37:54 joe Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.109 2003/02/01 22:50:50 sanpei Exp 
  */
 
 /*
@@ -601,9 +601,9 @@
 #define	USB_PRODUCT_EPSON_1240	0x010b		/* Perfection 1240U / 1240Photo scanner */
 #define	USB_PRODUCT_EPSON_640U	0x010c		/* Perfection 640U scanner */
 #define	USB_PRODUCT_EPSON_1650	0x0110		/* Perfection 1650 scanner */
-#define	USB_PRODUCT_EPSON_1660	0x011e		/* Perfection 1660 scanner */
 #define	USB_PRODUCT_EPSON_GT9700F	0x0112		/* GT-9700F scanner */
 #define	USB_PRODUCT_EPSON_1260	0x011d		/* Perfection 1260 scanner */
+#define	USB_PRODUCT_EPSON_1660	0x011e		/* Perfection 1660 scanner */
 
 /* e-TEK Labs products */
 #define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
@@ -633,6 +633,11 @@
 /* Fuji photo products */
 #define	USB_PRODUCT_FUJIPHOTO_MASS0100	0x0100		/* Mass Storage */
 
+/* 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 */
@@ -809,6 +814,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 */
@@ -1075,7 +1081,8 @@
 
 /* Telex Communications products */
 #define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Enhanced USB Microphone */
-#define USB_PRODUCT_TREK_THUMBDRIVE_8MB	0x9988		/* ThumbDrive 8MB */
+#define	USB_PRODUCT_TREK_THUMBDRIVE_8MB	0x9988		/* ThumbDrive_8MB */
+
 /* Texas Intel products */
 #define	USB_PRODUCT_TI_UTUSB41	0x1446		/* UT-USB41 hub */
 #define	USB_PRODUCT_TI_TUSB2046	0x2046		/* TUSB2046 hub */
@@ -1085,8 +1092,7 @@
 
 /* Trek Technology products */
 #define	USB_PRODUCT_TREK_THUMBDRIVE	0x1111		/* ThumbDrive */
-
-#define USB_PRODUCT_TREK_THUMBDRIVE_8MB	0x9988		/* ThumbDrive */
+#define	USB_PRODUCT_TREK_THUMBDRIVE	0x9988		/* ThumbDrive */
 
 /* 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 7b2cadf..4e21d18 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: src/sys/dev/usb/usbdevs,v 1.106 2003/01/21 11:37:54 joe Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.109 2003/02/01 22:50:50 sanpei Exp 
  */
 
 /*
@@ -898,12 +898,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Perfection 1650 scanner",
 	},
 	{
-	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660,
-	    0,
-	    "Seiko Epson",
-	    "Perfection 1660 scanner",
-	},
-	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F,
 	    0,
 	    "Seiko Epson",
@@ -916,6 +910,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Perfection 1260 scanner",
 	},
 	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660,
+	    0,
+	    "Seiko Epson",
+	    "Perfection 1660 scanner",
+	},
+	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
 	    0,
 	    "e-TEK Labs",
@@ -976,6 +976,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Mass Storage",
 	},
 	{
+	    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 +1684,12 @@ const 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",
@@ -2572,6 +2596,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Enhanced USB Microphone",
 	},
 	{
+	    USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB,
+	    0,
+	    "Trek Technology",
+	    "ThumbDrive_8MB",
+	},
+	{
 	    USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,
 	    0,
 	    "Texas Instruments",
@@ -2595,9 +2625,8 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Trek Technology",
 	    "ThumbDrive",
 	},
-
 	{
-	    USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB,
+	    USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,
 	    0,
 	    "Trek Technology",
 	    "ThumbDrive",