regen

2 files changed, 452 insertions, 6 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 791d0d8bc9a..2595133d8c8 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.597 2012/09/18 17:08:35 jasper Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.598 2012/09/29 10:48:13 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.587 2012/09/18 17:07:53 jasper Exp 
+ *	OpenBSD: usbdevs,v 1.588 2012/09/29 10:47:37 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -95,6 +95,7 @@
 #define	USB_VENDOR_SIS	0x0457		/* Silicon Integrated Systems Corp. */
 #define	USB_VENDOR_KYE	0x0458		/* KYE Systems */
 #define	USB_VENDOR_DIAMOND2	0x045a		/* Diamond (Supra) */
+#define	USB_VENDOR_RENESAS	0x045b		/* Renesas */
 #define	USB_VENDOR_MICROSOFT	0x045e		/* Microsoft */
 #define	USB_VENDOR_PRIMAX	0x0461		/* Primax Electronics */
 #define	USB_VENDOR_MGE	0x0463		/* Eaton (MGE) */
@@ -112,6 +113,7 @@
 #define	USB_VENDOR_PLANTRONICS	0x047f		/* Plantronics */
 #define	USB_VENDOR_KYOCERA	0x0482		/* Kyocera */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
+#define	USB_VENDOR_FOXCONN	0x0489		/* Foxconn */
 #define	USB_VENDOR_YAMAHA	0x0499		/* YAMAHA */
 #define	USB_VENDOR_COMPAQ	0x049f		/* Compaq */
 #define	USB_VENDOR_HITACHI	0x04a4		/* Hitachi */
@@ -352,6 +354,7 @@
 #define	USB_VENDOR_GEMPLUS	0x08e6		/* GEMPLUS */
 #define	USB_VENDOR_EXTENDED	0x08e9		/* Extended Systems */
 #define	USB_VENDOR_MSYSTEMS	0x08ec		/* M-Systems */
+#define	USB_VENDOR_DIGIANSWER	0x08fd		/* Digianswer */
 #define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec */
 #define	USB_VENDOR_AUDIOTECHNICA	0x0909		/* Audio-Technica */
 #define	USB_VENDOR_TRUMPION	0x090a		/* Trumpion Microelectronics */
@@ -416,6 +419,7 @@
 #define	USB_VENDOR_AMBIT	0x0bb2		/* Ambit Microsystems */
 #define	USB_VENDOR_HTC	0x0bb4		/* HTC */
 #define	USB_VENDOR_REALTEK	0x0bda		/* Realtek */
+#define	USB_VENDOR_MEI	0x0bed		/* MEI */
 #define	USB_VENDOR_ADDONICS2	0x0bf6		/* Addonics Technology */
 #define	USB_VENDOR_FSC	0x0bf8		/* Fujitsu Siemens Computers */
 #define	USB_VENDOR_AGATE	0x0c08		/* Agate Technologies */
@@ -480,6 +484,7 @@
 #define	USB_VENDOR_ASANTE	0x10bd		/* Asante */
 #define	USB_VENDOR_SILABS	0x10c4		/* Silicon Labs */
 #define	USB_VENDOR_SILABS3	0x10c5		/* Silicon Labs */
+#define	USB_VENDOR_SILABS4	0x10ce		/* Silicon Labs */
 #define	USB_VENDOR_VELLEMAN	0x10cf		/* Velleman */
 #define	USB_VENDOR_MOXA	0x110a		/* Moxa Technologies */
 #define	USB_VENDOR_ANALOG	0x1110		/* Analog Devices */
@@ -528,6 +533,7 @@
 #define	USB_VENDOR_PLANEX3	0x14ea		/* Planex Communications */
 #define	USB_VENDOR_SILICONPORTALS	0x1527		/* Silicon Portals */
 #define	USB_VENDOR_UBLOX	0x1546		/* U-blox */
+#define	USB_VENDOR_OWEN	0x1555		/* Owen */
 #define	USB_VENDOR_OQO	0x1557		/* OQO */
 #define	USB_VENDOR_UMEDIA	0x157e		/* U-MEDIA Communications */
 #define	USB_VENDOR_FIBERLINE	0x1582		/* Fiberline */
@@ -549,6 +555,7 @@
 #define	USB_VENDOR_ANYDATA	0x16d5		/* AnyDATA Inc. */
 #define	USB_VENDOR_JABLOTRON	0x16d6		/* Jablotron */
 #define	USB_VENDOR_CMOTECH	0x16d8		/* CMOTECH */
+#define	USB_VENDOR_WIENERPLEINBAUS	0x16dc		/* WIENER Plein & Baus */
 #define	USB_VENDOR_AXESSTEL	0x1726		/* Axesstel */
 #define	USB_VENDOR_LINKSYS4	0x1737		/* Linksys */
 #define	USB_VENDOR_SENAO	0x1740		/* Senao */
@@ -556,10 +563,13 @@
 #define	USB_VENDOR_STRAWBERRYLINUX	0x1774		/* Strawberry linux Co., Ltd. */
 #define	USB_VENDOR_SWEEX2	0x177f		/* Sweex */
 #define	USB_VENDOR_MECANIQUE	0x1781		/* Mecanique */
+#define	USB_VENDOR_KAMSTRUP	0x17a8		/* Kamstrup A/S */
 #define	USB_VENDOR_DISPLAYLINK	0x17e9		/* DisplayLink */
+#define	USB_VENDOR_WAVESENSE	0x17f4		/* WaveSense */
 #define	USB_VENDOR_VAISALA	0x1843		/* VAISALA */
 #define	USB_VENDOR_AMIT	0x18c5		/* AMIT */
 #define	USB_VENDOR_QCOM	0x18e8		/* Qcom */
+#define	USB_VENDOR_ELV	0x18ef		/* ELV */
 #define	USB_VENDOR_LINKSYS3	0x1915		/* Linksys */
 #define	USB_VENDOR_AVAGO	0x192f		/* Avago */
 #define	USB_VENDOR_MEINBERG	0x1938		/* Meinberg Funkuhren */
@@ -576,11 +586,13 @@
 #define	USB_VENDOR_TCTMOBILE	0x1bbb		/* TCT Mobile */
 #define	USB_VENDOR_MDS	0x1bc8		/* MDS */
 #define	USB_VENDOR_ALTI2	0x1bc9		/* Alti-2 */
+#define	USB_VENDOR_WAGO	0x1be3		/* WAGO Kontakttechnik */
 #define	USB_VENDOR_LONGCHEER	0x1c9e		/* Longcheer Technology */
 #define	USB_VENDOR_DRESDENELEC	0x1cf1		/* Dresden Elektronic */
 #define	USB_VENDOR_DREAMLINK	0x1d34		/* Dream Link */
 #define	USB_VENDOR_PEGATRON	0x1d4d		/* Pegatron */
 #define	USB_VENDOR_METAGEEK	0x1dd5		/* MetaGeek */
+#define	USB_VENDOR_FESTO	0x1e29		/* Festo */
 #define	USB_VENDOR_MODACOM	0x1eb8		/* Modacom */
 #define	USB_VENDOR_AIRTIES	0x1eda		/* AirTies */
 #define	USB_VENDOR_VERTEX	0x1fe7		/* Vertex Wireless Co., Ltd. */
@@ -596,6 +608,7 @@
 #define	USB_VENDOR_NHJ	0x2770		/* NHJ */
 #define	USB_VENDOR_ASUSTEK	0x2821		/* ASUSTeK Computer */
 #define	USB_VENDOR_PLANEX	0x2c02		/* Planex Communications */
+#define	USB_VENDOR_LINKINSTRUMENTS	0x3195		/* Link Instruments */
 #define	USB_VENDOR_AEI	0x3334		/* AEI */
 #define	USB_VENDOR_PQI	0x3538		/* PQI */
 #define	USB_VENDOR_DAISY	0x3579		/* Daisy Technology */
@@ -627,6 +640,7 @@
 #define	USB_VENDOR_MARVELL	0x9e88		/* Marvell */
 #define	USB_VENDOR_3COM3	0xa727		/* 3Com */
 #define	USB_VENDOR_CACE	0xcace		/* CACE Technologies */
+#define	USB_VENDOR_DATAAPEX	0xdaae		/* DataApex */
 #define	USB_VENDOR_EVOLUTION	0xdeee		/* Evolution Robotics */
 #define	USB_VENDOR_EMPIA	0xeb1a		/* eMPIA Technology */
 #define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
@@ -1233,7 +1247,13 @@
 #define	USB_PRODUCT_CISCOLINKSYS3_RT3070	0x0101		/* RT3070 */
 
 /* Clipsal products */
+#define	USB_PRODUCT_CLIPSAL_560884	0x0101		/* 560884 C-Bus Switch */
+#define	USB_PRODUCT_CLIPSAL_5500PACA	0x0201		/* 5500PACA C-Bus Controller */
+#define	USB_PRODUCT_CLIPSAL_5800PC	0x0301		/* 5800PC C-Bus Wireless */
 #define	USB_PRODUCT_CLIPSAL_5500PCU	0x0303		/* 5500PCU C-Bus */
+#define	USB_PRODUCT_CLIPSAL_5000CT2	0x0304		/* 5000CT2 C-Bus Touch Screen */
+#define	USB_PRODUCT_CLIPSAL_C5000CT2	0x0305		/* C5000CT2 C-Bus Touch Screen */
+#define	USB_PRODUCT_CLIPSAL_L51xx	0x0401		/* L51xx C-Bus Dimmer */
 
 /* Compaq products */
 #define	USB_PRODUCT_COMPAQ_IPAQPOCKETPC	0x0003		/* iPAQ PocketPC */
@@ -1356,6 +1376,9 @@
 #define	USB_PRODUCT_DALLAS_USB_FOB_IBUTTON	0x2490		/* USB-FOB/iBUTTON */
 #define	USB_PRODUCT_DALLAS_J6502	0x4201		/* J-6502 speakers */
 
+/* DataApex products */
+#define	USB_PRODUCT_DATAAPEX_MULTICOM	0xead6		/* MultiCom */
+
 /* Davicom products */
 #define	USB_PRODUCT_DAVICOM_WK668	0x0668		/* HenTong WK-668 */
 #define	USB_PRODUCT_DAVICOM_DM9601	0x9601		/* DM9601 */
@@ -1370,6 +1393,7 @@
 #define	USB_PRODUCT_DELL_W5500	0x8115		/* W5500 HSDPA */
 #define	USB_PRODUCT_DELL_U740	0x8135		/* Dell U740 CDMA */
 #define	USB_PRODUCT_DELL_EU870D	0x8138		/* EU870D HSDPA */
+#define	USB_PRODUCT_DELL_DW700	0x9500		/* DW700 GPS */
 #define	USB_PRODUCT_DELL2_UPS	0xFFFF		/* UPS */
 
 /* DeLorme products */
@@ -1393,6 +1417,9 @@
 #define	USB_PRODUCT_DIGI_ACCELEPORT4	0x0004		/* AccelePort 4 */
 #define	USB_PRODUCT_DIGI_ACCELEPORT8	0x0008		/* AccelePort 8 */
 
+/* Digianswer A/S products */
+#define	USB_PRODUCT_DIGIANSWER_ZIGBEE802154	0x000a		/* ZigBee */
+
 /* Digital Stream Corp. products */
 #define	USB_PRODUCT_DIGITALSTREAM_PS2	0x0001		/* PS/2 Active */
 
@@ -1495,6 +1522,7 @@
 /* Dynastream Innovations */
 #define	USB_PRODUCT_DYNASTREAM_ANTDEVBOARD	0x1003		/* ANT dev board */
 #define	USB_PRODUCT_DYNASTREAM_ANT2USB	0x1004		/* ANT2USB */
+#define	USB_PRODUCT_DYNASTREAM_ANTDEVBOARD2	0x1006		/* ANT dev board */
 
 /* EasyDisk products */
 #define	USB_PRODUCT_EASYDISK_EASYDISK	0x0005		/* Flash Disk */
@@ -1545,6 +1573,9 @@
 #define	USB_PRODUCT_ELSA_MODEM1	0x2265		/* ELSA */
 #define	USB_PRODUCT_ELSA_USB2ETHERNET	0x3000		/* Microlink USB2Ethernet */
 
+/* ELV products */
+#define	USB_PRODUCT_ELV_USBI2C	0xe00f		/* USB-I2C */
+
 /* eMPIA products */
 #define	USB_PRODUCT_EMPIA_EEEPC701_VIDEO	0x2761		/* EeePC701 camera */
 
@@ -1612,12 +1643,20 @@
 #define	USB_PRODUCT_FEIXUN_RTL8188CU	0x0090		/* RTL8188CU */
 #define	USB_PRODUCT_FEIXUN_RTL8192CU	0x0091		/* RTL8192CU */
 
+/* Festo products */
+#define	USB_PRODUCT_FESTO_CPX_USB	0x0102		/* CPX-USB */
+#define	USB_PRODUCT_FESTO_CMSP	0x0501		/* CMSP */
+
 /* Fiberline products */
 #define	USB_PRODUCT_FIBERLINE_WL430U	0x6003		/* WL-430U */
 
 /* Fossil products */
 #define	USB_PRODUCT_FOSSIL_WRISTPDA	0x0002		/* Wrist PDA */
 
+/* Foxconn products */
+#define	USB_PRODUCT_FOXCONN_TCOM_TC_300	0xe000		/* T-Com TC 300 */
+#define	USB_PRODUCT_FOXCONN_PIRELLI_DP_L10	0xe003		/* Pirelli DP-L10 */
+
 /* Freecom products */
 #define	USB_PRODUCT_FREECOM_DVD	0xfc01		/* Connector for DVD drive */
 
@@ -2200,6 +2239,10 @@
 #define	USB_PRODUCT_JVC_MP_XP7250_WL	0x3009		/* MP-XP7250 Builtin WLAN */
 #define	USB_PRODUCT_JVC_MP_PRX1	0x3008		/* MP-PRX1 */
 
+/* Kamstrup products */
+#define	USB_PRODUCT_KAMSTRUP_OPTICALEYE	0x0001		/* Optical Eye/3-wire */
+#define	USB_PRODUCT_KAMSTRUP_MBUS_250D	0x0005		/* M-Bus Master MultiPort 250D */
+
 /* Kawasaki LSI products */
 #define	USB_PRODUCT_KLSI_DUH3E10BT	0x0008		/* 10BT Ethernet */
 #define	USB_PRODUCT_KLSI_DUH3E10BTN	0x0009		/* 10BT Ethernet */
@@ -2298,6 +2341,11 @@
 #define	USB_PRODUCT_LIEBERT_UPS	0xffff		/* UPS */
 #define	USB_PRODUCT_LIEBERT2_PSA	0x0001		/* PowerSure PSA UPS */
 
+/* Link Instruments products */
+#define	USB_PRODUCT_LINKINSTRUMENTS_MSO19	0xf190		/* Link Instruments MSO-19 */
+#define	USB_PRODUCT_LINKINSTRUMENTS_MSO28	0xf280		/* Link Instruments MSO-28 */
+#define	USB_PRODUCT_LINKINSTRUMENTS_MSO28_2	0xf281		/* Link Instruments MSO-28 */
+
 /* Linksys products */
 #define	USB_PRODUCT_LINKSYS4_USB1000	0x0039		/* USB1000 */
 #define	USB_PRODUCT_LINKSYS4_WUSB100	0x0070		/* WUSB100 */
@@ -2671,6 +2719,10 @@
 /* MDS products */
 #define	USB_PRODUCT_MDS_ISDBT	0x0001		/* MDS ISDB-T tuner */
 
+/* MEI products */
+#define	USB_PRODUCT_MEI_CASHFLOW_SC	0x1100		/* Cashflow-SC */
+#define	USB_PRODUCT_MEI_S2000	0x1101		/* Series 2000 */
+
 /* Meinberg Funkuhren products */
 #define	USB_PRODUCT_MEINBERG_USB5131	0x0301		/* USB 5131 DCF77 - Radio Clock */
 
@@ -3022,6 +3074,9 @@
 #define	USB_PRODUCT_OVISLINK_RT3071	0x3071		/* RT3071 */
 #define	USB_PRODUCT_OVISLINK_RT3072	0x3072		/* RT3072 */
 
+/* Owen.ru products */
+#define	USB_PRODUCT_OWEN_AC4	0x0004		/* AC4 USB-RS485 */
+
 /* Palm Computing, Inc. product */
 #define	USB_PRODUCT_PALM_SERIAL	0x0080		/* USB Serial Adaptor */
 #define	USB_PRODUCT_PALM_M500	0x0001		/* Palm m500 */
@@ -3110,6 +3165,7 @@
 #define	USB_PRODUCT_PHILIPS_PCVC740K	0x0311		/* PCVC740K ToUCam Pro PC */
 #define	USB_PRODUCT_PHILIPS_PCVC750K	0x0312		/* PCVC750K ToUCam Pro Scan */
 #define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS 150 Digital Speaker System */
+#define	USB_PRODUCT_PHILIPS_ACE1001	0x066a		/* AKTAKOM ACE-1001 */
 #define	USB_PRODUCT_PHILIPS_CPWUA054	0x1230		/* CPWUA054 */
 #define	USB_PRODUCT_PHILIPS_SNU6500	0x1232		/* SNU6500 */
 #define	USB_PRODUCT_PHILIPS_SNU6500_NF	0x1233		/* SNU6500 */
@@ -3312,6 +3368,9 @@
 #define	USB_PRODUCT_REALTEK_RTL8188CU_COMBO	0x8754		/* RTL8188CU */
 #define	USB_PRODUCT_REALTEK_RTL8192SU	0xc512		/* RTL8192SU */
 
+/* Renesas products */
+#define	USB_PRODUCT_RENESAS_RX610	0x0053		/* RX610 RX-Stick */
+
 /* Research In Motion products */
 #define	USB_PRODUCT_RIM_BLACKBERRY	0x0001		/* Blackberry */
 #define	USB_PRODUCT_RIM_PEARL_DUAL	0x0004		/* RIM Mass Storage Device */
@@ -3550,28 +3609,66 @@
 #define	USB_PRODUCT_SILICOM_GPE	0x0002		/* Psion Dacom Gold Port Ethernet */
 
 /* Silicon Labs products */
+#define	USB_PRODUCT_SILABS_VSTABI	0x0f91		/* VStabi Controller */
+#define	USB_PRODUCT_SILABS_ARKHAM_DS101_M	0x1101		/* Arkham DS101 Monitor */
+#define	USB_PRODUCT_SILABS_ARKHAM_DS101_A	0x1601		/* Arkham DS101 Adapter */
 #define	USB_PRODUCT_SILABS_BSM7DUSB	0x800a		/* BSM7-D-USB */
 #define	USB_PRODUCT_SILABS_POLOLU	0x803b		/* Pololu Serial */
+#define	USB_PRODUCT_SILABS_SB_PARAMOUNT_ME	0x8043		/* Software Bisque Paramount ME */
+#define	USB_PRODUCT_SILABS_CYGNAL_DEBUG	0x8044		/* Cygnal Debug Adapter */
 #define	USB_PRODUCT_SILABS_EDG1228	0x8053		/* EDG1228 */
 #define	USB_PRODUCT_SILABS_ARGUSISP	0x8066		/* Argussoft ISP */
+#define	USB_PRODUCT_SILABS_IMS_USB_RS422	0x806f		/* IMS USB-RS422 */
 #define	USB_PRODUCT_SILABS_CRUMB128	0x807a		/* Crumb128 */
+#define	USB_PRODUCT_SILABS_OPTRIS_MSPRO	0x80c4		/* Optris MSpro LT Thermometer */
 #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_SUUNTO	0x80f6		/* Suunto sports */
+#define	USB_PRODUCT_SILABS_ARYGON_MIFARE	0x8115		/* Arygon Mifare RFID reader */
 #define	USB_PRODUCT_SILABS_DESKTOPMOBILE	0x813d		/* Burnside Desktop mobile */
+#define	USB_PRODUCT_SILABS_TAMSMASTER	0x813f		/* Tams Master Easy Control */
 #define	USB_PRODUCT_SILABS_RIGBLASTER	0x814a		/* RIGblaster P&P */
 #define	USB_PRODUCT_SILABS_RIGTALK	0x814b		/* RIGtalk */
+#define	USB_PRODUCT_SILABS_B_G_H3000	0x8156		/* B&G H3000 Data Cable */
 #define	USB_PRODUCT_SILABS_IPLINK1220	0x815e		/* IP-Link 1220 */
+#define	USB_PRODUCT_SILABS_HAMLINKUSB	0x815f		/* Timewave HamLinkUSB */
+#define	USB_PRODUCT_SILABS_AVIT_USB_TTL	0x818b		/* AVIT Research USB-TTL */
+#define	USB_PRODUCT_SILABS_MJS_TOSLINK	0x819f		/* MJS USB-TOSLINK */
+#define	USB_PRODUCT_SILABS_WAVIT	0x81a6		/* ThinkOptics WavIt */
+#define	USB_PRODUCT_SILABS_MULTIPLEX_RC	0x81a9		/* Multiplex RC adapter */
+#define	USB_PRODUCT_SILABS_MSD_DASHHAWK	0x81ac		/* MSD DashHawk */
+#define	USB_PRODUCT_SILABS_INSYS_MODEM	0x81ad		/* INSYS Modem */
 #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_ZEPHYR_BIO	0x81e8		/* Zephyr Bioharness */
+#define	USB_PRODUCT_SILABS_EMS_C1007	0x81f2		/* EMS C1007 HF RFID reader */
 #define	USB_PRODUCT_SILABS_LIPOWSKY_HARP	0x8218		/* Lipowsky HARP-1 */
+#define	USB_PRODUCT_SILABS_C2_EDGE_MODEM	0x822b		/* Commander 2 EDGE(GSM) Modem */
+#define	USB_PRODUCT_SILABS_CYGNAL_GPS	0x826b		/* Cygnal Fasttrax GPS */
+#define	USB_PRODUCT_SILABS_TELEGESIS_ETRX2	0x8293		/* Telegesis ETRX2USB */
+#define	USB_PRODUCT_SILABS_PROCYON_AVS	0x82f9		/* Procyon AVS */
 #define	USB_PRODUCT_SILABS_MC35PU	0x8341		/* MC35pu */
+#define	USB_PRODUCT_SILABS_CYGNAL	0x8382		/* Cygnal */
+#define	USB_PRODUCT_SILABS_AMBER_AMB2560	0x83a8		/* Amber Wireless AMB2560 */
+#define	USB_PRODUCT_SILABS_DEKTEK_DTAPLUS	0x83d8		/* DekTec DTA Plus VHF/UHF Booster */
+#define	USB_PRODUCT_SILABS_KYOCERA_GPS	0x8411		/* Kyocera GPS */
+#define	USB_PRODUCT_SILABS_IRZ_SG10	0x8418		/* IRZ SG-10 GSM/GPRS Modem */
+#define	USB_PRODUCT_SILABS_BEI_VCP	0x846e		/* BEI USB Sensor (VCP) */
+#define	USB_PRODUCT_SILABS_BALLUFF_RFID	0x8477		/* Balluff RFID reader */
+#define	USB_PRODUCT_SILABS_AC_SERV_IBUS	0x85ea		/* AC-Services IBUS */
+#define	USB_PRODUCT_SILABS_AC_SERV_CIS	0x85eb		/* AC-Services CIS-IBUS */
+#define	USB_PRODUCT_SILABS_AC_SERV_CAN	0x8664		/* AC-Services CAN */
+#define	USB_PRODUCT_SILABS_AC_SERV_OBD	0x8665		/* AC-Services OBD */
 #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_SILABS4_100EU_MODEM	0xea61		/* GPRS Modem 100EU */
+#define	USB_PRODUCT_SILABS_CP210X_3	0xea70		/* CP210x Serial */
+#define	USB_PRODUCT_SILABS_INFINITY_MIC	0xea71		/* Infinity GPS-MIC-1 */
+#define	USB_PRODUCT_SILABS_CP210X_4	0xea80		/* CP210x Serial */
 #define	USB_PRODUCT_SILABS_USBSCOPE50	0xf001		/* USBscope50 */
 #define	USB_PRODUCT_SILABS_USBWAVE12	0xf002		/* USBwave12 */
 #define	USB_PRODUCT_SILABS_USBPULSE100	0xf003		/* USBpulse100 */
@@ -3759,6 +3856,7 @@
 
 /* Syntech Information products */
 #define	USB_PRODUCT_SYNTECH_SERIAL	0x0001		/* Serial */
+#define	USB_PRODUCT_SYNTECH_CIPHERLAB100	0x1000		/* CipherLab Barcode Scanner */
 
 /* TCT Mobile products */
 #define	USB_PRODUCT_TCTMOBILE_UMSM	0x0000		/* Modem mode */
@@ -4019,6 +4117,18 @@
 #define	USB_PRODUCT_WACOM_GRAPHIRE4_4X5	0x0015		/* Graphire4 Classic A6 */
 #define	USB_PRODUCT_WACOM_INTUOSA5	0x0021		/* Intuos A5 */
 
+/* WAGO Kontakttechnik products */
+#define	USB_PRODUCT_WAGO_SERVICECABLE	0x07a6		/* Service Cable 750-923 */
+
+/* WaveSense products */
+#define	USB_PRODUCT_WAVESENSE_JAZZ	0xaaaa		/* Jazz blood glucose meter */
+
+/* WIENER Plein & Baus products */
+#define	USB_PRODUCT_WIENERPLEINBAUS_PL512	0x0010		/* PL512 PSU */
+#define	USB_PRODUCT_WIENERPLEINBAUS_RCM	0x0011		/* RCM Remote Control */
+#define	USB_PRODUCT_WIENERPLEINBAUS_MPOD	0x0012		/* MPOD PSU */
+#define	USB_PRODUCT_WIENERPLEINBAUS_CML	0x0015		/* CML Data Logger */
+
 /* Wistron NeWeb products */
 #define	USB_PRODUCT_WISTRONNEWEB_WNC0600	0x0326		/* WNC-0600USB */
 #define	USB_PRODUCT_WISTRONNEWEB_UR045G	0x0427		/* PrismGT USB 2.0 WLAN */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 4ac2abe1379..dfc27c3e0dd 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.591 2012/09/18 17:08:35 jasper Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.592 2012/09/29 10:48:13 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.587 2012/09/18 17:07:53 jasper Exp 
+ *	OpenBSD: usbdevs,v 1.588 2012/09/29 10:47:37 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1726,10 +1726,34 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_560884,
+	    "560884 C-Bus Switch",
+	},
+	{
+	    USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_5500PACA,
+	    "5500PACA C-Bus Controller",
+	},
+	{
+	    USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_5800PC,
+	    "5800PC C-Bus Wireless",
+	},
+	{
 	    USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_5500PCU,
 	    "5500PCU C-Bus",
 	},
 	{
+	    USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_5000CT2,
+	    "5000CT2 C-Bus Touch Screen",
+	},
+	{
+	    USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_C5000CT2,
+	    "C5000CT2 C-Bus Touch Screen",
+	},
+	{
+	    USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_L51xx,
+	    "L51xx C-Bus Dimmer",
+	},
+	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC,
 	    "iPAQ PocketPC",
 	},
@@ -2086,6 +2110,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "J-6502 speakers",
 	},
 	{
+	    USB_VENDOR_DATAAPEX, USB_PRODUCT_DATAAPEX_MULTICOM,
+	    "MultiCom",
+	},
+	{
 	    USB_VENDOR_DAVICOM, USB_PRODUCT_DAVICOM_WK668,
 	    "HenTong WK-668",
 	},
@@ -2130,6 +2158,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "EU870D HSDPA",
 	},
 	{
+	    USB_VENDOR_DELL, USB_PRODUCT_DELL_DW700,
+	    "DW700 GPS",
+	},
+	{
 	    USB_VENDOR_DELL2, USB_PRODUCT_DELL2_UPS,
 	    "UPS",
 	},
@@ -2186,6 +2218,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "AccelePort 8",
 	},
 	{
+	    USB_VENDOR_DIGIANSWER, USB_PRODUCT_DIGIANSWER_ZIGBEE802154,
+	    "ZigBee",
+	},
+	{
 	    USB_VENDOR_DIGITALSTREAM, USB_PRODUCT_DIGITALSTREAM_PS2,
 	    "PS/2 Active",
 	},
@@ -2506,6 +2542,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "ANT2USB",
 	},
 	{
+	    USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD2,
+	    "ANT dev board",
+	},
+	{
 	    USB_VENDOR_EASYDISK, USB_PRODUCT_EASYDISK_EASYDISK,
 	    "Flash Disk",
 	},
@@ -2630,6 +2670,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Microlink USB2Ethernet",
 	},
 	{
+	    USB_VENDOR_ELV, USB_PRODUCT_ELV_USBI2C,
+	    "USB-I2C",
+	},
+	{
 	    USB_VENDOR_EMPIA, USB_PRODUCT_EMPIA_EEEPC701_VIDEO,
 	    "EeePC701 camera",
 	},
@@ -2818,6 +2862,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "RTL8192CU",
 	},
 	{
+	    USB_VENDOR_FESTO, USB_PRODUCT_FESTO_CPX_USB,
+	    "CPX-USB",
+	},
+	{
+	    USB_VENDOR_FESTO, USB_PRODUCT_FESTO_CMSP,
+	    "CMSP",
+	},
+	{
 	    USB_VENDOR_FIBERLINE, USB_PRODUCT_FIBERLINE_WL430U,
 	    "WL-430U",
 	},
@@ -2826,6 +2878,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "Wrist PDA",
 	},
 	{
+	    USB_VENDOR_FOXCONN, USB_PRODUCT_FOXCONN_TCOM_TC_300,
+	    "T-Com TC 300",
+	},
+	{
+	    USB_VENDOR_FOXCONN, USB_PRODUCT_FOXCONN_PIRELLI_DP_L10,
+	    "Pirelli DP-L10",
+	},
+	{
 	    USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
 	    "Connector for DVD drive",
 	},
@@ -4662,6 +4722,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "MP-PRX1",
 	},
 	{
+	    USB_VENDOR_KAMSTRUP, USB_PRODUCT_KAMSTRUP_OPTICALEYE,
+	    "Optical Eye/3-wire",
+	},
+	{
+	    USB_VENDOR_KAMSTRUP, USB_PRODUCT_KAMSTRUP_MBUS_250D,
+	    "M-Bus Master MultiPort 250D",
+	},
+	{
 	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
 	    "10BT Ethernet",
 	},
@@ -4918,6 +4986,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "PowerSure PSA UPS",
 	},
 	{
+	    USB_VENDOR_LINKINSTRUMENTS, USB_PRODUCT_LINKINSTRUMENTS_MSO19,
+	    "Link Instruments MSO-19",
+	},
+	{
+	    USB_VENDOR_LINKINSTRUMENTS, USB_PRODUCT_LINKINSTRUMENTS_MSO28,
+	    "Link Instruments MSO-28",
+	},
+	{
+	    USB_VENDOR_LINKINSTRUMENTS, USB_PRODUCT_LINKINSTRUMENTS_MSO28_2,
+	    "Link Instruments MSO-28",
+	},
+	{
 	    USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_USB1000,
 	    "USB1000",
 	},
@@ -6314,6 +6394,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "MDS ISDB-T tuner",
 	},
 	{
+	    USB_VENDOR_MEI, USB_PRODUCT_MEI_CASHFLOW_SC,
+	    "Cashflow-SC",
+	},
+	{
+	    USB_VENDOR_MEI, USB_PRODUCT_MEI_S2000,
+	    "Series 2000",
+	},
+	{
 	    USB_VENDOR_MEINBERG, USB_PRODUCT_MEINBERG_USB5131,
 	    "USB 5131 DCF77 - Radio Clock",
 	},
@@ -7278,6 +7366,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT3072",
 	},
 	{
+	    USB_VENDOR_OWEN, USB_PRODUCT_OWEN_AC4,
+	    "AC4 USB-RS485",
+	},
+	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
 	    "USB Serial Adaptor",
 	},
@@ -7562,6 +7654,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "DSS 150 Digital Speaker System",
 	},
 	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_ACE1001,
+	    "AKTAKOM ACE-1001",
+	},
+	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_CPWUA054,
 	    "CPWUA054",
 	},
@@ -8150,6 +8246,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RTL8192SU",
 	},
 	{
+	    USB_VENDOR_RENESAS, USB_PRODUCT_RENESAS_RX610,
+	    "RX610 RX-Stick",
+	},
+	{
 	    USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY,
 	    "Blackberry",
 	},
@@ -8882,6 +8982,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "Psion Dacom Gold Port Ethernet",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_VSTABI,
+	    "VStabi Controller",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARKHAM_DS101_M,
+	    "Arkham DS101 Monitor",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARKHAM_DS101_A,
+	    "Arkham DS101 Adapter",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_BSM7DUSB,
 	    "BSM7-D-USB",
 	},
@@ -8890,6 +9002,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "Pololu Serial",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SB_PARAMOUNT_ME,
+	    "Software Bisque Paramount ME",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CYGNAL_DEBUG,
+	    "Cygnal Debug Adapter",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_EDG1228,
 	    "EDG1228",
 	},
@@ -8898,10 +9018,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "Argussoft ISP",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_IMS_USB_RS422,
+	    "IMS USB-RS422",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CRUMB128,
 	    "Crumb128",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_OPTRIS_MSPRO,
+	    "Optris MSpro LT Thermometer",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DEGREECONT,
 	    "Degree Controls",
 	},
@@ -8914,14 +9042,22 @@ const struct usb_known_product usb_known_products[] = {
 	    "Track Systems Traqmate",
 	},
 	{
-	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SUNNTO,
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SUUNTO,
 	    "Suunto sports",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARYGON_MIFARE,
+	    "Arygon Mifare RFID reader",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DESKTOPMOBILE,
 	    "Burnside Desktop mobile",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_TAMSMASTER,
+	    "Tams Master Easy Control",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_RIGBLASTER,
 	    "RIGblaster P&P",
 	},
@@ -8930,10 +9066,42 @@ const struct usb_known_product usb_known_products[] = {
 	    "RIGtalk",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_B_G_H3000,
+	    "B&G H3000 Data Cable",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_IPLINK1220,
 	    "IP-Link 1220",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_HAMLINKUSB,
+	    "Timewave HamLinkUSB",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_AVIT_USB_TTL,
+	    "AVIT Research USB-TTL",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_MJS_TOSLINK,
+	    "MJS USB-TOSLINK",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_WAVIT,
+	    "ThinkOptics WavIt",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_MULTIPLEX_RC,
+	    "Multiplex RC adapter",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_MSD_DASHHAWK,
+	    "MSD DashHawk",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_INSYS_MODEM,
+	    "INSYS Modem",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_JTAG,
 	    "Lipowsky Baby-JTAG",
 	},
@@ -8946,14 +9114,82 @@ const struct usb_known_product usb_known_products[] = {
 	    "Aerocomm Radio",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ZEPHYR_BIO,
+	    "Zephyr Bioharness",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_EMS_C1007,
+	    "EMS C1007 HF RFID reader",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_HARP,
 	    "Lipowsky HARP-1",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_C2_EDGE_MODEM,
+	    "Commander 2 EDGE(GSM) Modem",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CYGNAL_GPS,
+	    "Cygnal Fasttrax GPS",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_TELEGESIS_ETRX2,
+	    "Telegesis ETRX2USB",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_PROCYON_AVS,
+	    "Procyon AVS",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_MC35PU,
 	    "MC35pu",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CYGNAL,
+	    "Cygnal",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_AMBER_AMB2560,
+	    "Amber Wireless AMB2560",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DEKTEK_DTAPLUS,
+	    "DekTec DTA Plus VHF/UHF Booster",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_KYOCERA_GPS,
+	    "Kyocera GPS",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_IRZ_SG10,
+	    "IRZ SG-10 GSM/GPRS Modem",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_BEI_VCP,
+	    "BEI USB Sensor (VCP)",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_BALLUFF_RFID,
+	    "Balluff RFID reader",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_AC_SERV_IBUS,
+	    "AC-Services IBUS",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_AC_SERV_CIS,
+	    "AC-Services CIS-IBUS",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_AC_SERV_CAN,
+	    "AC-Services CAN",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_AC_SERV_OBD,
+	    "AC-Services OBD",
+	},
+	{
 	    USB_VENDOR_SILABS2, USB_PRODUCT_SILABS2_DCU11CLONE,
 	    "DCU-11 clone",
 	},
@@ -8970,6 +9206,22 @@ const struct usb_known_product usb_known_products[] = {
 	    "GPRS Modem",
 	},
 	{
+	    USB_VENDOR_SILABS4, USB_PRODUCT_SILABS4_100EU_MODEM,
+	    "GPRS Modem 100EU",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_3,
+	    "CP210x Serial",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_INFINITY_MIC,
+	    "Infinity GPS-MIC-1",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_4,
+	    "CP210x Serial",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_USBSCOPE50,
 	    "USBscope50",
 	},
@@ -9502,6 +9754,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Serial",
 	},
 	{
+	    USB_VENDOR_SYNTECH, USB_PRODUCT_SYNTECH_CIPHERLAB100,
+	    "CipherLab Barcode Scanner",
+	},
+	{
 	    USB_VENDOR_TCTMOBILE, USB_PRODUCT_TCTMOBILE_UMSM,
 	    "Modem mode",
 	},
@@ -10106,6 +10362,30 @@ const struct usb_known_product usb_known_products[] = {
 	    "Intuos A5",
 	},
 	{
+	    USB_VENDOR_WAGO, USB_PRODUCT_WAGO_SERVICECABLE,
+	    "Service Cable 750-923",
+	},
+	{
+	    USB_VENDOR_WAVESENSE, USB_PRODUCT_WAVESENSE_JAZZ,
+	    "Jazz blood glucose meter",
+	},
+	{
+	    USB_VENDOR_WIENERPLEINBAUS, USB_PRODUCT_WIENERPLEINBAUS_PL512,
+	    "PL512 PSU",
+	},
+	{
+	    USB_VENDOR_WIENERPLEINBAUS, USB_PRODUCT_WIENERPLEINBAUS_RCM,
+	    "RCM Remote Control",
+	},
+	{
+	    USB_VENDOR_WIENERPLEINBAUS, USB_PRODUCT_WIENERPLEINBAUS_MPOD,
+	    "MPOD PSU",
+	},
+	{
+	    USB_VENDOR_WIENERPLEINBAUS, USB_PRODUCT_WIENERPLEINBAUS_CML,
+	    "CML Data Logger",
+	},
+	{
 	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_WNC0600,
 	    "WNC-0600USB",
 	},
@@ -10530,6 +10810,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Diamond (Supra)",
 	},
 	{
+	    USB_VENDOR_RENESAS,
+	    "Renesas",
+	},
+	{
 	    USB_VENDOR_MICROSOFT,
 	    "Microsoft",
 	},
@@ -10598,6 +10882,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "STMicroelectronics",
 	},
 	{
+	    USB_VENDOR_FOXCONN,
+	    "Foxconn",
+	},
+	{
 	    USB_VENDOR_YAMAHA,
 	    "YAMAHA",
 	},
@@ -11558,6 +11846,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "M-Systems",
 	},
 	{
+	    USB_VENDOR_DIGIANSWER,
+	    "Digianswer",
+	},
+	{
 	    USB_VENDOR_AUTHENTEC,
 	    "AuthenTec",
 	},
@@ -11814,6 +12106,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Realtek",
 	},
 	{
+	    USB_VENDOR_MEI,
+	    "MEI",
+	},
+	{
 	    USB_VENDOR_ADDONICS2,
 	    "Addonics Technology",
 	},
@@ -12070,6 +12366,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Silicon Labs",
 	},
 	{
+	    USB_VENDOR_SILABS4,
+	    "Silicon Labs",
+	},
+	{
 	    USB_VENDOR_VELLEMAN,
 	    "Velleman",
 	},
@@ -12262,6 +12562,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "U-blox",
 	},
 	{
+	    USB_VENDOR_OWEN,
+	    "Owen",
+	},
+	{
 	    USB_VENDOR_OQO,
 	    "OQO",
 	},
@@ -12346,6 +12650,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "CMOTECH",
 	},
 	{
+	    USB_VENDOR_WIENERPLEINBAUS,
+	    "WIENER Plein & Baus",
+	},
+	{
 	    USB_VENDOR_AXESSTEL,
 	    "Axesstel",
 	},
@@ -12374,10 +12682,18 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Mecanique",
 	},
 	{
+	    USB_VENDOR_KAMSTRUP,
+	    "Kamstrup A/S",
+	},
+	{
 	    USB_VENDOR_DISPLAYLINK,
 	    "DisplayLink",
 	},
 	{
+	    USB_VENDOR_WAVESENSE,
+	    "WaveSense",
+	},
+	{
 	    USB_VENDOR_VAISALA,
 	    "VAISALA",
 	},
@@ -12390,6 +12706,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Qcom",
 	},
 	{
+	    USB_VENDOR_ELV,
+	    "ELV",
+	},
+	{
 	    USB_VENDOR_LINKSYS3,
 	    "Linksys",
 	},
@@ -12454,6 +12774,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Alti-2",
 	},
 	{
+	    USB_VENDOR_WAGO,
+	    "WAGO Kontakttechnik",
+	},
+	{
 	    USB_VENDOR_LONGCHEER,
 	    "Longcheer Technology",
 	},
@@ -12474,6 +12798,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "MetaGeek",
 	},
 	{
+	    USB_VENDOR_FESTO,
+	    "Festo",
+	},
+	{
 	    USB_VENDOR_MODACOM,
 	    "Modacom",
 	},
@@ -12534,6 +12862,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Planex Communications",
 	},
 	{
+	    USB_VENDOR_LINKINSTRUMENTS,
+	    "Link Instruments",
+	},
+	{
 	    USB_VENDOR_AEI,
 	    "AEI",
 	},
@@ -12658,6 +12990,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "CACE Technologies",
 	},
 	{
+	    USB_VENDOR_DATAAPEX,
+	    "DataApex",
+	},
+	{
 	    USB_VENDOR_EVOLUTION,
 	    "Evolution Robotics",
 	},