regen

2 files changed, 1767 insertions, 15 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index eb2d29e1e58..0ad0706ab0a 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.483 2010/02/23 16:51:56 sobrado Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.484 2010/02/23 23:29:54 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.473 2010/02/23 16:49:52 sobrado Exp 
+ *	OpenBSD: usbdevs,v 1.474 2010/02/23 23:29:21 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -411,9 +411,12 @@
 #define	USB_VENDOR_AGATE	0x0c08		/* Agate Technologies */
 #define	USB_VENDOR_DMI	0x0c0b		/* DMI */
 #define	USB_VENDOR_ICOM	0x0c26		/* Icom */
+#define	USB_VENDOR_GNOTOMETRICS	0x0c33		/* GN Otometrics */
 #define	USB_VENDOR_MICRODIA	0x0c45		/* Microdia */
 #define	USB_VENDOR_SEALEVEL	0x0c52		/* Sealevel System */
+#define	USB_VENDOR_JETI	0x0c6c		/* JETI */
 #define	USB_VENDOR_EASYDISK	0x0c76		/* EasyDisk */
+#define	USB_VENDOR_ELEKTOR	0x0c7d		/* Elektor Electronics */
 #define	USB_VENDOR_KYOCERA2	0x0c88		/* Kyocera */
 #define	USB_VENDOR_TERRATEC	0x0ccd		/* TerraTec Electronic GmbH */
 #define	USB_VENDOR_ZCOM	0x0cde		/* Z-Com */
@@ -427,6 +430,7 @@
 #define	USB_VENDOR_CONCEPTRONIC	0x0d8e		/* Conceptronic */
 #define	USB_VENDOR_MSI	0x0db0		/* Micro Star International */
 #define	USB_VENDOR_ELCON	0x0db7		/* ELCON Systemtechnik */
+#define	USB_VENDOR_UNKNOWN5	0x0dcd		/* Unknown Vendor */
 #define	USB_VENDOR_SITECOMEU	0x0df6		/* Sitecom Europe */
 #define	USB_VENDOR_MOBILEACTION	0x0df7		/* Mobile Action */
 #define	USB_VENDOR_AMIGO	0x0e0b		/* Amigo Technology */
@@ -442,6 +446,7 @@
 #define	USB_VENDOR_ITEGNO	0x0eba		/* iTegno */
 #define	USB_VENDOR_NORITAKE	0x0eda		/* Noritake itron Corp */
 #define	USB_VENDOR_AIRPRIME	0x0f3d		/* Airprime */
+#define	USB_VENDOR_LARSENBRUSGAARD	0x0fd8		/* Larsen and Brusgaard */
 #define	USB_VENDOR_UNKNOWN4	0x0fe6		/* Unknown Vendor */
 #define	USB_VENDOR_VTECH	0x0f88		/* VTech */
 #define	USB_VENDOR_FALCOM	0x0f94		/* Falcom Wireless Communications */
@@ -542,10 +547,15 @@
 #define	USB_VENDOR_ZTE	0x19d2		/* ZTE Inc. */
 #define	USB_VENDOR_QUANTA	0x1a32		/* Quanta */
 #define	USB_VENDOR_TERMINUS	0x1a40		/* Terminus Technology */
+#define	USB_VENDOR_BAYER	0x1a79		/* Bayer Health Care */
 #define	USB_VENDOR_WCH2	0x1a86		/* QinHeng Electronics */
+#define	USB_VENDOR_MATRIXORB	0x1b3d		/* Matrix Orbital */
+#define	USB_VENDOR_TML	0x1b91		/* The Mobility Lab */
 #define	USB_VENDOR_TCTMOBILE	0x1bbb		/* TCT Mobile */
 #define	USB_VENDOR_MDS	0x1bc8		/* MDS */
+#define	USB_VENDOR_ALTI2	0x1bc9		/* Alti-2 */
 #define	USB_VENDOR_LONGCHEER	0x1c9e		/* Longcheer Technology */
+#define	USB_VENDOR_DRESDENELEC	0x1cf1		/* Dresden Elektronic */
 #define	USB_VENDOR_PEGATRON	0x1d4d		/* Pegatron */
 #define	USB_VENDOR_MODACOM	0x1eb8		/* Modacom */
 #define	USB_VENDOR_AIRTIES	0x1eda		/* AirTies */
@@ -583,6 +593,7 @@
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
 #define	USB_VENDOR_SITECOM2	0x9016		/* Sitecom */
 #define	USB_VENDOR_MOSCHIP	0x9710		/* MosChip */
+#define	USB_VENDOR_MARVELL	0x9e88		/* Marvell */
 #define	USB_VENDOR_3COM3	0xa727		/* 3Com */
 #define	USB_VENDOR_CACE	0xcace		/* CACE Technologies */
 #define	USB_VENDOR_EVOLUTION	0xdeee		/* Evolution Robotics */
@@ -780,6 +791,9 @@
 #define	USB_PRODUCT_ALTEC_ADA70	0x0070		/* ADA70 Speakers */
 #define	USB_PRODUCT_ALTEC_ASC495	0xff05		/* ASC495 Speakers */
 
+/* Alti-2 products */
+#define	USB_PRODUCT_ALTI2_NEPTUNE3	0x6001		/* Neptune 3 */
+
 /* Ambit Microsystems products */
 #define	USB_PRODUCT_AMBIT_WLAN	0x0302		/* WLAN */
 #define	USB_PRODUCT_AMBIT_NTL_250	0x6098		/* NTL 250 cable modem */
@@ -808,6 +822,8 @@
 #define	USB_PRODUCT_ANALOG_EAGLEIIC_NF	0x9024		/* Eagle IIC */
 #define	USB_PRODUCT_ANALOG_EAGLEIII	0x9031		/* Eagle III */
 #define	USB_PRODUCT_ANALOG_EAGLEIII_NF	0x9032		/* Eagle III */
+#define	USB_PRODUCT_ANALOGDEVICES_GNICE	0xf000		/* gnICE */
+#define	USB_PRODUCT_ANALOGDEVICES_GNICEPLUS	0xf001		/* gnICE+ */
 
 /* Anchor products */
 #define	USB_PRODUCT_ANCHOR_SERIAL	0x2008		/* Serial */
@@ -902,6 +918,7 @@
 #define	USB_PRODUCT_ATI2_205	0xa001		/* USB Cable 205 */
 
 /* Atmel Comp. products */
+#define	USB_PRODUCT_ATMEL_STK541	0x2109		/* STK541 Zigbee */
 #define	USB_PRODUCT_ATMEL_UHB124	0x3301		/* UHB124 hub */
 #define	USB_PRODUCT_ATMEL_WN210	0x3301		/* W-Buddie WN210 */
 #define	USB_PRODUCT_ATMEL_DWL900AP	0x5601		/* DWL-900AP Wireless access point */
@@ -939,6 +956,9 @@
 #define	USB_PRODUCT_AZUREWAVE_RT3070_2	0x3284		/* RT3070 */
 #define	USB_PRODUCT_AZUREWAVE_RT3070_3	0x3305		/* RT3070 */
 
+/* Bayer Health Care products */
+#define	USB_PRODUCT_BAYER_CONTOUR	0x6001		/* Ascensia Contour */
+
 /* B&B Electronics products */
 #define	USB_PRODUCT_BBELECTR_USOTL4	0xac01		/* USOTL4 RS-422/485 */
 #define	USB_PRODUCT_BBELECTR_USTL4	0xac02		/* USTL4 RS-422/485 */
@@ -952,6 +972,11 @@
 #define	USB_PRODUCT_BBELECTR_485USB9F2W	0xac25		/* 485USB9F-2W RS-422/485 */
 #define	USB_PRODUCT_BBELECTR_485USB9F4W	0xac26		/* 485USB9F-4W RS-422/485 */
 #define	USB_PRODUCT_BBELECTR_232USB9M	0xac27		/* 232USB9M RS-232 */
+#define	USB_PRODUCT_BBELECTR_485USBTB_2W	0xac33		/* 485USBTB-2W RS-422/485 */
+#define	USB_PRODUCT_BBELECTR_485USBTB_4W	0xac34		/* 485USBTB-4W RS-422/485 */
+#define	USB_PRODUCT_BBELECTR_TTL5USB9M	0xac49		/* TTL5USB9M */
+#define	USB_PRODUCT_BBELECTR_TTL3USB9M	0xac50		/* TTL3USB9M */
+#define	USB_PRODUCT_BBELECTR_ZZ_PROG1	0xba02		/* ZZ Programmer */
 
 /* Baltech products */
 #define	USB_PRODUCT_BALTECH_CARDREADER	0x9999		/* Card reader */
@@ -1297,6 +1322,10 @@
 #define	USB_PRODUCT_DRAYTEK_VIGOR550	0x0550		/* Vigor550 */
 #define	USB_PRODUCT_DRAYTEK_VIGOR600	0x0600		/* Vigor600 */
 
+/* Dresden Elektronic products */
+#define	USB_PRODUCT_DRESDENELEC_STB	0x0001		/* Sensor Terminal */
+#define	USB_PRODUCT_DRESDENELEC_WHT	0x0004		/* Wireless Terminal */
+
 /* Dynastream Innovations */
 #define	USB_PRODUCT_DYNASTREAM_ANTDEVBOARD	0x1003		/* ANT dev board */
 #define	USB_PRODUCT_DYNASTREAM_ANT2USB	0x1004		/* ANT2USB */
@@ -1337,6 +1366,9 @@
 #define	USB_PRODUCT_ELECOM_UCSGT0	0x5004		/* UC-SGT0 Serial */
 #define	USB_PRODUCT_ELECOM_LDUSBTX3	0xabc1		/* LD-USB/TX */
 
+/* Elektor Electronics products */
+#define	USB_PRODUCT_ELEKTOR_FT323R	0x0005		/* FT323R */
+
 /* Elsa products */
 #define	USB_PRODUCT_ELSA_MODEM1	0x2265		/* ELSA */
 #define	USB_PRODUCT_ELSA_USB2ETHERNET	0x3000		/* Microlink USB2Ethernet */
@@ -1422,9 +1454,20 @@
 #define	USB_PRODUCT_FTDI_FT232_5	0x6008		/* Serial */
 #define	USB_PRODUCT_FTDI_FT232_6	0x6009		/* Serial */
 #define	USB_PRODUCT_FTDI_SERIAL_2232C	0x6010		/* 2232C Serial */
+#define	USB_PRODUCT_FTDI_FT4232H	0x6011		/* FT4232H */
 #define	USB_PRODUCT_FTDI_PS2KBDMS	0x8371		/* PS/2 Keyboard/Mouse */
 #define	USB_PRODUCT_FTDI_SERIAL_8U100AX	0x8372		/* Serial */
 #define	USB_PRODUCT_FTDI_OPENRD	0x9e90		/* OpenRD JTAGKey */
+#define	USB_PRODUCT_FTDI_CANDAPTER	0x9f80		/* CANdapter */
+#define	USB_PRODUCT_FTDI_NXTCAM	0xabb8		/* Mindstorms NXTCam */
+#define	USB_PRODUCT_FTDI_OOCDLINK	0xbaf8		/* OOCDlink */
+#define	USB_PRODUCT_FTDI_LM3S_DEVEL	0xbcd8		/* LM3S Devel */
+#define	USB_PRODUCT_FTDI_LM3S_EVAL	0xbcd9		/* LM3S Eval */
+#define	USB_PRODUCT_FTDI_TURTELIZER_JTAG	0xbdc8		/* JTAG/RS-232 */
+#define	USB_PRODUCT_FTDI_OPENDCC	0xbfd8		/* OpenDCC */
+#define	USB_PRODUCT_FTDI_OPENDCC_SNIFFER	0xbfd9		/* OpenDCC Sniffer */
+#define	USB_PRODUCT_FTDI_OPENDCC_THROTTLE	0xbfda		/* OpenDCC Throttle */
+#define	USB_PRODUCT_FTDI_OPENDCC_GATEWAY	0xbfdb		/* OpenDCC Gateway */
 #define	USB_PRODUCT_FTDI_LOCOBUFFER	0xc7d0		/* RR-CirKits LocoBuffer */
 #define	USB_PRODUCT_FTDI_DMX4ALL	0xc850		/* DMX4ALL DMX interface */
 #define	USB_PRODUCT_FTDI_ASK_RDR4X7_1	0xc990		/* ASK RDR 4X7 */
@@ -1441,7 +1484,16 @@
 #define	USB_PRODUCT_FTDI_OPENPORT_13S	0xcc49		/* OpenPort 1.3 Subaru */
 #define	USB_PRODUCT_FTDI_OPENPORT_13U	0xcc4a		/* OpenPort 1.3 Universal */
 #define	USB_PRODUCT_FTDI_SERIAL_2232L	0xcff8		/* 2232L Serial */
+#define	USB_PRODUCT_FTDI_SCS_0	0xd010		/* Radio Modem */
+#define	USB_PRODUCT_FTDI_SCS_1	0xd011		/* Radio Modem */
+#define	USB_PRODUCT_FTDI_SCS_2	0xd012		/* Radio Modem */
+#define	USB_PRODUCT_FTDI_SCS_3	0xd013		/* Radio Modem */
+#define	USB_PRODUCT_FTDI_SCS_4	0xd014		/* Radio Modem */
+#define	USB_PRODUCT_FTDI_SCS_5	0xd015		/* Radio Modem */
+#define	USB_PRODUCT_FTDI_SCS_6	0xd016		/* Radio Modem */
+#define	USB_PRODUCT_FTDI_SCS_7	0xd017		/* Radio Modem */
 #define	USB_PRODUCT_FTDI_IPLUS	0xd070		/* iPlus */
+#define	USB_PRODUCT_FTDI_IPLUS2	0xd071		/* iPlus */
 #define	USB_PRODUCT_FTDI_XSENS_1	0xd388		/* Serial */
 #define	USB_PRODUCT_FTDI_XSENS_2	0xd389		/* Serial */
 #define	USB_PRODUCT_FTDI_XSENS_3	0xd38a		/* Serial */
@@ -1451,27 +1503,45 @@
 #define	USB_PRODUCT_FTDI_XSENS_7	0xd38e		/* Serial */
 #define	USB_PRODUCT_FTDI_XSENS_8	0xd38f		/* Serial */
 #define	USB_PRODUCT_FTDI_GAMMASCOUT	0xd678		/* Gamma Scout Online */
+#define	USB_PRODUCT_FTDI_JTAGCABLEII	0xd738		/* Propox JTAG */
 #define	USB_PRODUCT_FTDI_WESTREX_777	0xdc00		/* Westrex 777 */
 #define	USB_PRODUCT_FTDI_WESTREX_8900F	0xdc01		/* Westrex 8900F */
 #define	USB_PRODUCT_FTDI_ACG_HFDUAL	0xdd20		/* HF Dual ISO Reader */
 #define	USB_PRODUCT_FTDI_ARTEMIS	0xdf28		/* CCD camera */
 #define	USB_PRODUCT_FTDI_ATK16	0xdf30		/* ATK-16 Camera */
-#define	USB_PRODUCT_FTDI_ATK16C	0xdf30		/* ATK-16C Camera */
-#define	USB_PRODUCT_FTDI_ATK16HR	0xdf30		/* ATK-16HR Camera */
-#define	USB_PRODUCT_FTDI_ATK16HRC	0xdf30		/* ATK-16HRC Camera */
+#define	USB_PRODUCT_FTDI_ATK16HR	0xdf31		/* ATK-16HR Camera */
+#define	USB_PRODUCT_FTDI_ATK16C	0xdf32		/* ATK-16C Camera */
+#define	USB_PRODUCT_FTDI_ATK16HRC	0xdf33		/* ATK-16HRC Camera */
+#define	USB_PRODUCT_FTDI_ATK16IC	0xdf35		/* ATK-16IC Camera */
 #define	USB_PRODUCT_FTDI_YEI_SC31	0xe050		/* ServoCenter3.1 */
+#define	USB_PRODUCT_FTDI_ELV_USR	0xe000		/* USR */
+#define	USB_PRODUCT_FTDI_ELV_MSM1	0xe001		/* Mini-Sound-Modul */
+#define	USB_PRODUCT_FTDI_ELV_KL100	0xe002		/* KL 100 */
+#define	USB_PRODUCT_FTDI_ELV_WS550	0xe004		/* WS 550 */
+#define	USB_PRODUCT_FTDI_ELV_WS888	0xe008		/* WS 888 */
+#define	USB_PRODUCT_FTDI_ELV_TWS550	0xe009		/* WS 550 */
+#define	USB_PRODUCT_FTDI_ELV_FEM	0xe00a		/* Funk Energie Monitor */
 #define	USB_PRODUCT_FTDI_ELV_FHZ1300PC	0xe0e8		/* FHZ 1300 PC */
 #define	USB_PRODUCT_FTDI_ELV_WS500	0xe0e9		/* WS 500 */
+#define	USB_PRODUCT_FTDI_ELV_HS485	0xe0ea		/* RS-485 */
+#define	USB_PRODUCT_FTDI_ELV_UMS100	0xe0eb		/* UMS 100 */
+#define	USB_PRODUCT_FTDI_ELV_TFD128	0xe0ec		/* TFD 128 */
+#define	USB_PRODUCT_FTDI_ELV_FM3RX	0xe0ed		/* FM3 RX */
+#define	USB_PRODUCT_FTDI_ELV_WS777	0xe0ee		/* WS 777 */
 #define	USB_PRODUCT_FTDI_ELV_EM1010PC	0xe0ef		/* EM 1010 PC */
 #define	USB_PRODUCT_FTDI_ELV_CSI8	0xe0f0		/* CSI 8 */
 #define	USB_PRODUCT_FTDI_ELV_EM1000DL	0xe0f1		/* EM 1000 DL */
 #define	USB_PRODUCT_FTDI_ELV_PCK100	0xe0f2		/* PCK 100 */
 #define	USB_PRODUCT_FTDI_ELV_RFP500	0xe0f3		/* RFP 500 */
 #define	USB_PRODUCT_FTDI_ELV_FS20SIG	0xe0f4		/* FS 20 SIG */
+#define	USB_PRODUCT_FTDI_ELV_UTP8	0xe0f5		/* UTP 8 */
 #define	USB_PRODUCT_FTDI_ELV_WS300PC	0xe0f6		/* WS 300 PC */
+#define	USB_PRODUCT_FTDI_ELV_WS444PC	0xe0f7		/* WS 444 PC */
+#define	USB_PRODUCT_FTDI_FISCO	0xe40b		/* Serial */
 #define	USB_PRODUCT_FTDI_ECO_PRO	0xe520		/* EVER Eco Pro UPS */
 #define	USB_PRODUCT_FTDI_ACTROBOTS	0xe548		/* Active Robots comms */
 #define	USB_PRODUCT_FTDI_PYRAMID	0xe6c8		/* Pyramid Display */
+#define	USB_PRODUCT_FTDI_UNICOM	0xe700		/* Unicom III */
 #define	USB_PRODUCT_FTDI_GUDE_1	0xe808		/* Serial */
 #define	USB_PRODUCT_FTDI_GUDE_2	0xe809		/* Serial */
 #define	USB_PRODUCT_FTDI_GUDE_3	0xe80a		/* Serial */
@@ -1492,6 +1562,9 @@
 #define	USB_PRODUCT_FTDI_TNCX	0xebe0		/* TNC-X packet-radio */
 #define	USB_PRODUCT_FTDI_TERATRONIK_VCP	0xec88		/* VCP */
 #define	USB_PRODUCT_FTDI_TERATRONIK_D2XX	0xec89		/* D2XX */
+#define	USB_PRODUCT_FTDI_REU_TINY	0xed22		/* RigExpert Tiny */
+#define	USB_PRODUCT_FTDI_HO870	0xed71		/* HO870 */
+#define	USB_PRODUCT_FTDI_HO820	0xed74		/* HO820 */
 #define	USB_PRODUCT_FTDI_SERIAL_232BM	0xee18		/* FT232BM Serial */
 #define	USB_PRODUCT_FTDI_MHAM_KW	0xeee8		/* KW */
 #define	USB_PRODUCT_FTDI_MHAM_YS	0xeee9		/* YS */
@@ -1501,6 +1574,8 @@
 #define	USB_PRODUCT_FTDI_MHAM_DB9	0xeeed		/* DB9 */
 #define	USB_PRODUCT_FTDI_MHAM_RS232	0xeeee		/* RS232 */
 #define	USB_PRODUCT_FTDI_MHAM_Y9	0xeeef		/* Y9 */
+#define	USB_PRODUCT_FTDI_DGQG	0xef50		/* DGQG */
+#define	USB_PRODUCT_FTDI_DUSB	0xef51		/* DUSB */
 #define	USB_PRODUCT_FTDI_ELV_UAD8	0xf068		/* UAD 8 */
 #define	USB_PRODUCT_FTDI_ELV_UAD7	0xf069		/* UAD 7 */
 #define	USB_PRODUCT_FTDI_ELV_USI2	0xf06a		/* USI 2 */
@@ -1510,6 +1585,8 @@
 #define	USB_PRODUCT_FTDI_ELV_ALC8500	0xf06e		/* ALC 8500 Expert */
 #define	USB_PRODUCT_FTDI_ELV_FHZ1000PC	0xf06f		/* FHZ 1000 PC */
 #define	USB_PRODUCT_FTDI_PERLE_UP	0xf0c0		/* UltraPort */
+#define	USB_PRODUCT_FTDI_SPROG_II	0xf0c8		/* Sprog II */
+#define	USB_PRODUCT_FTDI_PIEGROUP_IR	0xf208		/* Infrared */
 #define	USB_PRODUCT_FTDI_ACTZWAVE	0xf2d0		/* HomePro ZWave */
 #define	USB_PRODUCT_FTDI_GALAXY_1	0xf3c0		/* Serial */
 #define	USB_PRODUCT_FTDI_GALAXY_2	0xf3c1		/* Serial */
@@ -1518,18 +1595,25 @@
 #define	USB_PRODUCT_FTDI_LINX_1	0xf44a		/* Serial */
 #define	USB_PRODUCT_FTDI_LINX_2	0xf44b		/* Serial */
 #define	USB_PRODUCT_FTDI_LINX_3	0xf44c		/* Serial */
+#define	USB_PRODUCT_FTDI_OCEANIC	0xf460		/* Oceanic instrument */
 #define	USB_PRODUCT_FTDI_SUUNTO	0xf680		/* Suunto Sports */
 #define	USB_PRODUCT_FTDI_USBUIRT	0xf850		/* USB-UIRT */
+#define	USB_PRODUCT_FTDI_USBX_707	0xf857		/* USBX-707 */
 #define	USB_PRODUCT_FTDI_CCS_ICDU20	0xf9d0		/* ICD-U20 */
 #define	USB_PRODUCT_FTDI_CCS_ICDU40	0xf9d1		/* ICD-U40 */
 #define	USB_PRODUCT_FTDI_CCS_MACHX	0xf9d2		/* MACH-X */
+#define	USB_PRODUCT_FTDI_CCS_LOAD_N_GO	0xf9d3		/* LOAD N GO */
+#define	USB_PRODUCT_FTDI_CCS_ICDU64	0xf9d4		/* ICDU64 */
+#define	USB_PRODUCT_FTDI_CCS_PRIME8	0xf9d5		/* PRIME8 */
 #define	USB_PRODUCT_FTDI_ITM_TOUCH	0xf9e9		/* ITM Touchscreen */
 #define	USB_PRODUCT_FTDI_USBSERIAL	0xfa00		/* Matrix Orbital USB Serial */
 #define	USB_PRODUCT_FTDI_LCD_MX200	0xfa01		/* Matrix Orbital MX200 Series LCD */
+#define	USB_PRODUCT_FTDI_LCD_MTXO	0xfa02		/* Matrix Orbital LCD */
 #define	USB_PRODUCT_FTDI_LCD_LK202_24	0xfa03		/* Matrix Orbital LK202-24 LCD */
 #define	USB_PRODUCT_FTDI_LCD_LK204_24	0xfa04		/* Matrix Orbital LK204-24 LCD */
-#define	USB_PRODUCT_FTDI_MATRIX_2	0xfa05		/* Serial */
-#define	USB_PRODUCT_FTDI_MATRIX_3	0xfa06		/* Serial */
+#define	USB_PRODUCT_FTDI_MATRIX_2	0xfa05		/* Matrix Orbital LCD */
+#define	USB_PRODUCT_FTDI_MATRIX_3	0xfa06		/* Matrix Orbital LCD */
+#define	USB_PRODUCT_FTDI_RELAIS	0xfa10		/* Relais */
 #define	USB_PRODUCT_FTDI_TIRA1	0xfa78		/* Tira-1 */
 #define	USB_PRODUCT_FTDI_PCDJ_DAC2	0xfa88		/* DAC-2 */
 #define	USB_PRODUCT_FTDI_ACCESSO	0xfad0		/* Accesso reader */
@@ -1542,6 +1626,9 @@
 #define	USB_PRODUCT_FTDI_ELV_TFM100	0xfb5d		/* TFM 100 */
 #define	USB_PRODUCT_FTDI_ELV_UDF77	0xfb5e		/* UDF 77 */
 #define	USB_PRODUCT_FTDI_ELV_UIO88	0xfb5f		/* UIO 88 */
+#define	USB_PRODUCT_FTDI_R2000KU_RNG	0xfb80		/* R2000KU RNG */
+#define	USB_PRODUCT_FTDI_BCS_SE923	0xfb99		/* BCS SE923 */
+#define	USB_PRODUCT_FTDI_FT232RL	0xfbfa		/* FT232RL */
 #define	USB_PRODUCT_FTDI_LCD_CFA_632	0xfc08		/* Crystalfontz CFA-632 LCD */
 #define	USB_PRODUCT_FTDI_LCD_CFA_634	0xfc09		/* Crystalfontz CFA-634 LCD */
 #define	USB_PRODUCT_FTDI_LCD_CFA_547	0xfc0a		/* Crystalfontz CFA-547 LCD */
@@ -1551,6 +1638,10 @@
 #define	USB_PRODUCT_FTDI_LCD_CFA_640	0xfc0e		/* Crystalfontz CFA-640 LCD */
 #define	USB_PRODUCT_FTDI_LCD_CFA_642	0xfc0f		/* Crystalfontz CFA-642 LCD */
 #define	USB_PRODUCT_FTDI_IRTRANS	0xfc60		/* Serial */
+#define	USB_PRODUCT_FTDI_PROTEGO_1	0xfc70		/* Protego */
+#define	USB_PRODUCT_FTDI_PROTEGO_R200	0xfc71		/* R200-USB TRNG */
+#define	USB_PRODUCT_FTDI_PROTEGO_3	0xfc72		/* Protego */
+#define	USB_PRODUCT_FTDI_PROTEGO_4	0xfc73		/* Protego */
 #define	USB_PRODUCT_FTDI_SEMC_DSS20	0xfc82		/* SEMC DSS-20 SyncStation */
 #define	USB_PRODUCT_FTDI_CANVIEW	0xfd60		/* CANview */
 #define	USB_PRODUCT_FTDI_VNHC	0xfe38		/* Modem */
@@ -1623,6 +1714,9 @@
 #define	USB_PRODUCT_GLOBESPAN_PRISM_GT_1	0x2000		/* PrismGT USB 2.0 WLAN */
 #define	USB_PRODUCT_GLOBESPAN_PRISM_GT_2	0x2002		/* PrismGT USB 2.0 WLAN */
 
+/* GN Otometrics products */
+#define	USB_PRODUCT_GNOTOMETRICS_AURICAL	0x0010		/* Aurical */
+
 /* GoHubs products */
 #define	USB_PRODUCT_GOHUBS_GOCOM232	0x1001		/* GoCOM232 Serial converter */
 
@@ -1817,6 +1911,7 @@
 /* InterBiometrics products */
 #define	USB_PRODUCT_INTERBIO_IOBOARD	0x1002		/* IO Board */
 #define	USB_PRODUCT_INTERBIO_MINIIOBOARD	0x1003		/* Mini IO Board */
+#define	USB_PRODUCT_INTERBIO_MINIIOBOARD2	0x1006		/* Mini IO Board */
 
 /* Intersil products */
 #define	USB_PRODUCT_INTERSIL_PRISM_GT	0x1000		/* PrismGT USB 2.0 WLAN */
@@ -1873,6 +1968,9 @@
 /* Jenoptik products */
 #define	USB_PRODUCT_JENOPTIK_JD350	0x5300		/* JD 350 */
 
+/* JETI Technische Instrumente GmbH products */
+#define	USB_PRODUCT_JETI_SPC1201	0x04b2		/* SPECBOS 1201 */
+
 /* JRC products */
 #define	USB_PRODUCT_JRC_AH_J3001V_J3002V	0x0001		/* AirH\"PHONE AH-J3001V/J3002V */
 
@@ -1961,6 +2059,9 @@
 #define	USB_PRODUCT_LACIE_HD	0xa601		/* Hard Disk */
 #define	USB_PRODUCT_LACIE_CDRW	0xa602		/* CD R/W */
 
+/* Larsen and Brusgaard products */
+#define	USB_PRODUCT_LARSENBRUSGAARD_ALTITRACK	0x0001		/* AltiTrack */
+
 /* Leadtek products */
 #define	USB_PRODUCT_LEADTEK_9531	0x2101		/* 9531 GPS */
 
@@ -2068,6 +2169,267 @@
 /* Macally products */
 #define	USB_PRODUCT_MACALLY_MOUSE1	0x0101		/* mouse */
 
+/* Marvell products */
+#define	USB_PRODUCT_MARVELL_SHEEVAPLUG	0x9e8f		/* SheevaPlug */
+
+/* Matrix Orbital products */
+#define	USB_PRODUCT_MATRIXORB_LCD_0100	0x0100		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0101	0x0101		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0102	0x0102		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0103	0x0103		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0104	0x0104		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0105	0x0105		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0106	0x0106		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0107	0x0107		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0108	0x0108		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0109	0x0109		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_010A	0x010a		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_010B	0x010b		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_010C	0x010c		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_010D	0x010d		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_010E	0x010e		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_010F	0x010f		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0110	0x0110		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0111	0x0111		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0112	0x0112		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0113	0x0113		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0114	0x0114		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0115	0x0115		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0116	0x0116		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0117	0x0117		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0118	0x0118		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0119	0x0119		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_011A	0x011a		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_011B	0x011b		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_011C	0x011c		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_011D	0x011d		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_011E	0x011e		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_011F	0x011f		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0120	0x0120		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0121	0x0121		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0122	0x0122		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0123	0x0123		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0124	0x0124		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0125	0x0125		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0126	0x0126		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0127	0x0127		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0128	0x0128		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0129	0x0129		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_012A	0x012a		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_012B	0x012b		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_012C	0x012c		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_012D	0x012d		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_012E	0x012e		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_012F	0x012f		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0130	0x0130		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0131	0x0131		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0132	0x0132		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0133	0x0133		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0134	0x0134		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0135	0x0135		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0136	0x0136		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0137	0x0137		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0138	0x0138		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0139	0x0139		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_013A	0x013a		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_013B	0x013b		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_013C	0x013c		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_013D	0x013d		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_013E	0x013e		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_013F	0x013f		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0140	0x0140		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0141	0x0141		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0142	0x0142		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0143	0x0143		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0144	0x0144		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0145	0x0145		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0146	0x0146		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0147	0x0147		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0148	0x0148		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0149	0x0149		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_014A	0x014a		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_014B	0x014b		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_014C	0x014c		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_014D	0x014d		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_014E	0x014e		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_014F	0x014f		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0150	0x0150		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0151	0x0151		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0152	0x0152		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0153	0x0153		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0154	0x0154		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0155	0x0155		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0156	0x0156		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0157	0x0157		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0158	0x0158		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0159	0x0159		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_015A	0x015a		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_015B	0x015b		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_015C	0x015c		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_015D	0x015d		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_015E	0x015e		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_015F	0x015f		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0160	0x0160		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0161	0x0161		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0162	0x0162		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0163	0x0163		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0164	0x0164		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0165	0x0165		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0166	0x0166		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0167	0x0167		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0168	0x0168		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0169	0x0169		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_016A	0x016a		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_016B	0x016b		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_016C	0x016c		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_016D	0x016d		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_016E	0x016e		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_016F	0x016f		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0170	0x0170		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0171	0x0171		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0172	0x0172		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0173	0x0173		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0174	0x0174		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0175	0x0175		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0176	0x0176		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0177	0x0177		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0178	0x0178		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0179	0x0179		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_017A	0x017a		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_017B	0x017b		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_017C	0x017c		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_017D	0x017d		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_017E	0x017e		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_017F	0x017f		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0180	0x0180		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0181	0x0181		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0182	0x0182		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0183	0x0183		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0184	0x0184		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0185	0x0185		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0186	0x0186		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0187	0x0187		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0188	0x0188		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0189	0x0189		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_018A	0x018a		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_018B	0x018b		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_018C	0x018c		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_018D	0x018d		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_018E	0x018e		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_018F	0x018f		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0190	0x0190		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0191	0x0191		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0192	0x0192		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0193	0x0193		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0194	0x0194		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0195	0x0195		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0196	0x0196		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0197	0x0197		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0198	0x0198		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_0199	0x0199		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_019A	0x019a		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_019B	0x019b		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_019C	0x019c		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_019D	0x019d		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_019E	0x019e		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_019F	0x019f		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01A0	0x01a0		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01A1	0x01a1		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01A2	0x01a2		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01A3	0x01a3		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01A4	0x01a4		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01A5	0x01a5		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01A6	0x01a6		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01A7	0x01a7		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01A8	0x01a8		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01A9	0x01a9		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01AA	0x01aa		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01AB	0x01ab		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01AC	0x01ac		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01AD	0x01ad		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01AE	0x01ae		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01AF	0x01af		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01B0	0x01b0		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01B1	0x01b1		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01B2	0x01b2		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01B3	0x01b3		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01B4	0x01b4		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01B5	0x01b5		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01B6	0x01b6		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01B7	0x01b7		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01B8	0x01b8		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01B9	0x01b9		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01BA	0x01ba		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01BB	0x01bb		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01BC	0x01bc		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01BD	0x01bd		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01BE	0x01be		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01BF	0x01bf		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01C0	0x01c0		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01C1	0x01c1		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01C2	0x01c2		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01C3	0x01c3		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01C4	0x01c4		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01C5	0x01c5		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01C6	0x01c6		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01C7	0x01c7		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01C8	0x01c8		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01C9	0x01c9		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01CA	0x01ca		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01CB	0x01cb		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01CC	0x01cc		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01CD	0x01cd		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01CE	0x01ce		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01CF	0x01cf		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01D0	0x01d0		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01D1	0x01d1		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01D2	0x01d2		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01D3	0x01d3		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01D4	0x01d4		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01D5	0x01d5		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01D6	0x01d6		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01D7	0x01d7		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01D8	0x01d8		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01D9	0x01d9		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01DA	0x01da		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01DB	0x01db		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01DC	0x01dc		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01DD	0x01dd		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01DE	0x01de		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01DF	0x01df		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01E0	0x01e0		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01E1	0x01e1		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01E2	0x01e2		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01E3	0x01e3		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01E4	0x01e4		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01E5	0x01e5		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01E6	0x01e6		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01E7	0x01e7		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01E8	0x01e8		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01E9	0x01e9		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01EA	0x01ea		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01EB	0x01eb		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01EC	0x01ec		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01ED	0x01ed		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01EE	0x01ee		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01EF	0x01ef		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01F0	0x01f0		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01F1	0x01f1		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01F2	0x01f2		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01F3	0x01f3		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01F4	0x01f4		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01F5	0x01f5		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01F6	0x01f6		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01F7	0x01f7		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01F8	0x01f8		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01F9	0x01f9		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01FA	0x01fa		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01FB	0x01fb		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01FC	0x01fc		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01FD	0x01fd		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01FE	0x01fe		/* LCD */
+#define	USB_PRODUCT_MATRIXORB_LCD_01FF	0x01ff		/* LCD */
+
 /* MCT Corp. */
 #define	USB_PRODUCT_MCT_HUB0100	0x0100		/* Hub */
 #define	USB_PRODUCT_MCT_DU_H3SP_USB232	0x0200		/* D-Link DU-H3SP BAY Hub */
@@ -3115,6 +3477,9 @@
 /* Thurlby Thandar Instruments products */
 #define	USB_PRODUCT_THURLBY_QL355P	0x03e8		/* QL355P power supply */
 
+/* The Mobility Lab products */
+#define	USB_PRODUCT_TML_SERIAL	0x0064		/* Serial */
+
 /* Todos Data System products */
 #define	USB_PRODUCT_TODOS_ARGOS_MINI	0x0002		/* Argos Mini Smartcard */
 
@@ -3177,6 +3542,9 @@
 /* Unknown vendor 4 */
 #define	USB_PRODUCT_UNKNOWN4_DM9601	0x8101		/* DM9601 */
 
+/* Unknown vendor 5 */
+#define	USB_PRODUCT_UNKNOWN5_NF_RIC	0x0001		/* NF RIC */
+
 /* U.S. Robotics products */
 #define	USB_PRODUCT_USR_USR1120	0x00eb		/* USR1120 WLAN */
 #define	USB_PRODUCT_USR_MILLER_A	0x00f1		/* USR9000 SureConnect ADSL */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index bc3564b38f0..445326b8713 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.477 2010/02/23 16:51:56 sobrado Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.478 2010/02/23 23:29:54 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.473 2010/02/23 16:49:52 sobrado Exp 
+ *	OpenBSD: usbdevs,v 1.474 2010/02/23 23:29:21 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -538,6 +538,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "ASC495 Speakers",
 	},
 	{
+	    USB_VENDOR_ALTI2, USB_PRODUCT_ALTI2_NEPTUNE3,
+	    "Neptune 3",
+	},
+	{
 	    USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_WLAN,
 	    "WLAN",
 	},
@@ -606,6 +610,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "Eagle III",
 	},
 	{
+	    USB_VENDOR_ANALOGDEVICES, USB_PRODUCT_ANALOGDEVICES_GNICE,
+	    "gnICE",
+	},
+	{
+	    USB_VENDOR_ANALOGDEVICES, USB_PRODUCT_ANALOGDEVICES_GNICEPLUS,
+	    "gnICE+",
+	},
+	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_SERIAL,
 	    "Serial",
 	},
@@ -846,6 +858,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "USB Cable 205",
 	},
 	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_STK541,
+	    "STK541 Zigbee",
+	},
+	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_UHB124,
 	    "UHB124 hub",
 	},
@@ -930,6 +946,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_BAYER, USB_PRODUCT_BAYER_CONTOUR,
+	    "Ascensia Contour",
+	},
+	{
 	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_USOTL4,
 	    "USOTL4 RS-422/485",
 	},
@@ -978,6 +998,26 @@ const struct usb_known_product usb_known_products[] = {
 	    "232USB9M RS-232",
 	},
 	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_485USBTB_2W,
+	    "485USBTB-2W RS-422/485",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_485USBTB_4W,
+	    "485USBTB-4W RS-422/485",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_TTL5USB9M,
+	    "TTL5USB9M",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_TTL3USB9M,
+	    "TTL3USB9M",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_ZZ_PROG1,
+	    "ZZ Programmer",
+	},
+	{
 	    USB_VENDOR_BALTECH, USB_PRODUCT_BALTECH_CARDREADER,
 	    "Card reader",
 	},
@@ -1946,6 +1986,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "Vigor600",
 	},
 	{
+	    USB_VENDOR_DRESDENELEC, USB_PRODUCT_DRESDENELEC_STB,
+	    "Sensor Terminal",
+	},
+	{
+	    USB_VENDOR_DRESDENELEC, USB_PRODUCT_DRESDENELEC_WHT,
+	    "Wireless Terminal",
+	},
+	{
 	    USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD,
 	    "ANT dev board",
 	},
@@ -2042,6 +2090,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "LD-USB/TX",
 	},
 	{
+	    USB_VENDOR_ELEKTOR, USB_PRODUCT_ELEKTOR_FT323R,
+	    "FT323R",
+	},
+	{
 	    USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1,
 	    "ELSA",
 	},
@@ -2274,6 +2326,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "2232C Serial",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT4232H,
+	    "FT4232H",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS,
 	    "PS/2 Keyboard/Mouse",
 	},
@@ -2286,6 +2342,46 @@ const struct usb_known_product usb_known_products[] = {
 	    "OpenRD JTAGKey",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CANDAPTER,
+	    "CANdapter",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_NXTCAM,
+	    "Mindstorms NXTCam",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OOCDLINK,
+	    "OOCDlink",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LM3S_DEVEL,
+	    "LM3S Devel",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LM3S_EVAL,
+	    "LM3S Eval",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TURTELIZER_JTAG,
+	    "JTAG/RS-232",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OPENDCC,
+	    "OpenDCC",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OPENDCC_SNIFFER,
+	    "OpenDCC Sniffer",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OPENDCC_THROTTLE,
+	    "OpenDCC Throttle",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OPENDCC_GATEWAY,
+	    "OpenDCC Gateway",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LOCOBUFFER,
 	    "RR-CirKits LocoBuffer",
 	},
@@ -2350,10 +2446,46 @@ const struct usb_known_product usb_known_products[] = {
 	    "2232L Serial",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SCS_0,
+	    "Radio Modem",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SCS_1,
+	    "Radio Modem",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SCS_2,
+	    "Radio Modem",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SCS_3,
+	    "Radio Modem",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SCS_4,
+	    "Radio Modem",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SCS_5,
+	    "Radio Modem",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SCS_6,
+	    "Radio Modem",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SCS_7,
+	    "Radio Modem",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IPLUS,
 	    "iPlus",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IPLUS2,
+	    "iPlus",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_XSENS_1,
 	    "Serial",
 	},
@@ -2390,6 +2522,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Gamma Scout Online",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_JTAGCABLEII,
+	    "Propox JTAG",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_WESTREX_777,
 	    "Westrex 777",
 	},
@@ -2410,22 +2546,54 @@ const struct usb_known_product usb_known_products[] = {
 	    "ATK-16 Camera",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ATK16C,
-	    "ATK-16C Camera",
-	},
-	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ATK16HR,
 	    "ATK-16HR Camera",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ATK16C,
+	    "ATK-16C Camera",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ATK16HRC,
 	    "ATK-16HRC Camera",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ATK16IC,
+	    "ATK-16IC Camera",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_YEI_SC31,
 	    "ServoCenter3.1",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_USR,
+	    "USR",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_MSM1,
+	    "Mini-Sound-Modul",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_KL100,
+	    "KL 100",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_WS550,
+	    "WS 550",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_WS888,
+	    "WS 888",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_TWS550,
+	    "WS 550",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_FEM,
+	    "Funk Energie Monitor",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_FHZ1300PC,
 	    "FHZ 1300 PC",
 	},
@@ -2434,6 +2602,26 @@ const struct usb_known_product usb_known_products[] = {
 	    "WS 500",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_HS485,
+	    "RS-485",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_UMS100,
+	    "UMS 100",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_TFD128,
+	    "TFD 128",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_FM3RX,
+	    "FM3 RX",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_WS777,
+	    "WS 777",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_EM1010PC,
 	    "EM 1010 PC",
 	},
@@ -2458,10 +2646,22 @@ const struct usb_known_product usb_known_products[] = {
 	    "FS 20 SIG",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_UTP8,
+	    "UTP 8",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_WS300PC,
 	    "WS 300 PC",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_WS444PC,
+	    "WS 444 PC",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FISCO,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ECO_PRO,
 	    "EVER Eco Pro UPS",
 	},
@@ -2474,6 +2674,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Pyramid Display",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_UNICOM,
+	    "Unicom III",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_1,
 	    "Serial",
 	},
@@ -2554,6 +2758,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "D2XX",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_REU_TINY,
+	    "RigExpert Tiny",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_HO870,
+	    "HO870",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_HO820,
+	    "HO820",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232BM,
 	    "FT232BM Serial",
 	},
@@ -2590,6 +2806,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "Y9",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_DGQG,
+	    "DGQG",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_DUSB,
+	    "DUSB",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_UAD8,
 	    "UAD 8",
 	},
@@ -2626,6 +2850,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "UltraPort",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SPROG_II,
+	    "Sprog II",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PIEGROUP_IR,
+	    "Infrared",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ACTZWAVE,
 	    "HomePro ZWave",
 	},
@@ -2658,6 +2890,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Serial",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OCEANIC,
+	    "Oceanic instrument",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SUUNTO,
 	    "Suunto Sports",
 	},
@@ -2666,6 +2902,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "USB-UIRT",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_USBX_707,
+	    "USBX-707",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CCS_ICDU20,
 	    "ICD-U20",
 	},
@@ -2678,6 +2918,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "MACH-X",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CCS_LOAD_N_GO,
+	    "LOAD N GO",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CCS_ICDU64,
+	    "ICDU64",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CCS_PRIME8,
+	    "PRIME8",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ITM_TOUCH,
 	    "ITM Touchscreen",
 	},
@@ -2690,6 +2942,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Matrix Orbital MX200 Series LCD",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_MTXO,
+	    "Matrix Orbital LCD",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK202_24,
 	    "Matrix Orbital LK202-24 LCD",
 	},
@@ -2699,11 +2955,15 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MATRIX_2,
-	    "Serial",
+	    "Matrix Orbital LCD",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MATRIX_3,
-	    "Serial",
+	    "Matrix Orbital LCD",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_RELAIS,
+	    "Relais",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TIRA1,
@@ -2754,6 +3014,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "UIO 88",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_R2000KU_RNG,
+	    "R2000KU RNG",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_BCS_SE923,
+	    "BCS SE923",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232RL,
+	    "FT232RL",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_632,
 	    "Crystalfontz CFA-632 LCD",
 	},
@@ -2790,6 +3062,22 @@ const struct usb_known_product usb_known_products[] = {
 	    "Serial",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PROTEGO_1,
+	    "Protego",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PROTEGO_R200,
+	    "R200-USB TRNG",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PROTEGO_3,
+	    "Protego",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PROTEGO_4,
+	    "Protego",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SEMC_DSS20,
 	    "SEMC DSS-20 SyncStation",
 	},
@@ -2978,6 +3266,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "PrismGT USB 2.0 WLAN",
 	},
 	{
+	    USB_VENDOR_GNOTOMETRICS, USB_PRODUCT_GNOTOMETRICS_AURICAL,
+	    "Aurical",
+	},
+	{
 	    USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
 	    "GoCOM232 Serial converter",
 	},
@@ -3510,6 +3802,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Mini IO Board",
 	},
 	{
+	    USB_VENDOR_INTERBIO, USB_PRODUCT_INTERBIO_MINIIOBOARD2,
+	    "Mini IO Board",
+	},
+	{
 	    USB_VENDOR_INTERSIL, USB_PRODUCT_INTERSIL_PRISM_GT,
 	    "PrismGT USB 2.0 WLAN",
 	},
@@ -3650,6 +3946,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "JD 350",
 	},
 	{
+	    USB_VENDOR_JETI, USB_PRODUCT_JETI_SPC1201,
+	    "SPECBOS 1201",
+	},
+	{
 	    USB_VENDOR_JRC, USB_PRODUCT_JRC_AH_J3001V_J3002V,
 	    "AirH\"PHONE AH-J3001V/J3002V",
 	},
@@ -3890,6 +4190,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "CD R/W",
 	},
 	{
+	    USB_VENDOR_LARSENBRUSGAARD, USB_PRODUCT_LARSENBRUSGAARD_ALTITRACK,
+	    "AltiTrack",
+	},
+	{
 	    USB_VENDOR_LEADTEK, USB_PRODUCT_LEADTEK_9531,
 	    "9531 GPS",
 	},
@@ -4230,6 +4534,1034 @@ const struct usb_known_product usb_known_products[] = {
 	    "mouse",
 	},
 	{
+	    USB_VENDOR_MARVELL, USB_PRODUCT_MARVELL_SHEEVAPLUG,
+	    "SheevaPlug",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0100,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0101,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0102,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0103,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0104,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0105,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0106,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0107,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0108,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0109,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_010A,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_010B,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_010C,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_010D,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_010E,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_010F,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0110,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0111,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0112,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0113,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0114,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0115,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0116,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0117,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0118,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0119,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_011A,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_011B,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_011C,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_011D,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_011E,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_011F,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0120,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0121,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0122,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0123,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0124,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0125,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0126,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0127,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0128,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0129,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_012A,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_012B,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_012C,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_012D,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_012E,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_012F,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0130,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0131,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0132,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0133,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0134,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0135,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0136,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0137,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0138,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0139,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_013A,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_013B,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_013C,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_013D,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_013E,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_013F,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0140,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0141,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0142,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0143,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0144,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0145,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0146,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0147,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0148,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0149,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_014A,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_014B,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_014C,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_014D,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_014E,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_014F,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0150,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0151,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0152,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0153,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0154,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0155,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0156,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0157,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0158,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0159,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_015A,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_015B,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_015C,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_015D,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_015E,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_015F,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0160,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0161,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0162,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0163,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0164,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0165,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0166,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0167,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0168,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0169,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_016A,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_016B,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_016C,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_016D,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_016E,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_016F,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0170,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0171,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0172,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0173,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0174,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0175,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0176,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0177,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0178,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0179,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_017A,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_017B,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_017C,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_017D,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_017E,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_017F,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0180,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0181,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0182,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0183,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0184,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0185,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0186,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0187,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0188,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0189,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_018A,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_018B,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_018C,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_018D,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_018E,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_018F,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0190,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0191,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0192,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0193,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0194,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0195,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0196,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0197,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0198,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_0199,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_019A,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_019B,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_019C,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_019D,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_019E,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_019F,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01A0,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01A1,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01A2,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01A3,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01A4,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01A5,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01A6,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01A7,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01A8,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01A9,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01AA,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01AB,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01AC,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01AD,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01AE,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01AF,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01B0,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01B1,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01B2,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01B3,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01B4,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01B5,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01B6,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01B7,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01B8,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01B9,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01BA,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01BB,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01BC,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01BD,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01BE,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01BF,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01C0,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01C1,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01C2,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01C3,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01C4,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01C5,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01C6,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01C7,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01C8,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01C9,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01CA,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01CB,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01CC,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01CD,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01CE,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01CF,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01D0,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01D1,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01D2,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01D3,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01D4,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01D5,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01D6,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01D7,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01D8,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01D9,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01DA,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01DB,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01DC,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01DD,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01DE,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01DF,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01E0,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01E1,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01E2,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01E3,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01E4,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01E5,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01E6,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01E7,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01E8,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01E9,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01EA,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01EB,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01EC,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01ED,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01EE,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01EF,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01F0,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01F1,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01F2,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01F3,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01F4,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01F5,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01F6,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01F7,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01F8,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01F9,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01FA,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01FB,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01FC,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01FD,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01FE,
+	    "LCD",
+	},
+	{
+	    USB_VENDOR_MATRIXORB, USB_PRODUCT_MATRIXORB_LCD_01FF,
+	    "LCD",
+	},
+	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100,
 	    "Hub",
 	},
@@ -7146,6 +8478,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "QL355P power supply",
 	},
 	{
+	    USB_VENDOR_TML, USB_PRODUCT_TML_SERIAL,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_TODOS, USB_PRODUCT_TODOS_ARGOS_MINI,
 	    "Argos Mini Smartcard",
 	},
@@ -7274,6 +8610,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "DM9601",
 	},
 	{
+	    USB_VENDOR_UNKNOWN5, USB_PRODUCT_UNKNOWN5_NF_RIC,
+	    "NF RIC",
+	},
+	{
 	    USB_VENDOR_USR, USB_PRODUCT_USR_USR1120,
 	    "USR1120 WLAN",
 	},
@@ -9118,6 +10458,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Icom",
 	},
 	{
+	    USB_VENDOR_GNOTOMETRICS,
+	    "GN Otometrics",
+	},
+	{
 	    USB_VENDOR_MICRODIA,
 	    "Microdia",
 	},
@@ -9126,10 +10470,18 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Sealevel System",
 	},
 	{
+	    USB_VENDOR_JETI,
+	    "JETI",
+	},
+	{
 	    USB_VENDOR_EASYDISK,
 	    "EasyDisk",
 	},
 	{
+	    USB_VENDOR_ELEKTOR,
+	    "Elektor Electronics",
+	},
+	{
 	    USB_VENDOR_KYOCERA2,
 	    "Kyocera",
 	},
@@ -9182,6 +10534,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "ELCON Systemtechnik",
 	},
 	{
+	    USB_VENDOR_UNKNOWN5,
+	    "Unknown Vendor",
+	},
+	{
 	    USB_VENDOR_SITECOMEU,
 	    "Sitecom Europe",
 	},
@@ -9242,6 +10598,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Airprime",
 	},
 	{
+	    USB_VENDOR_LARSENBRUSGAARD,
+	    "Larsen and Brusgaard",
+	},
+	{
 	    USB_VENDOR_UNKNOWN4,
 	    "Unknown Vendor",
 	},
@@ -9642,10 +11002,22 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Terminus Technology",
 	},
 	{
+	    USB_VENDOR_BAYER,
+	    "Bayer Health Care",
+	},
+	{
 	    USB_VENDOR_WCH2,
 	    "QinHeng Electronics",
 	},
 	{
+	    USB_VENDOR_MATRIXORB,
+	    "Matrix Orbital",
+	},
+	{
+	    USB_VENDOR_TML,
+	    "The Mobility Lab",
+	},
+	{
 	    USB_VENDOR_TCTMOBILE,
 	    "TCT Mobile",
 	},
@@ -9654,10 +11026,18 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "MDS",
 	},
 	{
+	    USB_VENDOR_ALTI2,
+	    "Alti-2",
+	},
+	{
 	    USB_VENDOR_LONGCHEER,
 	    "Longcheer Technology",
 	},
 	{
+	    USB_VENDOR_DRESDENELEC,
+	    "Dresden Elektronic",
+	},
+	{
 	    USB_VENDOR_PEGATRON,
 	    "Pegatron",
 	},
@@ -9806,6 +11186,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "MosChip",
 	},
 	{
+	    USB_VENDOR_MARVELL,
+	    "Marvell",
+	},
+	{
 	    USB_VENDOR_3COM3,
 	    "3Com",
 	},