more devices from NetBSD

3 files changed, 126 insertions, 10 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 66320c6db04..1ad13825d76 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.41 2002/01/03 15:42:12 nate Exp $
+$OpenBSD: usbdevs,v 1.42 2002/01/03 19:15:39 nate Exp $
 /* $NetBSD: usbdevs,v 1.211 2001/12/15 00:15:01 augustss Exp $ */
 
 /*
@@ -177,6 +177,7 @@ vendor DIGI		0x05c5	Digi International
 vendor QTRONIX		0x05c7	Qtronix
 vendor ELSA		0x05cc	ELSA
 vendor BRAINBOXES	0x05d1	Brainboxes Limited
+vendor ULTIMA		0x05d8	Ultima
 vendor AXIOHM		0x05d9	Axiohm Transaction Solutions
 vendor MICROTEK		0x05da	Microtek
 vendor LEXAR		0x05dc	Lexar Media
@@ -388,8 +389,15 @@ product AGATE QDRIVE		0x0378	Q-Drive
 
 /* AGFA products */
 product AGFA SNAPSCAN1212U	0x0001	SnapScan 1212U
+product AGFA SNAPSCAN1236U	0x0002	SnapScan 1236U
 product AGFA SNAPSCANTOUCH	0x0100	SnapScan Touch
 product AGFA SNAPSCAN1212U2	0x2061	SnapScan 1212U
+product AGFA SNAPSCANE40	0x208d	SnapScan e40
+product AGFA SNAPSCANE50	0x208f	SnapScan e50
+product AGFA SNAPSCANE20	0x2091	SnapScan e20
+product AGFA SNAPSCANE25	0x2095	SnapScan e25
+product AGFA SNAPSCANE26	0x2097	SnapScan e26
+product AGFA SNAPSCANE52	0x20fd	SnapScan e52
 
 /* AKS products */
 product AKS USBHASP		0x0001	USB-HASP 0.06
@@ -840,14 +848,18 @@ product MUSTEK 1200CU		0x0001	1200 CU scanner
 product MUSTEK 600CU		0x0002	600 CU scanner
 product MUSTEK 1200USB		0x0003	1200 scanner
 product MUSTEK 1200UB		0x0006	1200 UB scanner
+product MUSTEK 1200USBPLUS	0x0007	1200 Plus scanner
 product MUSTEK 1200CUPLUS	0x0008	1200 CU Plus scanner
+product MUSTEK BEARPAW1200F	0x0010	BearPaw 1200F scanner
+product MUSTEK 600USB		0x0873	600 scanner
 product MUSTEK MDC800		0xa800	MDC-800 digital camera
 
 /* M-Systems products */
 product MSYSTEMS DISKONKEY	0x0010	DiskOnKey
 
 /* National Semiconductor */
-product NATIONAL BEARPAW	0x1000	BearPaw 1200
+product NATIONAL BEARPAW1200	0x1000	BearPaw 1200
+product NATIONAL BEARPAW2400	0x1001	BearPaw 2400
 
 /* NEC products */
 product NEC HUB			0x55aa	hub
@@ -910,7 +922,7 @@ product PLX TESTBOARD		0x9060	test board
 
 /* PortGear products */
 product PORTGEAR EA8		0x0008	Ethernet
-product PORTGEAR EA9		0x0008	Ethernet
+product PORTGEAR EA9		0x0009	Ethernet
 
 /* Portsmith products */
 product PORTSMITH EEA		0x3003	Express Ethernet
@@ -1022,6 +1034,7 @@ product SONY MSACUS1		0x002d	Memorystick MSAC-US1
 product SONY MSC		0x0032	Sony MSC Memorystick Slot
 product SONY CLIE_35		0x0038	Sony Clie v3.5
 product SONY CLIE_40		0x0066	Sony Clie v4.0
+product SONY CLIE_40_MS		0x006d	Sony Clie v4.0 Memory Stick slot
 
 /* STMicroelectronics products */
 product STMICRO COMMUNICATOR	0x7554	Communicator
@@ -1068,6 +1081,9 @@ product	TODOS ARGOS_MINI	0x0002	Argos Mini Smartcard Reader
 /* Trek Technology products */
 product TREK THUMBDRIVE		0x1111	ThumbDrive
 
+/* Ultima products */
+product ULTIMA 1200UBPLUS	0x4002	1200 UB Plus scanner
+
 /* UMAX products */
 product UMAX ASTRA1236U		0x0002	Astra 1236U Scanner
 product UMAX ASTRA1220U		0x0010	Astra 1220U Scanner
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index d6367fe69fa..84ff6c7f206 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.41 2002/01/03 15:42:44 nate Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.42 2002/01/03 19:16:07 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.41 2002/01/03 15:42:12 nate Exp 
+ *	OpenBSD: usbdevs,v 1.42 2002/01/03 19:15:39 nate Exp 
  */
 /* $NetBSD: usbdevs,v 1.211 2001/12/15 00:15:01 augustss Exp $ */
 
@@ -184,6 +184,7 @@
 #define	USB_VENDOR_QTRONIX	0x05c7		/* Qtronix */
 #define	USB_VENDOR_ELSA	0x05cc		/* ELSA */
 #define	USB_VENDOR_BRAINBOXES	0x05d1		/* Brainboxes Limited */
+#define	USB_VENDOR_ULTIMA	0x05d8		/* Ultima */
 #define	USB_VENDOR_AXIOHM	0x05d9		/* Axiohm Transaction Solutions */
 #define	USB_VENDOR_MICROTEK	0x05da		/* Microtek */
 #define	USB_VENDOR_LEXAR	0x05dc		/* Lexar Media */
@@ -395,8 +396,15 @@
 
 /* AGFA products */
 #define	USB_PRODUCT_AGFA_SNAPSCAN1212U	0x0001		/* SnapScan 1212U */
+#define	USB_PRODUCT_AGFA_SNAPSCAN1236U	0x0002		/* SnapScan 1236U */
 #define	USB_PRODUCT_AGFA_SNAPSCANTOUCH	0x0100		/* SnapScan Touch */
 #define	USB_PRODUCT_AGFA_SNAPSCAN1212U2	0x2061		/* SnapScan 1212U */
+#define	USB_PRODUCT_AGFA_SNAPSCANE40	0x208d		/* SnapScan e40 */
+#define	USB_PRODUCT_AGFA_SNAPSCANE50	0x208f		/* SnapScan e50 */
+#define	USB_PRODUCT_AGFA_SNAPSCANE20	0x2091		/* SnapScan e20 */
+#define	USB_PRODUCT_AGFA_SNAPSCANE25	0x2095		/* SnapScan e25 */
+#define	USB_PRODUCT_AGFA_SNAPSCANE26	0x2097		/* SnapScan e26 */
+#define	USB_PRODUCT_AGFA_SNAPSCANE52	0x20fd		/* SnapScan e52 */
 
 /* AKS products */
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
@@ -847,14 +855,18 @@
 #define	USB_PRODUCT_MUSTEK_600CU	0x0002		/* 600 CU scanner */
 #define	USB_PRODUCT_MUSTEK_1200USB	0x0003		/* 1200 scanner */
 #define	USB_PRODUCT_MUSTEK_1200UB	0x0006		/* 1200 UB scanner */
+#define	USB_PRODUCT_MUSTEK_1200USBPLUS	0x0007		/* 1200 Plus scanner */
 #define	USB_PRODUCT_MUSTEK_1200CUPLUS	0x0008		/* 1200 CU Plus scanner */
+#define	USB_PRODUCT_MUSTEK_BEARPAW1200F	0x0010		/* BearPaw 1200F scanner */
+#define	USB_PRODUCT_MUSTEK_600USB	0x0873		/* 600 scanner */
 #define	USB_PRODUCT_MUSTEK_MDC800	0xa800		/* MDC-800 digital camera */
 
 /* M-Systems products */
 #define	USB_PRODUCT_MSYSTEMS_DISKONKEY	0x0010		/* DiskOnKey */
 
 /* National Semiconductor */
-#define	USB_PRODUCT_NATIONAL_BEARPAW	0x1000		/* BearPaw 1200 */
+#define	USB_PRODUCT_NATIONAL_BEARPAW1200	0x1000		/* BearPaw 1200 */
+#define	USB_PRODUCT_NATIONAL_BEARPAW2400	0x1001		/* BearPaw 2400 */
 
 /* NEC products */
 #define	USB_PRODUCT_NEC_HUB	0x55aa		/* hub */
@@ -917,7 +929,7 @@
 
 /* PortGear products */
 #define	USB_PRODUCT_PORTGEAR_EA8	0x0008		/* Ethernet */
-#define	USB_PRODUCT_PORTGEAR_EA9	0x0008		/* Ethernet */
+#define	USB_PRODUCT_PORTGEAR_EA9	0x0009		/* Ethernet */
 
 /* Portsmith products */
 #define	USB_PRODUCT_PORTSMITH_EEA	0x3003		/* Express Ethernet */
@@ -1029,6 +1041,7 @@
 #define	USB_PRODUCT_SONY_MSC	0x0032		/* Sony MSC Memorystick Slot */
 #define	USB_PRODUCT_SONY_CLIE_35	0x0038		/* Sony Clie v3.5 */
 #define	USB_PRODUCT_SONY_CLIE_40	0x0066		/* Sony Clie v4.0 */
+#define	USB_PRODUCT_SONY_CLIE_40_MS	0x006d		/* Sony Clie v4.0 Memory Stick slot */
 
 /* STMicroelectronics products */
 #define	USB_PRODUCT_STMICRO_COMMUNICATOR	0x7554		/* Communicator */
@@ -1075,6 +1088,9 @@
 /* Trek Technology products */
 #define	USB_PRODUCT_TREK_THUMBDRIVE	0x1111		/* ThumbDrive */
 
+/* Ultima products */
+#define	USB_PRODUCT_ULTIMA_1200UBPLUS	0x4002		/* 1200 UB Plus scanner */
+
 /* UMAX products */
 #define	USB_PRODUCT_UMAX_ASTRA1236U	0x0002		/* Astra 1236U Scanner */
 #define	USB_PRODUCT_UMAX_ASTRA1220U	0x0010		/* Astra 1220U Scanner */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 3e884d0c515..e7a1979f8a4 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.41 2002/01/03 15:42:44 nate Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.42 2002/01/03 19:16:07 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.41 2002/01/03 15:42:12 nate Exp 
+ *	OpenBSD: usbdevs,v 1.42 2002/01/03 19:15:39 nate Exp 
  */
 /* $NetBSD: usbdevs,v 1.211 2001/12/15 00:15:01 augustss Exp $ */
 
@@ -263,6 +263,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "SnapScan 1212U",
 	},
 	{
+	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1236U,
+	    0,
+	    "AGFA-Gevaert",
+	    "SnapScan 1236U",
+	},
+	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH,
 	    0,
 	    "AGFA-Gevaert",
@@ -275,6 +281,42 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "SnapScan 1212U",
 	},
 	{
+	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE40,
+	    0,
+	    "AGFA-Gevaert",
+	    "SnapScan e40",
+	},
+	{
+	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE50,
+	    0,
+	    "AGFA-Gevaert",
+	    "SnapScan e50",
+	},
+	{
+	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE20,
+	    0,
+	    "AGFA-Gevaert",
+	    "SnapScan e20",
+	},
+	{
+	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE25,
+	    0,
+	    "AGFA-Gevaert",
+	    "SnapScan e25",
+	},
+	{
+	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE26,
+	    0,
+	    "AGFA-Gevaert",
+	    "SnapScan e26",
+	},
+	{
+	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE52,
+	    0,
+	    "AGFA-Gevaert",
+	    "SnapScan e52",
+	},
+	{
 	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
 	    0,
 	    "Aladdin Knowledge Systems",
@@ -1865,12 +1907,30 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "1200 UB scanner",
 	},
 	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USBPLUS,
+	    0,
+	    "Mustek Systems",
+	    "1200 Plus scanner",
+	},
+	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CUPLUS,
 	    0,
 	    "Mustek Systems",
 	    "1200 CU Plus scanner",
 	},
 	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200F,
+	    0,
+	    "Mustek Systems",
+	    "BearPaw 1200F scanner",
+	},
+	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600USB,
+	    0,
+	    "Mustek Systems",
+	    "600 scanner",
+	},
+	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
 	    0,
 	    "Mustek Systems",
@@ -1883,12 +1943,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DiskOnKey",
 	},
 	{
-	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW,
+	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200,
 	    0,
 	    "National Semiconductor",
 	    "BearPaw 1200",
 	},
 	{
+	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400,
+	    0,
+	    "National Semiconductor",
+	    "BearPaw 2400",
+	},
+	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB,
 	    0,
 	    "NEC",
@@ -2477,6 +2543,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Sony Clie v4.0",
 	},
 	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40_MS,
+	    0,
+	    "Sony",
+	    "Sony Clie v4.0 Memory Stick slot",
+	},
+	{
 	    USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
 	    0,
 	    "STMicroelectronics",
@@ -2597,6 +2669,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ThumbDrive",
 	},
 	{
+	    USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS,
+	    0,
+	    "Ultima",
+	    "1200 UB Plus scanner",
+	},
+	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U,
 	    0,
 	    "UMAX Data Systems",
@@ -3467,6 +3545,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ULTIMA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Ultima",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_AXIOHM, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Axiohm Transaction Solutions",