regen

2 files changed, 93 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 5349cdc13be..7d5ce222585 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.352 2008/03/18 12:36:15 jsg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.353 2008/03/22 02:48:34 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.343 2008/03/18 12:35:34 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.344 2008/03/22 02:47:45 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -343,6 +343,7 @@
 #define	USB_VENDOR_AIPTEK	0x08ca		/* AIPTEK International */
 #define	USB_VENDOR_SMARTBRIDGES	0x08d1		/* SmartBridges */
 #define	USB_VENDOR_BILLIONTON	0x08dd		/* Billionton Systems */
+#define	USB_VENDOR_GEMPLUS	0x08e6		/* GEMPLUS */
 #define	USB_VENDOR_EXTENDED	0x08e9		/* Extended Systems */
 #define	USB_VENDOR_MSYSTEMS	0x08ec		/* M-Systems */
 #define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec */
@@ -452,6 +453,7 @@
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_ASANTE	0x10bd		/* Asante */
 #define	USB_VENDOR_SILABS	0x10c4		/* Silicon Labs */
+#define	USB_VENDOR_SILABS3	0x10c5		/* Silicon Labs */
 #define	USB_VENDOR_ANALOG	0x1110		/* Analog Devices */
 #define	USB_VENDOR_TENX	0x1130		/* Ten X Technology, Inc. */
 #define	USB_VENDOR_ISSC	0x1131		/* Integrated System Solution Corp. */
@@ -506,6 +508,7 @@
 #define	USB_VENDOR_GOODWAY	0x1631		/* Good Way Technology */
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
+#define	USB_VENDOR_CLIPSAL	0x166a		/* Clipsal */
 #define	USB_VENDOR_ATHEROS	0x168c		/* Atheros Communications */
 #define	USB_VENDOR_GIGASET	0x1690		/* Gigaset */
 #define	USB_VENDOR_GLOBALSUN	0x16ab		/* Global Sun Technology */
@@ -966,6 +969,9 @@
 #define	USB_PRODUCT_CISCOLINKSYS_WUSBF54G	0x0024		/* WUSBF54G */
 #define	USB_PRODUCT_CISCOLINKSYS_HU200TS	0x001a		/* HU200-TS */
 
+/* Clipsal products */
+#define	USB_PRODUCT_CLIPSAL_5500PCU	0x0303		/* 5500PCU C-Bus */
+
 /* Compaq products */
 #define	USB_PRODUCT_COMPAQ_IPAQPOCKETPC	0x0003		/* iPAQ PocketPC */
 #define	USB_PRODUCT_COMPAQ_A1500	0x0012		/* A1500 */
@@ -1128,6 +1134,7 @@
 
 /* Dynastream Innovations */
 #define	USB_PRODUCT_DYNASTREAM_ANTDEVBOARD	0x1003		/* ANT dev board */
+#define	USB_PRODUCT_DYNASTREAM_ANT2USB	0x1004		/* ANT2USB */
 
 /* EasyDisk products */
 #define	USB_PRODUCT_EASYDISK_EASYDISK	0x0005		/* Flash Disk */
@@ -1373,6 +1380,9 @@
 #define	USB_PRODUCT_GARMIN_GPSMAP60CSX	0x0003		/* GPSmap 60Csx */
 #define	USB_PRODUCT_GARMIN_IQUE3600	0x0004		/* Ique 3600 */
 
+/* GEMPLUS products */
+#define	USB_PRODUCT_GEMPLUS_PROXPU	0x5501		/* Prox-PU/CU */
+
 /* Genesys Logic products */
 #define	USB_PRODUCT_GENESYS_GENELINK	0x05e3		/* GeneLink Host-Host Bridge */
 #define	USB_PRODUCT_GENESYS_GL650	0x0604		/* GL650 Hub */
@@ -2435,21 +2445,32 @@
 #define	USB_PRODUCT_SILICOM_GPE	0x0002		/* Psion Dacom Gold Port Ethernet */
 
 /* Silicon Labs products */
+#define	USB_PRODUCT_SILABS_BSM7DUSB	0x800a		/* BSM7-D-USB */
 #define	USB_PRODUCT_SILABS_POLOLU	0x803b		/* Pololu Serial */
+#define	USB_PRODUCT_SILABS_EDG1228	0x8053		/* EDG1228 */
 #define	USB_PRODUCT_SILABS_ARGUSISP	0x8066		/* Argussoft ISP */
 #define	USB_PRODUCT_SILABS_CRUMB128	0x807a		/* Crumb128 */
 #define	USB_PRODUCT_SILABS_DEGREECONT	0x80ca		/* Degree Controls */
+#define	USB_PRODUCT_SILABS_TRACIENT	0x80dd		/* Tracient RFID */
 #define	USB_PRODUCT_SILABS_TRAQMATE	0x80ed		/* Track Systems Traqmate */
 #define	USB_PRODUCT_SILABS_SUNNTO	0x80f6		/* Suunto sports */
 #define	USB_PRODUCT_SILABS_DESKTOPMOBILE	0x813d		/* Burnside Desktop mobile */
+#define	USB_PRODUCT_SILABS_RIGBLASTER	0x814a		/* RIGblaster P&P */
+#define	USB_PRODUCT_SILABS_RIGTALK	0x814b		/* RIGtalk */
 #define	USB_PRODUCT_SILABS_IPLINK1220	0x815e		/* IP-Link 1220 */
 #define	USB_PRODUCT_SILABS_LIPOWSKY_JTAG	0x81c8		/* Lipowsky Baby-JTAG */
 #define	USB_PRODUCT_SILABS_LIPOWSKY_LIN	0x81e2		/* Lipowsky Baby-LIN */
+#define	USB_PRODUCT_SILABS_AEROCOMM	0x81e7		/* Aerocomm Radio */
 #define	USB_PRODUCT_SILABS_LIPOWSKY_HARP	0x8218		/* Lipowsky HARP-1 */
 #define	USB_PRODUCT_SILABS_MC35PU	0x8341		/* MC35pu */
 #define	USB_PRODUCT_SILABS2_DCU11CLONE	0xaa26		/* DCU-11 clone */
 #define	USB_PRODUCT_SILABS_CP210X_1	0xea60		/* CP210x Serial */
 #define	USB_PRODUCT_SILABS_CP210X_2	0xea61		/* CP210x Serial */
+#define	USB_PRODUCT_SILABS3_GPRS_MODEM	0xea61		/* GPRS Modem */
+#define	USB_PRODUCT_SILABS_USBSCOPE50	0xf001		/* USBscope50 */
+#define	USB_PRODUCT_SILABS_USBWAVE12	0xf002		/* USBwave12 */
+#define	USB_PRODUCT_SILABS_USBPULSE100	0xf003		/* USBpulse100 */
+#define	USB_PRODUCT_SILABS_USBCOUNT50	0xf004		/* USBcount50 */
 
 /* Silicon Portals Inc. */
 #define	USB_PRODUCT_SILICONPORTALS_YAPPH_NF	0x0200		/* YAP Phone (no firmware) */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 54414a2b623..e1b20305b51 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.348 2008/03/18 12:36:15 jsg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.349 2008/03/22 02:48:34 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.343 2008/03/18 12:35:34 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.344 2008/03/22 02:47:45 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1109,6 +1109,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "HU200-TS",
 	},
 	{
+	    USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_5500PCU,
+	    "5500PCU C-Bus",
+	},
+	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC,
 	    "iPAQ PocketPC",
 	},
@@ -1557,6 +1561,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "ANT dev board",
 	},
 	{
+	    USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANT2USB,
+	    "ANT2USB",
+	},
+	{
 	    USB_VENDOR_EASYDISK, USB_PRODUCT_EASYDISK_EASYDISK,
 	    "Flash Disk",
 	},
@@ -2349,6 +2357,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Ique 3600",
 	},
 	{
+	    USB_VENDOR_GEMPLUS, USB_PRODUCT_GEMPLUS_PROXPU,
+	    "Prox-PU/CU",
+	},
+	{
 	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GENELINK,
 	    "GeneLink Host-Host Bridge",
 	},
@@ -5305,10 +5317,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "Psion Dacom Gold Port Ethernet",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_BSM7DUSB,
+	    "BSM7-D-USB",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_POLOLU,
 	    "Pololu Serial",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_EDG1228,
+	    "EDG1228",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARGUSISP,
 	    "Argussoft ISP",
 	},
@@ -5321,6 +5341,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Degree Controls",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_TRACIENT,
+	    "Tracient RFID",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_TRAQMATE,
 	    "Track Systems Traqmate",
 	},
@@ -5333,6 +5357,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "Burnside Desktop mobile",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_RIGBLASTER,
+	    "RIGblaster P&P",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_RIGTALK,
+	    "RIGtalk",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_IPLINK1220,
 	    "IP-Link 1220",
 	},
@@ -5345,6 +5377,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Lipowsky Baby-LIN",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_AEROCOMM,
+	    "Aerocomm Radio",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_HARP,
 	    "Lipowsky HARP-1",
 	},
@@ -5365,6 +5401,26 @@ const struct usb_known_product usb_known_products[] = {
 	    "CP210x Serial",
 	},
 	{
+	    USB_VENDOR_SILABS3, USB_PRODUCT_SILABS3_GPRS_MODEM,
+	    "GPRS Modem",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_USBSCOPE50,
+	    "USBscope50",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_USBWAVE12,
+	    "USBwave12",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_USBPULSE100,
+	    "USBpulse100",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_USBCOUNT50,
+	    "USBcount50",
+	},
+	{
 	    USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF,
 	    "YAP Phone (no firmware)",
 	},
@@ -7397,6 +7453,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Billionton Systems",
 	},
 	{
+	    USB_VENDOR_GEMPLUS,
+	    "GEMPLUS",
+	},
+	{
 	    USB_VENDOR_EXTENDED,
 	    "Extended Systems",
 	},
@@ -7833,6 +7893,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Silicon Labs",
 	},
 	{
+	    USB_VENDOR_SILABS3,
+	    "Silicon Labs",
+	},
+	{
 	    USB_VENDOR_ANALOG,
 	    "Analog Devices",
 	},
@@ -8049,6 +8113,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Actiontec Electronics",
 	},
 	{
+	    USB_VENDOR_CLIPSAL,
+	    "Clipsal",
+	},
+	{
 	    USB_VENDOR_ATHEROS,
 	    "Atheros Communications",
 	},