Readd the Alcor Transcend device which is referenced in usb2/storage/umass2.c,

regenerate the usb2 dev tables for the scanner additions while I am here.

3 files changed, 57 insertions, 14 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 383bfdd..0b9cea8 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -808,6 +808,7 @@ product AKS USBHASP		0x0001	USB-HASP 0.06
 /* Alcor Micro, Inc. products */
 product ALCOR2 KBD_HUB		0x2802	Kbd Hub
 
+product ALCOR TRANSCEND		0x6387	Transcend JetFlash Drive
 product ALCOR MA_KBD_HUB	0x9213	MacAlly Kbd Hub
 product ALCOR AU9814		0x9215	AU9814 Hub
 product ALCOR UMCR_9361		0x9361	USB Multimedia Card Reader
diff --git a/sys/dev/usb2/include/usb2_devid.h b/sys/dev/usb2/include/usb2_devid.h
index c5b5109..c17740c 100644
--- a/sys/dev/usb2/include/usb2_devid.h
+++ b/sys/dev/usb2/include/usb2_devid.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.390 2008/12/23 13:09:17 remko Exp 
+ *	FreeBSD: head/sys/dev/usb/usbdevs 186651 2008-12-31 14:25:14Z luigi 
  */
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
@@ -1247,12 +1247,18 @@
 #define	USB_PRODUCT_EPSON_CX5400	0x0808		/* CX5400 scanner */
 #define	USB_PRODUCT_EPSON_3500	0x080e		/* CX-3500/3600/3650 MFP */
 #define	USB_PRODUCT_EPSON_RX425	0x080f		/* Stylus Photo RX425 scanner */
-#define	USB_PRODUCT_EPSON_4800	0x0819		/* CX4800 MP scanner */
-#define	USB_PRODUCT_EPSON_4200	0x0820		/* CX4200 MP scanner */
-#define	USB_PRODUCT_EPSON_5000	0x082b		/* DX-50x0 MFP scanner */
-#define	USB_PRODUCT_EPSON_6000	0x082e		/* DX-60x0 MFP scanner */
-#define	USB_PRODUCT_EPSON_DX7400	0x0838		/* DX7400/CX7300 scanner */
-#define	USB_PRODUCT_EPSON_DX8400	0x0839		/* DX8400 scanner */
+#define	USB_PRODUCT_EPSON_DX3800	0x0818		/* CX3700/CX3800/DX38x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_4800	0x0819		/* CX4700/CX4800/DX48x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_4200	0x0820		/* CX4100/CX4200/DX4200 MFP scanner */
+#define	USB_PRODUCT_EPSON_5000	0x082b		/* CX4900/CX5000/DX50x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_6000	0x082e		/* CX5900/CX6000/DX60x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_DX4000	0x082f		/* DX4000 MFP scanner */
+#define	USB_PRODUCT_EPSON_DX7400	0x0838		/* CX7300/CX7400/DX7400 MFP scanner */
+#define	USB_PRODUCT_EPSON_DX8400	0x0839		/* CX8300/CX8400/DX8400 MFP scanner */
+#define	USB_PRODUCT_EPSON_SX100	0x0841		/* SX100/NX100 MFP scanner */
+#define	USB_PRODUCT_EPSON_NX300	0x0848		/* NX300 MFP scanner */
+#define	USB_PRODUCT_EPSON_SX200	0x0849		/* SX200/SX205 MFP scanner */
+#define	USB_PRODUCT_EPSON_SX400	0x084a		/* SX400/NX400/TX400 MFP scanner */
 
 /* e-TEK Labs products */
 #define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial */
diff --git a/sys/dev/usb2/include/usb2_devtable.h b/sys/dev/usb2/include/usb2_devtable.h
index afc9ba9..9e92588 100644
--- a/sys/dev/usb2/include/usb2_devtable.h
+++ b/sys/dev/usb2/include/usb2_devtable.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.390 2008/12/23 13:09:17 remko Exp 
+ *	FreeBSD: head/sys/dev/usb/usbdevs 186651 2008-12-31 14:25:14Z luigi 
  */
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
@@ -2357,40 +2357,76 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Stylus Photo RX425 scanner",
 	},
 	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX3800,
+	    0,
+	    "Seiko Epson",
+	    "CX3700/CX3800/DX38x0 MFP scanner",
+	},
+	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4800,
 	    0,
 	    "Seiko Epson",
-	    "CX4800 MP scanner",
+	    "CX4700/CX4800/DX48x0 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4200,
 	    0,
 	    "Seiko Epson",
-	    "CX4200 MP scanner",
+	    "CX4100/CX4200/DX4200 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_5000,
 	    0,
 	    "Seiko Epson",
-	    "DX-50x0 MFP scanner",
+	    "CX4900/CX5000/DX50x0 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_6000,
 	    0,
 	    "Seiko Epson",
-	    "DX-60x0 MFP scanner",
+	    "CX5900/CX6000/DX60x0 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX4000,
+	    0,
+	    "Seiko Epson",
+	    "DX4000 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX7400,
 	    0,
 	    "Seiko Epson",
-	    "DX7400/CX7300 scanner",
+	    "CX7300/CX7400/DX7400 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX8400,
 	    0,
 	    "Seiko Epson",
-	    "DX8400 scanner",
+	    "CX8300/CX8400/DX8400 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX100,
+	    0,
+	    "Seiko Epson",
+	    "SX100/NX100 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_NX300,
+	    0,
+	    "Seiko Epson",
+	    "NX300 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX200,
+	    0,
+	    "Seiko Epson",
+	    "SX200/SX205 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX400,
+	    0,
+	    "Seiko Epson",
+	    "SX400/NX400/TX400 MFP scanner",
 	},
 	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,