regen.

2 files changed, 107 insertions, 43 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 1dacab8a796..d9d02ceba14 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs.h,v 1.3 1999/08/27 09:08:52 fgsch Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.4 1999/08/29 10:32:21 fgsch Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: usbdevs,v 1.3 1999/08/27 09:08:03 fgsch Exp 
+ *		OpenBSD: usbdevs,v 1.4 1999/08/29 10:31:13 fgsch Exp 
  */
-/*	$NetBSD: usbdevs,v 1.39 1999/08/25 23:23:17 augustss Exp $	*/
+/*	$NetBSD: usbdevs,v 1.40 1999/08/28 10:00:56 augustss Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -50,37 +50,41 @@
  */
 
 #define	USB_VENDOR_NEC	0x0409		/* NEC */
-#define	USB_VENDOR_KODAK	0x040a		/* Eastman Kodak co. */
+#define	USB_VENDOR_KODAK	0x040a		/* Eastman Kodak Corp. */
 #define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology Corp. */
 #define	USB_VENDOR_GRAVIS	0x0428		/* Advanced Gravis Computer Tech. Ltd. */
-#define	USB_VENDOR_NANAO	0x0440		/* NANAO Corporation */
+#define	USB_VENDOR_NANAO	0x0440		/* NANAO Corp. */
+#define	USB_VENDOR_THRUST	0x044f		/* Thrustmaster */
 #define	USB_VENDOR_TI	0x0451		/* Texas Instruments */
 #define	USB_VENDOR_GENIUS	0x0458		/* KYE Systems Corp. */
 #define	USB_VENDOR_MICROSOFT	0x045e		/* Microsoft */
 #define	USB_VENDOR_KENSINGTON	0x0461		/* Primax Electronics */
-#define	USB_VENDOR_CHERRY	0x046a		/* Cherry Mikroschalter GMBH */
+#define	USB_VENDOR_CHERRY	0x046a		/* Cherry Mikroschalter GmbH */
 #define	USB_VENDOR_LOGITECH	0x046d		/* Logitech Inc. */
 #define	USB_VENDOR_BTC	0x046e		/* Behavior Tech. Computer */
 #define	USB_VENDOR_PHILIPS	0x0471		/* Philips */
 #define	USB_VENDOR_CONNECTIX	0x0478		/* Connectix Corp. */
+#define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
 #define	USB_VENDOR_ACER	0x04a5		/* Acer Peripheral Inc. */
 #define	USB_VENDOR_CYPRESS	0x04b4		/* Cypress Semiconductor */
 #define	USB_VENDOR_EPSON	0x04b8		/* Seiko Epson Corp. */
 #define	USB_VENDOR_3COM	0x04c1		/* U.S. Robotics */
-#define	USB_VENDOR_KONICA	0x04c8		/* Konica Corporation */
+#define	USB_VENDOR_KONICA	0x04c8		/* Konica Corp. */
 #define	USB_VENDOR_SHUTTLE	0x04e6		/* Shuttle Technology */
 #define	USB_VENDOR_BROTHER	0x04f9		/* Brother Industries Corp. */
 #define	USB_VENDOR_JAZZ	0x04fa		/* Dallas Semiconductor */
 #define	USB_VENDOR_KAWATSU	0x050f		/* Kawatsu Semiconductor, Inc. */
 #define	USB_VENDOR_AKS	0x0529		/* Fast Security AG */
 #define	USB_VENDOR_VISION	0x0533		/* Alcatel Mobile Phones */
-#define	USB_VENDOR_ATEN	0x0557		/* ATEN International Co. ltd. */
-#define	USB_VENDOR_PERACOM	0x0565		/* Peracom Networks, Inc. */
-#define	USB_VENDOR_WACOM	0x056a		/* WACOM Co. Ltd. */
+#define	USB_VENDOR_ATEN	0x0557		/* ATEN International Corp. Ltd. */
+#define	USB_VENDOR_PERACOM	0x0565		/* Peracom Networks Inc. */
+#define	USB_VENDOR_WACOM	0x056a		/* WACOM Corp. Ltd. */
 #define	USB_VENDOR_EIZO	0x056d		/* EIZO */
-#define	USB_VENDOR_AGILER	0x056e		/* Elecom Co., Ltd. */
-#define	USB_VENDOR_IOMEGA	0x059b		/* Iomega Corporation */
+#define	USB_VENDOR_AGILER	0x056e		/* Elecom Corp. Ltd. */
+#define	USB_VENDOR_ROCKFIRE	0x0583		/* Rockfire */
+#define	USB_VENDOR_IOMEGA	0x059b		/* Iomega Corp. */
+#define	USB_VENDOR_OMNIVISION	0x05a9		/* OmniVision */
 #define	USB_VENDOR_BELKIN	0x05ab		/* In-System Design */
 #define	USB_VENDOR_APPLE	0x05ac		/* Apple Computer */
 #define	USB_VENDOR_EIZONANAO	0x05e7		/* EIZO Nanao */
@@ -111,7 +115,10 @@
 /* Gravis products */
 #define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
 
-/* Unixtar products */
+/* Thrustmaster products */
+#define	USB_PRODUCT_THRUST_FUSION_PAD	0xa0a3		/* Fusion Digital Gamepad */
+
+/* Texas Intel products */
 #define	USB_PRODUCT_TI_UTUSB41	0x1446		/* UT-USB41 hub */
 
 /* Genius products */
@@ -131,7 +138,7 @@
 #define	USB_PRODUCT_CHERRY_MY3000KBD	0x0001		/* My3000 keyboard */
 #define	USB_PRODUCT_CHERRY_MY3000HUB	0x0003		/* My3000 hub */
 
-/* Behavior Technology Corporation products */
+/* Behavior Technology Computer products */
 #define	USB_PRODUCT_BTC_BTC7932	0x6782		/* Keyboard with mouse port */
 
 /* Philips products */
@@ -141,6 +148,9 @@
 /* Connectix products */
 #define	USB_PRODUCT_CONNECTIX_QUICKCAM	0x0001		/* QuickCam */
 
+/* Lucent products */
+#define	USB_PRODUCT_LUCENT_EVALKIT	0x1001		/* USS-720 evaluation kit */
+
 /* STMicroelectronics products */
 #define	USB_PRODUCT_STMICRO_COMMUNICATOR	0x7554		/* USB Communicator */
 
@@ -151,12 +161,12 @@
 #define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
 
 /* Epson products */
-#define	USB_PRODUCT_EPSON_PRINTER3	0x0003		/* printer adapter */
+#define	USB_PRODUCT_EPSON_PRINTER3	0x0003		/* ISD USB Smart Cable */
 
 /* 3Com products */
-#define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 Voice USB Modem */
+#define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
 
-/* Konica Corporation Products */
+/* Konica Corp. Products */
 #define	USB_PRODUCT_KONICA_CAMERA	0x0720		/* Digital Color Camera */
 
 /* Shuttle Technology products */
@@ -193,9 +203,15 @@
 /* Agiler products */
 #define	USB_PRODUCT_AGILER_MOUSE29UO	0x0002		/* mouse 29UO */
 
+/* Rockfire products */
+#define	USB_PRODUCT_ROCKFIRE_GAMEPAD	0x2033		/* gamepad 203USB */
+
 /* Iomega products */
 #define	USB_PRODUCT_IOMEGA_ZIP100	0x0001		/* Zip 100 */
 
+/* OmniVision Technologies Inc. products */
+#define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 Camera */
+
 /* Belkin products */
 #define	USB_PRODUCT_BELKIN_F5U002	0x0002		/* Parallel printer adapter */
 
@@ -214,7 +230,7 @@
 #define	USB_PRODUCT_MACALLY_MOUSE1	0x0101		/* mouse */
 
 /* MultiTech products */
-#define	USB_PRODUCT_MULTITECH_MT5634ZBA	0xf101		/* MT5634ZBA */
+#define	USB_PRODUCT_MULTITECH_ATLAS	0xf101		/* MT5634ZBA-USB modem */
 
 /* ADS products */
 #define	USB_PRODUCT_ADS_ENET	0x0008		/* Ethernet adapter */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index a1248765e48..8d9577559b9 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.3 1999/08/27 09:08:52 fgsch Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.4 1999/08/29 10:32:21 fgsch Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: usbdevs,v 1.3 1999/08/27 09:08:03 fgsch Exp 
+ *		OpenBSD: usbdevs,v 1.4 1999/08/29 10:31:13 fgsch Exp 
  */
-/*	$NetBSD: usbdevs,v 1.39 1999/08/25 23:23:17 augustss Exp $	*/
+/*	$NetBSD: usbdevs,v 1.40 1999/08/28 10:00:56 augustss Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC260,
 	    0,
-	    "Eastman Kodak co.",
+	    "Eastman Kodak Corp.",
 	    "Digital Science DC260",
 	},
 	{
@@ -77,6 +77,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "GamePad Pro",
 	},
 	{
+	    USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
+	    0,
+	    "Thrustmaster",
+	    "Fusion Digital Gamepad",
+	},
+	{
 	    USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,
 	    0,
 	    "Texas Instruments",
@@ -127,13 +133,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD,
 	    0,
-	    "Cherry Mikroschalter GMBH",
+	    "Cherry Mikroschalter GmbH",
 	    "My3000 keyboard",
 	},
 	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000HUB,
 	    0,
-	    "Cherry Mikroschalter GMBH",
+	    "Cherry Mikroschalter GmbH",
 	    "My3000 hub",
 	},
 	{
@@ -161,6 +167,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "QuickCam",
 	},
 	{
+	    USB_VENDOR_LUCENT, USB_PRODUCT_LUCENT_EVALKIT,
+	    0,
+	    "Lucent",
+	    "USS-720 evaluation kit",
+	},
+	{
 	    USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
 	    0,
 	    "STMicroelectronics",
@@ -182,18 +194,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER3,
 	    0,
 	    "Seiko Epson Corp.",
-	    "printer adapter",
+	    "ISD USB Smart Cable",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
 	    0,
 	    "U.S. Robotics",
-	    "U.S.Robotics 56000 Voice USB Modem",
+	    "U.S.Robotics 56000 Voice Faxmodem Pro",
 	},
 	{
 	    USB_VENDOR_KONICA, USB_PRODUCT_KONICA_CAMERA,
 	    0,
-	    "Konica Corporation",
+	    "Konica Corp.",
 	    "Digital Color Camera",
 	},
 	{
@@ -235,19 +247,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
 	    0,
-	    "ATEN International Co. ltd.",
+	    "ATEN International Corp. Ltd.",
 	    "Parallel printer adapter",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
 	    0,
-	    "Peracom Networks, Inc.",
+	    "Peracom Networks Inc.",
 	    "Serial Converter",
 	},
 	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
 	    0,
-	    "WACOM Co. Ltd.",
+	    "WACOM Corp. Ltd.",
 	    "CT-0405-U Tablet",
 	},
 	{
@@ -265,16 +277,28 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AGILER, USB_PRODUCT_AGILER_MOUSE29UO,
 	    0,
-	    "Elecom Co., Ltd.",
+	    "Elecom Corp. Ltd.",
 	    "mouse 29UO",
 	},
 	{
+	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
+	    0,
+	    "Rockfire",
+	    "gamepad 203USB",
+	},
+	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
 	    0,
-	    "Iomega Corporation",
+	    "Iomega Corp.",
 	    "Zip 100",
 	},
 	{
+	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
+	    0,
+	    "OmniVision",
+	    "OV511 Camera",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U002,
 	    0,
 	    "In-System Design",
@@ -317,10 +341,10 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "mouse",
 	},
 	{
-	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_MT5634ZBA,
+	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS,
 	    0,
 	    "MultiTech",
-	    "MT5634ZBA",
+	    "MT5634ZBA-USB modem",
 	},
 	{
 	    USB_VENDOR_ADS, USB_PRODUCT_ADS_ENET,
@@ -367,7 +391,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_KODAK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Eastman Kodak co.",
+	    "Eastman Kodak Corp.",
 	    NULL,
 	},
 	{
@@ -385,7 +409,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_NANAO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "NANAO Corporation",
+	    "NANAO Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_THRUST, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Thrustmaster",
 	    NULL,
 	},
 	{
@@ -415,7 +445,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CHERRY, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Cherry Mikroschalter GMBH",
+	    "Cherry Mikroschalter GmbH",
 	    NULL,
 	},
 	{
@@ -443,6 +473,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_LUCENT, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Lucent",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_STMICRO, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "STMicroelectronics",
@@ -475,7 +511,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_KONICA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Konica Corporation",
+	    "Konica Corp.",
 	    NULL,
 	},
 	{
@@ -517,19 +553,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ATEN, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ATEN International Co. ltd.",
+	    "ATEN International Corp. Ltd.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_PERACOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Peracom Networks, Inc.",
+	    "Peracom Networks Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_WACOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "WACOM Co. Ltd.",
+	    "WACOM Corp. Ltd.",
 	    NULL,
 	},
 	{
@@ -541,13 +577,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AGILER, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Elecom Co., Ltd.",
+	    "Elecom Corp. Ltd.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ROCKFIRE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Rockfire",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_IOMEGA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Iomega Corporation",
+	    "Iomega Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_OMNIVISION, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "OmniVision",
 	    NULL,
 	},
 	{