regen.

2 files changed, 131 insertions, 12 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index e41585e1f92..3343ccb53a2 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.9 1999/11/07 21:40:02 fgsch Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.10 1999/12/26 14:57:46 fgsch Exp $	*/
 
 /*
- * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+ * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: usbdevs,v 1.10 1999/11/07 21:38:25 fgsch Exp 
+ *		OpenBSD: usbdevs,v 1.11 1999/12/26 14:57:06 fgsch Exp 
  */
 /*	$NetBSD: usbdevs,v 1.56 1999/10/28 06:41:13 augustss Exp $	*/
 
@@ -52,6 +52,7 @@
 #define	USB_VENDOR_HP	0x03f0		/* Hewlett Packard */
 #define	USB_VENDOR_NEC	0x0409		/* NEC */
 #define	USB_VENDOR_KODAK	0x040a		/* Eastman Kodak Corp. */
+#define	USB_VENDOR_MELCO	0x0411		/* Melco Inc. */
 #define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology Corp. */
 #define	USB_VENDOR_GRAVIS	0x0428		/* Advanced Gravis Computer Tech. Ltd. */
 #define	USB_VENDOR_LEXMARK	0x043d		/* Lexmark International Inc. */
@@ -69,6 +70,7 @@
 #define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
 #define	USB_VENDOR_ACER	0x04a5		/* Acer Peripheral Inc. */
+#define	USB_VENDOR_CANON	0x04a9		/* Canon Inc. */
 #define	USB_VENDOR_CYPRESS	0x04b4		/* Cypress Semiconductor */
 #define	USB_VENDOR_EPSON	0x04b8		/* Seiko Epson Corp. */
 #define	USB_VENDOR_3COM	0x04c1		/* U.S. Robotics */
@@ -82,6 +84,7 @@
 #define	USB_VENDOR_KAWATSU	0x050f		/* Kawatsu Semiconductor, Inc. */
 #define	USB_VENDOR_APC	0x051d		/* American Power Conversion */
 #define	USB_VENDOR_AKS	0x0529		/* Fast Security AG */
+#define	USB_VENDOR_UNIACCESS	0x0540		/* Universal Access */
 #define	USB_VENDOR_ANCHOR	0x0547		/* Anchor Chips Inc. */
 #define	USB_VENDOR_VISION	0x0553		/* VLSI Vision Ltd. */
 #define	USB_VENDOR_ATEN	0x0557		/* ATEN International Corp. Ltd. */
@@ -98,6 +101,7 @@
 #define	USB_VENDOR_INSYSTEM	0x05ab		/* In-System Design */
 #define	USB_VENDOR_APPLE	0x05ac		/* Apple Computer */
 #define	USB_VENDOR_QTRONIX	0x05c7		/* Qtronix Corp */
+#define	USB_VENDOR_ELSA	0x05cc		/* ELSA Gmbh */
 #define	USB_VENDOR_EIZONANAO	0x05e7		/* EIZO Nanao */
 #define	USB_VENDOR_PIENGINEERING	0x05f3		/* P.I. Engineering */
 #define	USB_VENDOR_CHIC	0x05fe		/* Chic Technology */
@@ -106,9 +110,11 @@
 #define	USB_VENDOR_ADS	0x06e1		/* ADS Technologies */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
 #define	USB_VENDOR_SANDISK	0x0781		/* SanDisk Corp */
+#define	USB_VENDOR_COREGA	0x07aa		/* Corega */
 #define	USB_VENDOR_SIIG	0x07cc		/* SIIG */
 #define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring Inc. */
 #define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire Inc. */
+#define	USB_VENDOR_BILLIONTON	0x08dd		/* Billionton Systems Inc. */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
@@ -130,8 +136,13 @@
 /* Kodak products */
 #define	USB_PRODUCT_KODAK_DC260	0x0110		/* Digital Science DC260 */
 #define	USB_PRODUCT_KODAK_DC240	0x0120		/* Digital Science DC240 */
+#define	USB_PRODUCT_KODAK_DC280	0x0130		/* Digital Science DC280 */
+
+/* Melco Inc products */
+#define	USB_PRODUCT_MELCO_LUATX	0x0001		/* LUA-TX Ethernet */
 
 /* CATC products */
+#define	USB_PRODUCT_CATC_CHIEF	0x000d		/* USB Chief Bus & Protocol Analyzer */
 #define	USB_PRODUCT_CATC_ANDROMEDA	0x1237		/* Andromeda hub */
 
 /* Gravis products */
@@ -184,6 +195,9 @@
 /* Acer products */
 #define	USB_PRODUCT_ACER_ACERSCAN_C310U	0x12a6		/* Acerscan C310U */
 
+/* Canon Inc. products */
+#define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
+
 /* Cypress Semiconductor products */
 #define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
 #define	USB_PRODUCT_CYPRESS_THERMO	0x0002		/* thermometer */
@@ -192,6 +206,7 @@
 #define	USB_PRODUCT_EPSON_PRINTER3	0x0003		/* ISD USB Smart Cable */
 
 /* 3Com products */
+#define	USB_PRODUCT_3COM_HOMECONN	0x009d		/* HomeConnect USB Camera */
 #define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
 
 /* Konica Corp. Products */
@@ -221,6 +236,9 @@
 /* AKS products */
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
+/* Universal Access products */
+#define	USB_PRODUCT_UNIACCESS_PANACHE	0x0101		/* Panache Surf USB ISDN Adapter */
+
 /* Anchor products */
 #define	USB_PRODUCT_ANCHOR_EZUSB	0x2131		/* EZUSB */
 
@@ -269,10 +287,14 @@
 /* Qtronix products */
 #define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
 
+/* Elsa products */
+#define	USB_PRODUCT_ELSA_MODEM1	0x2265		/* ELSA Modem Board */
+
 /* Logitech products */
 #define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 keyboard */
 #define	USB_PRODUCT_LOGITECH_M4848	0x0301		/* M4848 mouse */
 #define	USB_PRODUCT_LOGITECH_QUICKCAM	0x0801		/* QuickCam */
+#define	USB_PRODUCT_LOGITECH_QUICKCAMPRO	0x0810		/* QuickCam Pro */
 #define	USB_PRODUCT_LOGITECH_N48	0xc001		/* N48 mouse */
 #define	USB_PRODUCT_LOGITECH_MBA47	0xc002		/* M-BA47 mouse */
 
@@ -299,7 +321,8 @@
 #define	USB_PRODUCT_ENTREGA_CENTRONICS	0x0006		/* Centronics connector */
 #define	USB_PRODUCT_ENTREGA_1S9	0x0093		/* 1S9 serial connector */
 #define	USB_PRODUCT_ENTREGA_EZUSB	0x8000		/* EZ-USB */
-#define	USB_PRODUCT_ENTREGA_SERIAL	0x8001		/* DB25 Serial connector */
+/*product ENTREGA SERIAL	0x8001	DB25 Serial connector*/
+/*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
 /* Midiman products */
 #define	USB_PRODUCT_MIDIMAN_MIDISPORT2X2	0x1001		/* Midisport 2x2 */
@@ -307,6 +330,9 @@
 /* SanDisk products */
 #define	USB_PRODUCT_SANDISK_IMAGEMATE	0x0001		/* USB ImageMate */
 
+/* Corega products */
+#define	USB_PRODUCT_COREGA_ETHER_USB_T	0x0001		/* Ether USB-T */
+
 /* SIIG products */
 #define	USB_PRODUCT_SIIG_DIGIFILMREADER	0x0004		/* DigiFilm-Combo Reader */
 
@@ -317,6 +343,9 @@
 #define	USB_PRODUCT_ACTIVEWIRE_IOBOARD	0x0100		/* I/O Board */
 #define	USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1	0x0101		/* I/O Board, rev. 1 firmware */
 
+/* Billionton products */
+#define	USB_PRODUCT_BILLIONTON_USB100	0x0986		/* USB100N 10/100 FastEthernet Adapter */
+
 /* Motorola products */
 #define	USB_PRODUCT_MOTOROLA_MC141555	0x1555		/* MC141555 hub controller */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index e02d6d9f931..8f442c47875 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.9 1999/11/07 21:40:02 fgsch Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.10 1999/12/26 14:57:46 fgsch Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: usbdevs,v 1.10 1999/11/07 21:38:25 fgsch Exp 
+ *		OpenBSD: usbdevs,v 1.11 1999/12/26 14:57:06 fgsch Exp 
  */
 /*	$NetBSD: usbdevs,v 1.56 1999/10/28 06:41:13 augustss Exp $	*/
 
@@ -83,6 +83,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Digital Science DC240",
 	},
 	{
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC280,
+	    0,
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC280",
+	},
+	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX,
+	    0,
+	    "Melco Inc.",
+	    "LUA-TX Ethernet",
+	},
+	{
+	    USB_VENDOR_CATC, USB_PRODUCT_CATC_CHIEF,
+	    0,
+	    "Computer Access Technology Corp.",
+	    "USB Chief Bus & Protocol Analyzer",
+	},
+	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_ANDROMEDA,
 	    0,
 	    "Computer Access Technology Corp.",
@@ -221,6 +239,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Acerscan C310U",
 	},
 	{
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
+	    0,
+	    "Canon Inc.",
+	    "PowerShot S10",
+	},
+	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE,
 	    0,
 	    "Cypress Semiconductor",
@@ -239,6 +263,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "ISD USB Smart Cable",
 	},
 	{
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
+	    0,
+	    "U.S. Robotics",
+	    "HomeConnect USB Camera",
+	},
+	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
 	    0,
 	    "U.S. Robotics",
@@ -299,6 +329,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "USB-HASP 0.06",
 	},
 	{
+	    USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE,
+	    0,
+	    "Universal Access",
+	    "Panache Surf USB ISDN Adapter",
+	},
+	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB,
 	    0,
 	    "Anchor Chips Inc.",
@@ -407,6 +443,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Scorpion-980N keyboard",
 	},
 	{
+	    USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1,
+	    0,
+	    "ELSA Gmbh",
+	    "ELSA Modem Board",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    0,
 	    "Logitech Inc.",
@@ -425,6 +467,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "QuickCam",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO,
+	    0,
+	    "Logitech Inc.",
+	    "QuickCam Pro",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N48,
 	    0,
 	    "Logitech Inc.",
@@ -509,12 +557,6 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "EZ-USB",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_SERIAL,
-	    0,
-	    "Entrega",
-	    "DB25 Serial connector",
-	},
-	{
 	    USB_VENDOR_MIDIMAN, USB_PRODUCT_MIDIMAN_MIDISPORT2X2,
 	    0,
 	    "Midiman",
@@ -527,6 +569,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "USB ImageMate",
 	},
 	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_ETHER_USB_T,
+	    0,
+	    "Corega",
+	    "Ether USB-T",
+	},
+	{
 	    USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER,
 	    0,
 	    "SIIG",
@@ -551,6 +599,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "I/O Board, rev. 1 firmware",
 	},
 	{
+	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
+	    0,
+	    "Billionton Systems Inc.",
+	    "USB100N 10/100 FastEthernet Adapter",
+	},
+	{
 	    USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_MC141555,
 	    0,
 	    "Motorola",
@@ -593,6 +647,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MELCO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Melco Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CATC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Computer Access Technology Corp.",
@@ -695,6 +755,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_CANON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Canon Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CYPRESS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Cypress Semiconductor",
@@ -773,6 +839,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_UNIACCESS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Universal Access",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ANCHOR, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Anchor Chips Inc.",
@@ -869,6 +941,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ELSA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ELSA Gmbh",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_EIZONANAO, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "EIZO Nanao",
@@ -917,6 +995,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_COREGA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Corega",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SIIG, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "SIIG",
@@ -935,6 +1019,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_BILLIONTON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Billionton Systems Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MOTOROLA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Motorola",