Regen.

2 files changed, 134 insertions, 16 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 6302373..75987a3 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.42 2000/10/20 00:29:21 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.43 2000/10/25 10:13:47 n_hibma Exp 
  */
 
 /*
@@ -52,6 +52,7 @@
 #define	USB_VENDOR_ATMEL	0x03eb		/* Atmel Corp. */
 #define	USB_VENDOR_HP	0x03f0		/* Hewlett Packard */
 #define	USB_VENDOR_ADAPTEC	0x03f3		/* Adaptec, Inc. */
+#define	USB_VENDOR_NATIONAL	0x0400		/* National Semiconductor */
 #define	USB_VENDOR_ACERLABS	0x0402		/* Acer Labs, Inc. */
 #define	USB_VENDOR_FTDI	0x0403		/* Future Technology Devices */
 #define	USB_VENDOR_NEC	0x0409		/* NEC */
@@ -233,6 +234,7 @@
 #define	USB_VENDOR_DIAMOND	0x0841		/* Diamond */
 #define	USB_VENDOR_NETGEAR	0x0846		/* BayNETGEAR, Inc. */
 #define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire, Inc. */
+#define	USB_VENDOR_METRICOM	0x0870		/* Metricom */
 #define	USB_VENDOR_ADESSOKBTEK	0x087c		/* ADESSO/Kbtek America, Inc. */
 #define	USB_VENDOR_APT	0x0880		/* APT Technologies, Inc. */
 #define	USB_VENDOR_BOCARESEARCH	0x0885		/* Boca Research, Inc. */
@@ -277,7 +279,7 @@
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics, Inc. */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link Corp */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
-#define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard (2nd) */
+#define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
 
 /*
  * List of known products.  Grouped by vendor.
@@ -455,6 +457,7 @@
 #define	USB_PRODUCT_EPSON_636	0x0101		/* Perfection 636U / 636Photo scanner */
 #define	USB_PRODUCT_EPSON_610	0x0103		/* Perfection 610 scanner */
 #define	USB_PRODUCT_EPSON_1200	0x0104		/* Perfection 1200U / 1200Photo scanner */
+#define	USB_PRODUCT_EPSON_1600	0x0107		/* Expression 1600 */
 
 /* e-TEK Labs products */
 #define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
@@ -474,22 +477,26 @@
 /* Future Technology Devices products */
 #define	USB_PRODUCT_FTDI_SERIAL	0x8372		/* Serial converter */
 
+/* Fuji photo products */
+#define	USB_PRODUCT_FUJIPHOTO_MASS0100	0x0100		/* Mass Storage */
+
 /* Handspring, Inc. */
 #define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
 
 /* HP products */
 #define	USB_PRODUCT_HP_4100C	0x0101		/* Scanjet 4100C */
-#define	USB_PRODUCT_HP_S20	0x0102		/* PhotoSmart S20 */
+#define	USB_PRODUCT_HP_S20	0x0102		/* Photosmart S20 */
 #define	USB_PRODUCT_HP_4200C	0x0105		/* ScanJet 4200C */
 #define	USB_PRODUCT_HP_6200C	0x0201		/* ScanJet 6200C */
 #define	USB_PRODUCT_HP_S20b	0x0202		/* PhotoSmart S20 */
 #define	USB_PRODUCT_HP_3300C	0x0205		/* ScanJet 3300C */
-#define	USB_PRODUCT_HP_5200	0x0401		/* Scanjet 5200 */
+#define	USB_PRODUCT_HP_5200C	0x0401		/* Scanjet 5200C */
 #define	USB_PRODUCT_HP_6300C	0x0601		/* Scanjet 6300C */
+#define	USB_PRODUCT_HP_5300C	0x0701		/* Scanjet 5300C */
 #define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
-#define	USB_PRODUCT_HP_P1100	0x3102		/* PhotoSmart P1100 */
+#define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
 
-/* HP2 products */
+/* HP products */
 #define	USB_PRODUCT_HP2_C500	0x6002		/* PhotoSmart C500 */
 
 /* IBM Corporation */
@@ -531,7 +538,7 @@
 #define	USB_PRODUCT_KENSINGTON_TURBOBALL	0x1005		/* TurboBall */
 
 /* Kingston products */
-#define	USB_PRODUCT_KINGSTON_KNU101TX	0x000A		/* KNU101TX USB Ethernet */
+#define	USB_PRODUCT_KINGSTON_KNU101TX	0x000a		/* KNU101TX USB Ethernet */
 
 /* Kodak products */
 #define	USB_PRODUCT_KODAK_DC220	0x0100		/* Digital Science DC220 */
@@ -592,6 +599,9 @@
 /* Melco, Inc products */
 #define	USB_PRODUCT_MELCO_LUATX	0x0001		/* LU-ATX Ethernet */
 
+/* Metricom products */
+#define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
+
 /* Microsoft products */
 #define	USB_PRODUCT_MICROSOFT_SIDEPREC	0x0008		/* SideWinder Precision Pro */
 #define	USB_PRODUCT_MICROSOFT_INTELLIMOUSE	0x0009		/* IntelliMouse */
@@ -621,8 +631,14 @@
 
 /* Mustek products */
 #define	USB_PRODUCT_MUSTEK_1200CU	0x0001		/* 1200 CU scanner */
+#define	USB_PRODUCT_MUSTEK_600CU	0x0002		/* 600 CU scanner */
+#define	USB_PRODUCT_MUSTEK_1200USB	0x0003		/* 1200 USB scanner */
+#define	USB_PRODUCT_MUSTEK_1200UB	0x0006		/* 1200 UB scanner */
 #define	USB_PRODUCT_MUSTEK_MDC800	0xa800		/* MDC-800 digital camera */
 
+/* National Semiconductor */
+#define	USB_PRODUCT_NATIONAL_BEARPAW	0x1000		/* BearPaw 1200 */
+
 /* NEC products */
 #define	USB_PRODUCT_NEC_HUB	0x55aa		/* hub */
 #define	USB_PRODUCT_NEC_HUB_B	0x55ab		/* hub */
@@ -660,6 +676,7 @@
 #define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
 
 /* Primax products */
+#define	USB_PRODUCT_PRIMAX_G2X300	0x0300		/* G2-200 scanner */
 #define	USB_PRODUCT_PRIMAX_G2E300	0x0301		/* G2E-300 scanner */
 #define	USB_PRODUCT_PRIMAX_G2300	0x0302		/* G2-300 scanner */
 #define	USB_PRODUCT_PRIMAX_G2E3002	0x0303		/* G2E-300 scanner */
@@ -667,6 +684,7 @@
 #define	USB_PRODUCT_PRIMAX_600U	0x0341		/* Colorado 600u scanner */
 #define	USB_PRODUCT_PRIMAX_19200	0x0360		/* Colorado USB 19200 scanner */
 #define	USB_PRODUCT_PRIMAX_1200U	0x0361		/* Colorado 1200u scanner */
+#define	USB_PRODUCT_PRIMAX_G600	0x0380		/* G2-600 scanner */
 #define	USB_PRODUCT_PRIMAX_636I	0x0381		/* ReadyScan 636i */
 #define	USB_PRODUCT_PRIMAX_G2600	0x0382		/* G2-600 scanner */
 #define	USB_PRODUCT_PRIMAX_G2E600	0x0383		/* G2E-600 scanner */
@@ -761,8 +779,12 @@
 #define	USB_PRODUCT_VISION_VC6452V002	0x0002		/* CPiA Camera */
 
 /* Visioneer products */
-#define	USB_PRODUCT_VISIONEER_5300	0x0221		/* OneTouch 5300 / 7600 */
+#define	USB_PRODUCT_VISIONEER_7600	0x0211		/* OneTouch 7600 */
+#define	USB_PRODUCT_VISIONEER_5300	0x0221		/* OneTouch 5300 */
 #define	USB_PRODUCT_VISIONEER_6100	0x0231		/* OneTouch 6100 */
+#define	USB_PRODUCT_VISIONEER_6200	0x0311		/* OneTouch 6200 */
+#define	USB_PRODUCT_VISIONEER_8100	0x0321		/* OneTouch 8100 */
+#define	USB_PRODUCT_VISIONEER_8600	0x0331		/* OneTouch 8600 */
 
 /* Wacom products */
 #define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index fa8debd..da0b2c2 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.42 2000/10/20 00:29:21 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.43 2000/10/25 10:13:47 n_hibma Exp 
  */
 
 /*
@@ -568,6 +568,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Perfection 1200U / 1200Photo scanner",
 	},
 	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600,
+	    0,
+	    "Seiko Epson Corp.",
+	    "Expression 1600",
+	},
+	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
 	    0,
 	    "e-TEK Labs",
@@ -604,6 +610,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Serial converter",
 	},
 	{
+	    USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100,
+	    0,
+	    "Fuji Photo Film Co., Ltd.",
+	    "Mass Storage",
+	},
+	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
 	    0,
 	    "Handspring, Inc.",
@@ -619,7 +631,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_HP, USB_PRODUCT_HP_S20,
 	    0,
 	    "Hewlett Packard",
-	    "PhotoSmart S20",
+	    "Photosmart S20",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4200C,
@@ -646,10 +658,10 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "ScanJet 3300C",
 	},
 	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_5200,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_5200C,
 	    0,
 	    "Hewlett Packard",
-	    "Scanjet 5200",
+	    "Scanjet 5200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6300C,
@@ -658,6 +670,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Scanjet 6300C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_5300C,
+	    0,
+	    "Hewlett Packard",
+	    "Scanjet 5300C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
 	    0,
 	    "Hewlett Packard",
@@ -667,12 +685,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_HP, USB_PRODUCT_HP_P1100,
 	    0,
 	    "Hewlett Packard",
-	    "PhotoSmart P1100",
+	    "Photosmart P1100",
 	},
 	{
 	    USB_VENDOR_HP2, USB_PRODUCT_HP2_C500,
 	    0,
-	    "Hewlett Packard (2nd)",
+	    "Hewlett Packard",
 	    "PhotoSmart C500",
 	},
 	{
@@ -1000,6 +1018,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "LU-ATX Ethernet",
 	},
 	{
+	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
+	    0,
+	    "Metricom",
+	    "Ricochet GS",
+	},
+	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_SIDEPREC,
 	    0,
 	    "Microsoft",
@@ -1108,12 +1132,36 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "1200 CU scanner",
 	},
 	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU,
+	    0,
+	    "Mustek Systems, Inc.",
+	    "600 CU scanner",
+	},
+	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB,
+	    0,
+	    "Mustek Systems, Inc.",
+	    "1200 USB scanner",
+	},
+	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB,
+	    0,
+	    "Mustek Systems, Inc.",
+	    "1200 UB scanner",
+	},
+	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
 	    0,
 	    "Mustek Systems, Inc.",
 	    "MDC-800 digital camera",
 	},
 	{
+	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW,
+	    0,
+	    "National Semiconductor",
+	    "BearPaw 1200",
+	},
+	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB,
 	    0,
 	    "NEC",
@@ -1222,6 +1270,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "test board",
 	},
 	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300,
+	    0,
+	    "Primax Electronics",
+	    "G2-200 scanner",
+	},
+	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300,
 	    0,
 	    "Primax Electronics",
@@ -1264,6 +1318,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Colorado 1200u scanner",
 	},
 	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G600,
+	    0,
+	    "Primax Electronics",
+	    "G2-600 scanner",
+	},
+	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I,
 	    0,
 	    "Primax Electronics",
@@ -1510,10 +1570,16 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "CPiA Camera",
 	},
 	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_7600,
+	    0,
+	    "Visioneer",
+	    "OneTouch 7600",
+	},
+	{
 	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_5300,
 	    0,
 	    "Visioneer",
-	    "OneTouch 5300 / 7600",
+	    "OneTouch 5300",
 	},
 	{
 	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6100,
@@ -1522,6 +1588,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "OneTouch 6100",
 	},
 	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6200,
+	    0,
+	    "Visioneer",
+	    "OneTouch 6200",
+	},
+	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8100,
+	    0,
+	    "Visioneer",
+	    "OneTouch 8100",
+	},
+	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8600,
+	    0,
+	    "Visioneer",
+	    "OneTouch 8600",
+	},
+	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
 	    0,
 	    "WACOM Corp. Ltd.",
@@ -1588,6 +1672,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_NATIONAL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "National Semiconductor",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ACERLABS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Acer Labs, Inc.",
@@ -2674,6 +2764,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_METRICOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Metricom",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ADESSOKBTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "ADESSO/Kbtek America, Inc.",
@@ -2940,7 +3036,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_HP2, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Hewlett Packard (2nd)",
+	    "Hewlett Packard",
 	    NULL,
 	},
 	{ 0, 0, 0, NULL, NULL, }