regen.

2 files changed, 162 insertions, 6 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index aeaab1ac05f..bf8424fd2f8 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,13 +1,13 @@
-/*	$OpenBSD: usbdevs.h,v 1.7 1999/10/06 12:53:05 fgsch Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.8 1999/11/07 21:25:52 fgsch Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: usbdevs,v 1.7 1999/10/06 12:52:18 fgsch Exp 	
+ *	/*	OpenBSD: usbdevs,v 1.9 1999/11/07 21:24:49 fgsch Exp 	*/
  */
+/*	$NetBSD: usbdevs,v 1.56 1999/10/28 06:41:13 augustss Exp $	*/
 
-/* $NetBSD: usbdevs,v 1.45 1999/09/15 13:57:09 augustss Exp $ */
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -73,6 +73,7 @@
 #define	USB_VENDOR_EPSON	0x04b8		/* Seiko Epson Corp. */
 #define	USB_VENDOR_3COM	0x04c1		/* U.S. Robotics */
 #define	USB_VENDOR_KONICA	0x04c8		/* Konica Corp. */
+#define	USB_VENDOR_ALTEC	0x04d2		/* Altec Lansing */
 #define	USB_VENDOR_SHUTTLE	0x04e6		/* Shuttle Technology */
 #define	USB_VENDOR_CHICONY	0x04f2		/* Chicony Electronics Co., Ltd. */
 #define	USB_VENDOR_BROTHER	0x04f9		/* Brother Industries Corp. */
@@ -84,6 +85,8 @@
 #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. */
+#define	USB_VENDOR_MUSTEK	0x055f		/* Mustek Systems Inc. */
+#define	USB_VENDOR_TELEX	0x0562		/* Telex Communications Inc. */
 #define	USB_VENDOR_PERACOM	0x0565		/* Peracom Networks Inc. */
 #define	USB_VENDOR_WACOM	0x056a		/* WACOM Corp. Ltd. */
 #define	USB_VENDOR_ETEK	0x056c		/* e-TEK Labs */
@@ -101,7 +104,12 @@
 #define	USB_VENDOR_MACALLY	0x0618		/* Macally */
 #define	USB_VENDOR_MULTITECH	0x06e0		/* MultiTech */
 #define	USB_VENDOR_ADS	0x06e1		/* ADS Technologies */
+#define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
+#define	USB_VENDOR_SANDISK	0x0781		/* SanDisk Corp */
+#define	USB_VENDOR_SIIG	0x07cc		/* SIIG */
+#define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring Inc. */
 #define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire Inc. */
+#define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
@@ -121,6 +129,7 @@
 
 /* Kodak products */
 #define	USB_PRODUCT_KODAK_DC260	0x0110		/* Digital Science DC260 */
+#define	USB_PRODUCT_KODAK_DC240	0x0120		/* Digital Science DC240 */
 
 /* CATC products */
 #define	USB_PRODUCT_CATC_ANDROMEDA	0x1237		/* Andromeda hub */
@@ -161,6 +170,7 @@
 #define	USB_PRODUCT_PHILIPS_DSS350	0x0101		/* DSS 350 Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_DSS	0x0104		/* DSS XXX Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_HUB	0x0201		/* hub */
+#define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS XXX Digital Speaker System */
 
 /* Connectix products */
 #define	USB_PRODUCT_CONNECTIX_QUICKCAM	0x0001		/* QuickCam */
@@ -187,6 +197,9 @@
 /* Konica Corp. Products */
 #define	USB_PRODUCT_KONICA_CAMERA	0x0720		/* Digital Color Camera */
 
+/* Altec Lansing products */
+#define	USB_PRODUCT_ALTEC_ASC495	0xff05		/* ASC495 Speakers */
+
 /* Shuttle Technology products */
 #define	USB_PRODUCT_SHUTTLE_EUSB	0x0001		/* E-USB Bridge */
 
@@ -218,6 +231,12 @@
 #define	USB_PRODUCT_ATEN_UC1284	0x2001		/* Parallel printer adapter */
 #define	USB_PRODUCT_ATEN_UC10T	0x2002		/* Ethernet adapter */
 
+/* Mustek products */
+#define	USB_PRODUCT_MUSTEK_MDC800	0xa800		/* MDC-800 digital camera */
+
+/* Telex Communications products */
+#define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Enhanced USB Microphone */
+
 /* Peracom products */
 #define	USB_PRODUCT_PERACOM_SERIAL1	0x0001		/* Serial Converter */
 
@@ -245,6 +264,7 @@
 
 /* In-System products */
 #define	USB_PRODUCT_INSYSTEM_F5U002	0x0002		/* Parallel printer adapter */
+#define	USB_PRODUCT_INSYSTEM_ISD110	0x0200		/* IDE adapter */
 
 /* Qtronix products */
 #define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
@@ -278,12 +298,28 @@
 #define	USB_PRODUCT_ENTREGA_4S	0x0004		/* 4S serial connector */
 #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 */
 
+/* Midiman products */
+#define	USB_PRODUCT_MIDIMAN_MIDISPORT2X2	0x1001		/* Midisport 2x2 */
+
+/* SanDisk products */
+#define	USB_PRODUCT_SANDISK_IMAGEMATE	0x0001		/* USB ImageMate */
+
+/* SIIG products */
+#define	USB_PRODUCT_SIIG_DIGIFILMREADER	0x0004		/* DigiFilm-Combo Reader */
+
+/* Handspring Inc. */
+#define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
+
 /* ActiveWire Inc. products */
 #define	USB_PRODUCT_ACTIVEWIRE_IOBOARD	0x0100		/* I/O Board */
 #define	USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1	0x0101		/* I/O Board, rev. 1 firmware */
 
+/* Motorola products */
+#define	USB_PRODUCT_MOTOROLA_MC141555	0x1555		/* MC141555 hub controller */
+
 /* PLX products */
 #define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 57cc9d9fe51..b5b34e9e478 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,13 +1,13 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.7 1999/10/06 12:53:05 fgsch Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.8 1999/11/07 21:25:52 fgsch Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: usbdevs,v 1.7 1999/10/06 12:52:18 fgsch Exp 	
+ *	/*	OpenBSD: usbdevs,v 1.9 1999/11/07 21:24:49 fgsch Exp 	*/
  */
+/*	$NetBSD: usbdevs,v 1.56 1999/10/28 06:41:13 augustss Exp $	*/
 
-/* $NetBSD: usbdevs,v 1.45 1999/09/15 13:57:09 augustss Exp $ */
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -77,6 +77,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Digital Science DC260",
 	},
 	{
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC240,
+	    0,
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC240",
+	},
+	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_ANDROMEDA,
 	    0,
 	    "Computer Access Technology Corp.",
@@ -185,6 +191,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "hub",
 	},
 	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150,
+	    0,
+	    "Philips",
+	    "DSS XXX Digital Speaker System",
+	},
+	{
 	    USB_VENDOR_CONNECTIX, USB_PRODUCT_CONNECTIX_QUICKCAM,
 	    0,
 	    "Connectix Corp.",
@@ -239,6 +251,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Digital Color Camera",
 	},
 	{
+	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
+	    0,
+	    "Altec Lansing",
+	    "ASC495 Speakers",
+	},
+	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
 	    0,
 	    "Shuttle Technology",
@@ -305,6 +323,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Ethernet adapter",
 	},
 	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
+	    0,
+	    "Mustek Systems Inc.",
+	    "MDC-800 digital camera",
+	},
+	{
+	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
+	    0,
+	    "Telex Communications Inc.",
+	    "Enhanced USB Microphone",
+	},
+	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
 	    0,
 	    "Peracom Networks Inc.",
@@ -365,6 +395,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Parallel printer adapter",
 	},
 	{
+	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
+	    0,
+	    "In-System Design",
+	    "IDE adapter",
+	},
+	{
 	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
 	    0,
 	    "Qtronix Corp",
@@ -467,12 +503,42 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "1S9 serial connector",
 	},
 	{
+	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_EZUSB,
+	    0,
+	    "Entrega",
+	    "EZ-USB",
+	},
+	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_SERIAL,
 	    0,
 	    "Entrega",
 	    "DB25 Serial connector",
 	},
 	{
+	    USB_VENDOR_MIDIMAN, USB_PRODUCT_MIDIMAN_MIDISPORT2X2,
+	    0,
+	    "Midiman",
+	    "Midisport 2x2",
+	},
+	{
+	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_IMAGEMATE,
+	    0,
+	    "SanDisk Corp",
+	    "USB ImageMate",
+	},
+	{
+	    USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER,
+	    0,
+	    "SIIG",
+	    "DigiFilm-Combo Reader",
+	},
+	{
+	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
+	    0,
+	    "Handspring Inc.",
+	    "Handspring Visor",
+	},
+	{
 	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD,
 	    0,
 	    "ActiveWire Inc.",
@@ -485,6 +551,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "I/O Board, rev. 1 firmware",
 	},
 	{
+	    USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_MC141555,
+	    0,
+	    "Motorola",
+	    "MC141555 hub controller",
+	},
+	{
 	    USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD,
 	    0,
 	    "PLX",
@@ -647,6 +719,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ALTEC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Altec Lansing",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SHUTTLE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Shuttle Technology",
@@ -713,6 +791,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MUSTEK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Mustek Systems Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_TELEX, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Telex Communications Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_PERACOM, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Peracom Networks Inc.",
@@ -815,12 +905,42 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MIDIMAN, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Midiman",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_SANDISK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "SanDisk Corp",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_SIIG, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "SIIG",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_HANDSPRING, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Handspring Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ACTIVEWIRE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "ActiveWire Inc.",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MOTOROLA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Motorola",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_PLX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "PLX",