regen

2 files changed, 157 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 5ffcef92f5b..9ebadc239a9 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.194 2006/03/31 04:32:56 drahn Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.195 2006/04/15 04:36:09 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.190 2006/03/31 04:32:30 drahn Exp 
+ *	OpenBSD: usbdevs,v 1.191 2006/04/15 04:34:36 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -75,6 +75,7 @@
 #define	USB_VENDOR_NEC	0x0409		/* NEC */
 #define	USB_VENDOR_KODAK	0x040a		/* Eastman Kodak */
 #define	USB_VENDOR_MELCO	0x0411		/* Melco */
+#define	USB_VENDOR_LEADTEK	0x0413		/* Leadtek */
 #define	USB_VENDOR_CREATIVE	0x041e		/* Creative Labs */
 #define	USB_VENDOR_CREATIVE2	0x1292		/* Creative Labs */
 #define	USB_VENDOR_ADI	0x0422		/* ADI Systems */
@@ -141,6 +142,7 @@
 #define	USB_VENDOR_SHARP	0x04dd		/* Sharp */
 #define	USB_VENDOR_IIYAMA	0x04e1		/* Iiyama */
 #define	USB_VENDOR_SHUTTLE	0x04e6		/* Shuttle Technology */
+#define	USB_VENDOR_SAMSUNG2	0x04e8		/* Samsung Electronics */
 #define	USB_VENDOR_ANNABOOKS	0x04ed		/* Annabooks */
 #define	USB_VENDOR_JVC	0x04f1		/* JVC */
 #define	USB_VENDOR_CHICONY	0x04f2		/* Chicony Electronics */
@@ -260,6 +262,7 @@
 #define	USB_VENDOR_IMATION	0x0718		/* Imation */
 #define	USB_VENDOR_SUSTEEN	0x0731		/* Susteen */
 #define	USB_VENDOR_EICON	0x0734		/* Eicon Networks */
+#define	USB_VENDOR_SYNTECH	0x0745		/* Syntech Information */
 #define	USB_VENDOR_DIGITALSTREAM	0x074e		/* Digital Stream */
 #define	USB_VENDOR_AUREAL	0x0755		/* Aureal Semiconductor */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
@@ -268,9 +271,11 @@
 #define	USB_VENDOR_GRIFFIN	0x077d		/* Griffin Technology */
 #define	USB_VENDOR_SANDISK	0x0781		/* SanDisk */
 #define	USB_VENDOR_JENOPTIK	0x0784		/* Jenoptik */
+#define	USB_VENDOR_NOKIA	0x078b		/* Nokia */
 #define	USB_VENDOR_BRIMAX	0x078e		/* Brimax */
 #define	USB_VENDOR_AXIS	0x0792		/* Axis Communications */
 #define	USB_VENDOR_ABL	0x0794		/* ABL Electronics */
+#define	USB_VENDOR_SAGEM	0x079b		/* Sagem */
 #define	USB_VENDOR_SUNCOMM	0x079c		/* Sun Communications */
 #define	USB_VENDOR_ALFADATA	0x079d		/* Alfadata Computer */
 #define	USB_VENDOR_NATIONALTECH	0x07a2		/* National Technical Systems */
@@ -389,10 +394,13 @@
 #define	USB_VENDOR_CONCEPTRONIC	0x0d8e		/* Conceptronic */
 #define	USB_VENDOR_MSI	0x0db0		/* Micro Star International */
 #define	USB_VENDOR_ELCON	0x0db7		/* ELCON Systemtechnik */
+#define	USB_VENDOR_MOBILEACTION	0x0df7		/* Mobile Action */
+#define	USB_VENDOR_SPEEDDRAGON	0x0e55		/* Speed Dragon Multimedia */
 #define	USB_VENDOR_HAWKING	0x0e66		/* Hawking */
 #define	USB_VENDOR_GMATE	0x0e73		/* G.Mate */
 #define	USB_VENDOR_OTI	0x0ea0		/* Ours Technology */
 #define	USB_VENDOR_PILOTECH	0x0eaf		/* Pilotech */
+#define	USB_VENDOR_ITEGNO	0x0eba		/* iTegno */
 #define	USB_VENDOR_AIRPRIME	0x0f3d		/* Airprime */
 #define	USB_VENDOR_VTECH	0x0f88		/* VTech */
 #define	USB_VENDOR_FALCOM	0x0f94		/* Falcom Wireless Communications GmbH */
@@ -410,6 +418,8 @@
 #define	USB_VENDOR_SERVERWORKS	0x1166		/* ServerWorks */
 #define	USB_VENDOR_ACERCM	0x1189		/* Acer Communications & Multimedia */
 #define	USB_VENDOR_SIERRA	0x1199		/* Sierra Wireless */
+#define	USB_VENDOR_SIEMENS3	0x11f5		/* Siemens */
+#define	USB_VENDOR_ALCATEL	0x11f7		/* Alcatel */
 #define	USB_VENDOR_TSUNAMI	0x1241		/* Tsunami */
 #define	USB_VENDOR_PHEENET	0x124a		/* Pheenet */
 #define	USB_VENDOR_RAPTORGAMING	0x1267		/* Raptor Gaming */
@@ -422,6 +432,7 @@
 #define	USB_VENDOR_CISCOLINKSYS	0x13b1		/* Cisco-Linksys */
 #define	USB_VENDOR_SHARK	0x13d2		/* Shark */
 #define	USB_VENDOR_NOVATEL	0x1410		/* Novatel Wireless */
+#define	USB_VENDOR_RADIOSHACK	0x1453		/* Radio Shack */
 #define	USB_VENDOR_SILICOM	0x1485		/* Silicom */
 #define	USB_VENDOR_RALINK	0x148f		/* Ralink Technology */
 #define	USB_VENDOR_CONCEPTRONIC2	0x14b2		/* Conceptronic */
@@ -576,6 +587,9 @@
 /* AKS products */
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
+/* Alcatel products */
+#define	USB_PRODUCT_ALCATEL_OT535	0x02df		/* One Touch 535/735 */
+
 /* Alcor Micro, Inc. products */
 #define	USB_PRODUCT_ALCOR2_KBD_HUB	0x2802		/* Kbd Hub */
 
@@ -608,6 +622,7 @@
 #define	USB_PRODUCT_ANALOG_EAGLEIII_NF	0x9032		/* Eagle III */
 
 /* Anchor products */
+#define	USB_PRODUCT_ANCHOR_SERIAL	0x2008		/* Serial */
 #define	USB_PRODUCT_ANCHOR_EZUSB	0x2131		/* EZUSB */
 #define	USB_PRODUCT_ANCHOR_EZLINK	0x2720		/* EZLINK */
 
@@ -1150,6 +1165,9 @@
 #define	USB_PRODUCT_IRIVER_IFP_3XX	0x1103		/* iFP-3xx */
 #define	USB_PRODUCT_IRIVER_IFP_5XX	0x1105		/* iFP-5xx */
 
+/* iTegno products */
+#define	USB_PRODUCT_ITEGNO_WM1080A	0x1080		/* WM1080A */
+
 /* Jaton products */
 #define	USB_PRODUCT_JATON_EDA	0x5704		/* Ethernet */
 
@@ -1239,6 +1257,9 @@
 #define	USB_PRODUCT_LACIE_HD	0xa601		/* Hard Disk */
 #define	USB_PRODUCT_LACIE_CDRW	0xa602		/* CD R/W */
 
+/* Leadtek products */
+#define	USB_PRODUCT_LEADTEK_9531	0x2101		/* 9531 GPS */
+
 /* Lexar products */
 #define	USB_PRODUCT_LEXAR_JUMPSHOT	0x0001		/* jumpSHOT CompactFlash */
 #define	USB_PRODUCT_LEXAR_2662WAR	0xa002		/* 2662W-AR */
@@ -1382,6 +1403,9 @@
 #define	USB_PRODUCT_MITSUMI_MOUSE	0x6407		/* Mouse */
 #define	USB_PRODUCT_MITSUMI_FDD	0x6901		/* FDD */
 
+/* Mobile Action products */
+#define	USB_PRODUCT_MOBILEACTION_MA620	0x0620		/* MA-620 IrDA */
+
 /* Mobility products */
 #define	USB_PRODUCT_MOBILITY_EA	0x0204		/* Ethernet */
 #define	USB_PRODUCT_MOBILITY_EASIDOCK	0x0304		/* EasiDock Ethernet */
@@ -1457,6 +1481,9 @@
 /* NHJ product */
 #define	USB_PRODUCT_NHJ_CAM2	0x9120		/* Camera */
 
+/* Nokia products */
+#define	USB_PRODUCT_NOKIA_CA42	0x1234		/* CA-42 Serial */
+
 /* Novatel Wireless products */
 #define	USB_PRODUCT_NOVATEL_MERLINV620	0x1110		/* Merlin V620 */
 
@@ -1491,6 +1518,7 @@
 
 /* Ours Technology Inc. */
 #define	USB_PRODUCT_OTI_SOLID	0x6803		/* Solid state disk */
+#define	USB_PRODUCT_OTI_DKU5	0x6858		/* DKU-5 Serial */
 
 /* Palm Computing, Inc. product */
 #define	USB_PRODUCT_PALM_SERIAL	0x0080		/* USB Serial Adaptor */
@@ -1558,6 +1586,7 @@
 
 /* PLX products */
 #define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
+#define	USB_PRODUCT_PLX_CA42	0xac70		/* CA-42 Serial */
 
 /* PortGear products */
 #define	USB_PRODUCT_PORTGEAR_EA8	0x0008		/* Ethernet */
@@ -1611,6 +1640,9 @@
 /* Quickshot products */
 #define	USB_PRODUCT_QUICKSHOT_STRIKEPAD	0x6238		/* USB StrikePad */
 
+/* Radio Shack products */
+#define	USB_PRODUCT_RADIOSHACK_PL2303	0x4026		/* PL2303 Serial */
+
 /* Rainbow Technologies products */
 #define	USB_PRODUCT_RAINBOW_IKEY2000	0x1200		/* i-Key 2000 */
 
@@ -1648,6 +1680,9 @@
 /* Rockfire products */
 #define	USB_PRODUCT_ROCKFIRE_GAMEPAD	0x2033		/* gamepad 203USB */
 
+/* Sagem products */
+#define	USB_PRODUCT_SAGEM_SERIAL	0x0027		/* Serial */
+
 /* Saitek products */
 #define	USB_PRODUCT_SAITEK_CYBORG_3D_GOLD	0x0006		/* Cyborg 3D Gold Joystick */
 
@@ -1666,6 +1701,7 @@
 #define	USB_PRODUCT_SANYO_SCP4900	0x0701		/* Sanyo SCP-4900 Phone */
 
 /* Samsung products */
+#define	USB_PRODUCT_SAMSUNG2_I330	0x8001		/* I330 */
 #define	USB_PRODUCT_SAMSUNG_SWL2100W	0xa000		/* SWL-2100U */
 
 /* ScanLogic products */
@@ -1706,6 +1742,9 @@
 #define	USB_PRODUCT_SHUTTLE_SCM	0x1010		/* SCM Micro */
 
 /* Siemens products */
+#define	USB_PRODUCT_SIEMENS3_SX1	0x0001		/* SX1 */
+#define	USB_PRODUCT_SIEMENS3_X65	0x0003		/* X65 */
+#define	USB_PRODUCT_SIEMENS3_X75	0x0004		/* X75 */
 #define	USB_PRODUCT_SIEMENS2_WLL013	0x001b		/* WLL013 */
 #define	USB_PRODUCT_SIEMENS2_ES75	0x0034		/* GSM module MC35 */
 #define	USB_PRODUCT_SIEMENS_SPEEDSTREAM	0x1001		/* SpeedStream */
@@ -1781,6 +1820,9 @@
 #define	USB_PRODUCT_SOURCENEXT_KEIKAI8	0x039f		/* KeikaiDenwa 8 */
 #define	USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG	0x012e		/* KeikaiDenwa 8 with charger */
 
+/* Speed Dragon Multimedia products */
+#define	USB_PRODUCT_SPEEDDRAGON_MS3303H	0x110b		/* MS3303H Serial */
+
 /* Sphairon Access Systems GmbH products */
 #define	USB_PRODUCT_SPHAIRON_UB801R	0x0110		/* UB801R */
 
@@ -1823,6 +1865,9 @@
 /* Susteen, Inc. products */
 #define	USB_PRODUCT_SUSTEEN_DCU11	0x0528		/* Ericsson DCU-10/11 */
 
+/* Syntech Information products */
+#define	USB_PRODUCT_SYNTECH_SERIAL	0x0001		/* Serial */
+
 /* Tangtop products */
 #define	USB_PRODUCT_TANGTOP_USBPS2	0x0001		/* USBPS2 */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 58cb4266f4b..de07b8ecb01 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.194 2006/03/31 04:32:56 drahn Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.195 2006/04/15 04:36:09 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.190 2006/03/31 04:32:30 drahn Exp 
+ *	OpenBSD: usbdevs,v 1.191 2006/04/15 04:34:36 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -331,6 +331,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "USB-HASP 0.06",
 	},
 	{
+	    USB_VENDOR_ALCATEL, USB_PRODUCT_ALCATEL_OT535,
+	    "One Touch 535/735",
+	},
+	{
 	    USB_VENDOR_ALCOR2, USB_PRODUCT_ALCOR2_KBD_HUB,
 	    "Kbd Hub",
 	},
@@ -403,6 +407,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Eagle III",
 	},
 	{
+	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_SERIAL,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB,
 	    "EZUSB",
 	},
@@ -1759,6 +1767,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "iFP-5xx",
 	},
 	{
+	    USB_VENDOR_ITEGNO, USB_PRODUCT_ITEGNO_WM1080A,
+	    "WM1080A",
+	},
+	{
 	    USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA,
 	    "Ethernet",
 	},
@@ -1995,6 +2007,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "CD R/W",
 	},
 	{
+	    USB_VENDOR_LEADTEK, USB_PRODUCT_LEADTEK_9531,
+	    "9531 GPS",
+	},
+	{
 	    USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_JUMPSHOT,
 	    "jumpSHOT CompactFlash",
 	},
@@ -2415,6 +2431,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "FDD",
 	},
 	{
+	    USB_VENDOR_MOBILEACTION, USB_PRODUCT_MOBILEACTION_MA620,
+	    "MA-620 IrDA",
+	},
+	{
 	    USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA,
 	    "Ethernet",
 	},
@@ -2603,6 +2623,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Camera",
 	},
 	{
+	    USB_VENDOR_NOKIA, USB_PRODUCT_NOKIA_CA42,
+	    "CA-42 Serial",
+	},
+	{
 	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINV620,
 	    "Merlin V620",
 	},
@@ -2683,6 +2707,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Solid state disk",
 	},
 	{
+	    USB_VENDOR_OTI, USB_PRODUCT_OTI_DKU5,
+	    "DKU-5 Serial",
+	},
+	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
 	    "USB Serial Adaptor",
 	},
@@ -2855,6 +2883,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "test board",
 	},
 	{
+	    USB_VENDOR_PLX, USB_PRODUCT_PLX_CA42,
+	    "CA-42 Serial",
+	},
+	{
 	    USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA8,
 	    "Ethernet",
 	},
@@ -2991,6 +3023,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "USB StrikePad",
 	},
 	{
+	    USB_VENDOR_RADIOSHACK, USB_PRODUCT_RADIOSHACK_PL2303,
+	    "PL2303 Serial",
+	},
+	{
 	    USB_VENDOR_RAINBOW, USB_PRODUCT_RAINBOW_IKEY2000,
 	    "i-Key 2000",
 	},
@@ -3091,6 +3127,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "gamepad 203USB",
 	},
 	{
+	    USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_SERIAL,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_SAITEK, USB_PRODUCT_SAITEK_CYBORG_3D_GOLD,
 	    "Cyborg 3D Gold Joystick",
 	},
@@ -3127,6 +3167,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Sanyo SCP-4900 Phone",
 	},
 	{
+	    USB_VENDOR_SAMSUNG2, USB_PRODUCT_SAMSUNG2_I330,
+	    "I330",
+	},
+	{
 	    USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_SWL2100W,
 	    "SWL-2100U",
 	},
@@ -3223,6 +3267,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "SCM Micro",
 	},
 	{
+	    USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_SX1,
+	    "SX1",
+	},
+	{
+	    USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_X65,
+	    "X65",
+	},
+	{
+	    USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_X75,
+	    "X75",
+	},
+	{
 	    USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_WLL013,
 	    "WLL013",
 	},
@@ -3415,6 +3471,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "KeikaiDenwa 8 with charger",
 	},
 	{
+	    USB_VENDOR_SPEEDDRAGON, USB_PRODUCT_SPEEDDRAGON_MS3303H,
+	    "MS3303H Serial",
+	},
+	{
 	    USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R,
 	    "UB801R",
 	},
@@ -3499,6 +3559,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Ericsson DCU-10/11",
 	},
 	{
+	    USB_VENDOR_SYNTECH, USB_PRODUCT_SYNTECH_SERIAL,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_TANGTOP, USB_PRODUCT_TANGTOP_USBPS2,
 	    "USBPS2",
 	},
@@ -3879,6 +3943,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Melco",
 	},
 	{
+	    USB_VENDOR_LEADTEK,
+	    "Leadtek",
+	},
+	{
 	    USB_VENDOR_CREATIVE,
 	    "Creative Labs",
 	},
@@ -4143,6 +4211,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Shuttle Technology",
 	},
 	{
+	    USB_VENDOR_SAMSUNG2,
+	    "Samsung Electronics",
+	},
+	{
 	    USB_VENDOR_ANNABOOKS,
 	    "Annabooks",
 	},
@@ -4619,6 +4691,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Eicon Networks",
 	},
 	{
+	    USB_VENDOR_SYNTECH,
+	    "Syntech Information",
+	},
+	{
 	    USB_VENDOR_DIGITALSTREAM,
 	    "Digital Stream",
 	},
@@ -4651,6 +4727,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Jenoptik",
 	},
 	{
+	    USB_VENDOR_NOKIA,
+	    "Nokia",
+	},
+	{
 	    USB_VENDOR_BRIMAX,
 	    "Brimax",
 	},
@@ -4663,6 +4743,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "ABL Electronics",
 	},
 	{
+	    USB_VENDOR_SAGEM,
+	    "Sagem",
+	},
+	{
 	    USB_VENDOR_SUNCOMM,
 	    "Sun Communications",
 	},
@@ -5135,6 +5219,14 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "ELCON Systemtechnik",
 	},
 	{
+	    USB_VENDOR_MOBILEACTION,
+	    "Mobile Action",
+	},
+	{
+	    USB_VENDOR_SPEEDDRAGON,
+	    "Speed Dragon Multimedia",
+	},
+	{
 	    USB_VENDOR_HAWKING,
 	    "Hawking",
 	},
@@ -5151,6 +5243,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Pilotech",
 	},
 	{
+	    USB_VENDOR_ITEGNO,
+	    "iTegno",
+	},
+	{
 	    USB_VENDOR_AIRPRIME,
 	    "Airprime",
 	},
@@ -5219,6 +5315,14 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Sierra Wireless",
 	},
 	{
+	    USB_VENDOR_SIEMENS3,
+	    "Siemens",
+	},
+	{
+	    USB_VENDOR_ALCATEL,
+	    "Alcatel",
+	},
+	{
 	    USB_VENDOR_TSUNAMI,
 	    "Tsunami",
 	},
@@ -5267,6 +5371,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Novatel Wireless",
 	},
 	{
+	    USB_VENDOR_RADIOSHACK,
+	    "Radio Shack",
+	},
+	{
 	    USB_VENDOR_SILICOM,
 	    "Silicom",
 	},