regen

2 files changed, 1167 insertions, 34 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index c1a6009fd41..8932e3c0ece 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.350 2008/03/03 20:56:10 jsg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.351 2008/03/18 12:25:18 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.341 2008/03/03 20:55:22 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.342 2008/03/18 12:24:19 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -328,7 +328,7 @@
 #define	USB_VENDOR_NETGEAR	0x0846		/* BayNETGEAR */
 #define	USB_VENDOR_TOPRE	0x0853		/* Topre Corporation */
 #define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire */
-#define	USB_VENDOR_BBELECTRONICS	0x0856		/* B&B Electronics */
+#define	USB_VENDOR_BBELECTR	0x0856		/* B&B Electronics */
 #define	USB_VENDOR_PORTGEAR	0x085a		/* PortGear */
 #define	USB_VENDOR_NETGEAR2	0x0864		/* Netgear */
 #define	USB_VENDOR_SYSTEMTALKS	0x086e		/* System Talks */
@@ -387,12 +387,13 @@
 #define	USB_VENDOR_GREENHOUSE	0x0a6b		/* GREENHOUSE */
 #define	USB_VENDOR_GEOCAST	0x0a79		/* Geocast Network Systems */
 #define	USB_VENDOR_IDQUANTIQUE	0x0aba		/* id Quantique */
+#define	USB_VENDOR_IDTECH	0x0acd		/* ID TECH */
 #define	USB_VENDOR_ZYDAS	0x0ace		/* ZyDAS Technology */
 #define	USB_VENDOR_NEODIO	0x0aec		/* Neodio */
 #define	USB_VENDOR_OPTION	0x0af0		/* Option */
 #define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
 #define	USB_VENDOR_ASUS	0x0b05		/* ASUS */
-#define	USB_VENDOR_SIIG2	0x0b39		/* SIIG */
+#define	USB_VENDOR_OCT	0x0b39		/* Omnidirectional Control Technology */
 #define	USB_VENDOR_TEKRAM	0x0b3b		/* Tekram Technology */
 #define	USB_VENDOR_HAL	0x0b41		/* HAL Corporation */
 #define	USB_VENDOR_NEC2	0x0b62		/* NEC */
@@ -408,6 +409,7 @@
 #define	USB_VENDOR_FSC	0x0bf8		/* Fujitsu Siemens Computers */
 #define	USB_VENDOR_AGATE	0x0c08		/* Agate Technologies */
 #define	USB_VENDOR_DMI	0x0c0b		/* DMI */
+#define	USB_VENDOR_ICOM	0x0c26		/* Icom */
 #define	USB_VENDOR_MICRODIA	0x0c45		/* Microdia */
 #define	USB_VENDOR_SEALEVEL	0x0c52		/* Sealevel System */
 #define	USB_VENDOR_EASYDISK	0x0c76		/* EasyDisk */
@@ -415,6 +417,8 @@
 #define	USB_VENDOR_ZCOM	0x0cde		/* Z-Com */
 #define	USB_VENDOR_ATHEROS2	0x0cf3		/* Atheros Communications */
 #define	USB_VENDOR_TANGTOP	0x0d3d		/* Tangtop */
+#define	USB_VENDOR_KOBIL	0x0d46		/* Kobil Systems */
+#define	USB_VENDOR_POSIFLEX	0x0d3a		/* Posiflex Technologies */
 #define	USB_VENDOR_SMC3	0x0d5c		/* SMC */
 #define	USB_VENDOR_PEN	0x0d7d		/* Pen Drive */
 #define	USB_VENDOR_ABC	0x0d8c		/* ABC */
@@ -434,10 +438,11 @@
 #define	USB_VENDOR_ITEGNO	0x0eba		/* iTegno */
 #define	USB_VENDOR_AIRPRIME	0x0f3d		/* Airprime */
 #define	USB_VENDOR_VTECH	0x0f88		/* VTech */
-#define	USB_VENDOR_FALCOM	0x0f94		/* Falcom Wireless Communications GmbH */
+#define	USB_VENDOR_FALCOM	0x0f94		/* Falcom Wireless Communications */
 #define	USB_VENDOR_RIM	0x0fca		/* Research In Motion */
 #define	USB_VENDOR_DYNASTREAM	0x0fcf		/* Dynastream Innovations */
 #define	USB_VENDOR_QUALCOMM2	0x1004		/* Qualcomm */
+#define	USB_VENDOR_THURLBY	0x103e		/* Thurlby Thandar Instruments */
 #define	USB_VENDOR_GIGABYTE	0x1044		/* GIGABYTE */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_CCYU	0x1065		/* CCYU Technology */
@@ -451,19 +456,21 @@
 #define	USB_VENDOR_TENX	0x1130		/* Ten X Technology, Inc. */
 #define	USB_VENDOR_ISSC	0x1131		/* Integrated System Solution Corp. */
 #define	USB_VENDOR_JRC	0x1145		/* Japan Radio Company */
-#define	USB_VENDOR_SPHAIRON	0x114b		/* Sphairon Access Systems GmbH */
+#define	USB_VENDOR_SPHAIRON	0x114b		/* Sphairon Access Systems */
 #define	USB_VENDOR_DELORME	0x1163		/* DeLorme */
 #define	USB_VENDOR_SERVERWORKS	0x1166		/* ServerWorks */
 #define	USB_VENDOR_ACERCM	0x1189		/* Acer Communications & Multimedia */
 #define	USB_VENDOR_SIERRA	0x1199		/* Sierra Wireless */
 #define	USB_VENDOR_SIEMENS3	0x11f5		/* Siemens */
 #define	USB_VENDOR_ALCATEL	0x11f7		/* Alcatel */
+#define	USB_VENDOR_INTERBIO	0x1209		/* InterBiometrics */
 #define	USB_VENDOR_UNKNOWN3	0x1233		/* Unknown vendor */
 #define	USB_VENDOR_TSUNAMI	0x1241		/* Tsunami */
 #define	USB_VENDOR_PHEENET	0x124a		/* Pheenet */
 #define	USB_VENDOR_RAPTORGAMING	0x1267		/* Raptor Gaming */
 #define	USB_VENDOR_TWINMOS	0x126f		/* TwinMOS */
 #define	USB_VENDOR_TENDA	0x1286		/* Tenda */
+#define	USB_VENDOR_TESTO	0x128d		/* Testo AG */
 #define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components */
 #define	USB_VENDOR_CYBERTAN	0x129b		/* CyberTAN Technology */
 #define	USB_VENDOR_HUAWEI	0x12d1		/* HUAWEI Technologies */
@@ -530,6 +537,7 @@
 #define	USB_VENDOR_DELL	0x413c		/* Dell */
 #define	USB_VENDOR_WCH	0x4348		/* QinHeng Electronics */
 #define	USB_VENDOR_ACEECA	0x4766		/* Aceeca */
+#define	USB_VENDOR_PAPOUCH	0x5050		/* Papouch s.r.o. */
 #define	USB_VENDOR_AVERATEC	0x50c2		/* Averatec */
 #define	USB_VENDOR_SWEEX	0x5173		/* Sweex */
 #define	USB_VENDOR_PROLIFIC2	0x5372		/* Prolific Technology */
@@ -541,6 +549,7 @@
 #define	USB_VENDOR_SITECOM2	0x9016		/* Sitecom */
 #define	USB_VENDOR_MOSCHIP	0x9710		/* MosChip */
 #define	USB_VENDOR_3COM3	0xa727		/* 3Com */
+#define	USB_VENDOR_EVOLUTION	0xdeee		/* Evolution Robotics */
 #define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
 
 /*
@@ -841,7 +850,18 @@
 #define	USB_PRODUCT_AZUREWAVE_RT2870	0x3247		/* RT2870 */
 
 /* B&B Electronics products */
-#define	USB_PRODUCT_BBELECTRONICS_USOTL4	0xAC01		/* uLinks RS-422/485 */
+#define	USB_PRODUCT_BBELECTR_USOTL4	0xac01		/* USOTL4 RS-422/485 */
+#define	USB_PRODUCT_BBELECTR_USTL4	0xac02		/* USTL4 RS-422/485 */
+#define	USB_PRODUCT_BBELECTR_USO9ML2	0xac03		/* USO9ML2 RS-232 */
+#define	USB_PRODUCT_BBELECTR_USOPTL4	0xac11		/* USOPTL4 RS-422/485 */
+#define	USB_PRODUCT_BBELECTR_USPTL4	0xac12		/* USPTL4 RS-422/485 */
+#define	USB_PRODUCT_BBELECTR_USO9ML2DR2	0xac16		/* USO9ML2DR-2 RS-232 */
+#define	USB_PRODUCT_BBELECTR_USO9ML2DR	0xac17		/* USO9ML2DR RS-232 */
+#define	USB_PRODUCT_BBELECTR_USOPTL4DR2	0xac18		/* USOPTL4DR-2 RS-422/485 */
+#define	USB_PRODUCT_BBELECTR_USOPTL4DR	0xac19		/* USOPTL4DR RS-422/485 */
+#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 */
 
 /* Baltech products */
 #define	USB_PRODUCT_BALTECH_CARDREADER	0x9999		/* Card reader */
@@ -1185,12 +1205,17 @@
 /* e-TEK Labs products */
 #define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial */
 
+/* Evolution Robotics products */
+#define	USB_PRODUCT_EVOLUTION_ER1	0x0300		/* ER1 Control Module */
+#define	USB_PRODUCT_EVOLUTION_RCM4_1	0x0302		/* RCM4 interface */
+#define	USB_PRODUCT_EVOLUTION_RCM4_2	0x0303		/* RCM4 interface */
+
 /* Extended Systems products */
 #define	USB_PRODUCT_EXTENDED_XTNDACCESS	0x0100		/* XTNDAccess IrDA */
 
 /* Falcom Wireless Communications GmbH products */
-#define	USB_PRODUCT_FALCOM_TWIST	0x0001		/* Falcom Twist USB */
-#define	USB_PRODUCT_FALCOM_SAMBA	0x0005		/* Falcom Samba USB */
+#define	USB_PRODUCT_FALCOM_TWIST	0x0001		/* Twist */
+#define	USB_PRODUCT_FALCOM_SAMBA	0x0005		/* Samba */
 
 /* Fiberline */
 #define	USB_PRODUCT_FIBERLINE_WL430U	0x6003		/* WL-430U */
@@ -1202,20 +1227,73 @@
 #define	USB_PRODUCT_FREECOM_DVD	0xfc01		/* Connector for DVD drive */
 
 /* Future Technology Devices products */
+#define	USB_PRODUCT_FTDI_FT232_1	0x0232		/* Serial */
 #define	USB_PRODUCT_FTDI_SERIAL_8U232AM	0x6001		/* 8U232AM Serial */
+#define	USB_PRODUCT_FTDI_FT232_3	0x6006		/* Serial */
+#define	USB_PRODUCT_FTDI_FT232_4	0x6007		/* Serial */
+#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_SERIAL_2232L	0xcff8		/* 2232L Serial */
 #define	USB_PRODUCT_FTDI_PS2KBDMS	0x8371		/* PS/2 Keyboard/Mouse */
 #define	USB_PRODUCT_FTDI_SERIAL_8U100AX	0x8372		/* Serial */
+#define	USB_PRODUCT_FTDI_DMX4ALL	0xc850		/* DMX4ALL DMX interface */
+#define	USB_PRODUCT_FTDI_LOCOBUFFER	0xc7d0		/* RR-CirKits LocoBuffer */
+#define	USB_PRODUCT_FTDI_ASK_RDR4X7_1	0xc990		/* ASK RDR 4X7 */
+#define	USB_PRODUCT_FTDI_ASK_RDR4X7_2	0xc991		/* ASK RDR 4X7 */
+#define	USB_PRODUCT_FTDI_ASK_RDR4X7_3	0xc992		/* ASK RDR 4X7 */
+#define	USB_PRODUCT_FTDI_ASK_RDR4X7_4	0xc993		/* ASK RDR 4X7 */
+#define	USB_PRODUCT_FTDI_ASK_RDR4X7_5	0xc994		/* ASK RDR 4X7 */
+#define	USB_PRODUCT_FTDI_ASK_RDR4X7_6	0xc995		/* ASK RDR 4X7 */
+#define	USB_PRODUCT_FTDI_ASK_RDR4X7_7	0xc996		/* ASK RDR 4X7 */
+#define	USB_PRODUCT_FTDI_ASK_RDR4X7_8	0xc997		/* ASK RDR 4X7 */
 #define	USB_PRODUCT_FTDI_MJS_SIRIUS_PC	0xca81		/* MJS Sirius To PC Interface */
+#define	USB_PRODUCT_FTDI_CHAMELEON	0xcaa0		/* µChameleon */
 #define	USB_PRODUCT_FTDI_OPENPORT_13M	0xcc48		/* OpenPort 1.3 Mitsubishi */
 #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_IPLUS	0xd070		/* 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 */
+#define	USB_PRODUCT_FTDI_XSENS_4	0xd38b		/* Serial */
+#define	USB_PRODUCT_FTDI_XSENS_5	0xd38c		/* Serial */
+#define	USB_PRODUCT_FTDI_XSENS_6	0xd38d		/* Serial */
+#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_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_YEI_SC31	0xe050		/* ServoCenter3.1 */
+#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_GUDE_1	0xe808		/* Serial */
+#define	USB_PRODUCT_FTDI_GUDE_2	0xe809		/* Serial */
+#define	USB_PRODUCT_FTDI_GUDE_3	0xe80a		/* Serial */
+#define	USB_PRODUCT_FTDI_GUDE_4	0xe80b		/* Serial */
+#define	USB_PRODUCT_FTDI_GUDE_5	0xe80c		/* Serial */
+#define	USB_PRODUCT_FTDI_GUDE_6	0xe80d		/* Serial */
+#define	USB_PRODUCT_FTDI_GUDE_7	0xe80e		/* Serial */
+#define	USB_PRODUCT_FTDI_GUDE_8	0xe80f		/* Serial */
 #define	USB_PRODUCT_FTDI_EISCOU	0xe888		/* Expert ISDN */
 #define	USB_PRODUCT_FTDI_UOPTBR	0xe889		/* RS232 OptoBridge */
 #define	USB_PRODUCT_FTDI_DCF	0xe88a		/* Expert mouseCLOCK USB II */
 #define	USB_PRODUCT_FTDI_MSF	0xe88b		/* Expert mouseCLOCK USB II MSF */
 #define	USB_PRODUCT_FTDI_HBG	0xe88c		/* Expert mouseCLOCK USB II HBG */
+#define	USB_PRODUCT_FTDI_GUDE_9	0xe88d		/* Serial */
+#define	USB_PRODUCT_FTDI_GUDE_A	0xe88e		/* Serial */
+#define	USB_PRODUCT_FTDI_GUDE_B	0xe88f		/* Serial */
+#define	USB_PRODUCT_FTDI_ECLO_1WIRE	0xea90		/* 1-Wire */
+#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_SERIAL_232BM	0xee18		/* FT232BM Serial */
 #define	USB_PRODUCT_FTDI_MHAM_KW	0xeee8		/* KW */
 #define	USB_PRODUCT_FTDI_MHAM_YS	0xeee9		/* YS */
@@ -1225,17 +1303,59 @@
 #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_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_ACTZWAVE	0xf2d0		/* HomePro ZWave */
+#define	USB_PRODUCT_FTDI_GALAXY_1	0xf3c0		/* Serial */
+#define	USB_PRODUCT_FTDI_GALAXY_2	0xf3c1		/* Serial */
 #define	USB_PRODUCT_FTDI_COASTAL_TNCX	0xf448		/* Coastal ChipWorks TNC-X */
+#define	USB_PRODUCT_FTDI_LINX_MASTER2	0xf449		/* Master Development 2.0 */
+#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_SUUNTO	0xf680		/* Suunto Sports */
+#define	USB_PRODUCT_FTDI_USBUIRT	0xf850		/* USB-UIRT */
+#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_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_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_LCD_CFA_631	0xfc0c		/* Crystalfontz CFA-631 LCD */
+#define	USB_PRODUCT_FTDI_MATRIX_2	0xfa05		/* Serial */
+#define	USB_PRODUCT_FTDI_MATRIX_3	0xfa06		/* Serial */
+#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 */
+#define	USB_PRODUCT_FTDI_THORLABS	0xfaf0		/* Serial */
+#define	USB_PRODUCT_FTDI_ELV_UR100	0xfb58		/* UR 100 */
+#define	USB_PRODUCT_FTDI_ELV_UM100	0xfb5a		/* UM 100 */
+#define	USB_PRODUCT_FTDI_ELV_UO100	0xfb5b		/* UO 100 */
 #define	USB_PRODUCT_FTDI_LCD_CFA_632	0xfc08		/* Crystalfontz CFA-632 LCD */
-#define	USB_PRODUCT_FTDI_LCD_CFA_633	0xfc0b		/* Crystalfontz CFA-633 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 */
+#define	USB_PRODUCT_FTDI_LCD_CFA_633	0xfc0b		/* Crystalfontz CFA-633 LCD */
+#define	USB_PRODUCT_FTDI_LCD_CFA_631	0xfc0c		/* Crystalfontz CFA-631 LCD */
 #define	USB_PRODUCT_FTDI_LCD_CFA_635	0xfc0d		/* Crystalfontz CFA-635 LCD */
+#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_SEMC_DSS20	0xfc82		/* SEMC DSS-20 SyncStation */
+#define	USB_PRODUCT_FTDI_CANVIEW	0xfd60		/* CANview */
+#define	USB_PRODUCT_FTDI_VNHC	0xfe38		/* Modem */
+#define	USB_PRODUCT_FTDI_AMC232	0xff00		/* AMC-232USB0 */
+#define	USB_PRODUCT_FTDI_TTUSB	0xff20		/* TT-USB */
+#define	USB_PRODUCT_FTDI_IBS_US485	0xff38		/* US485 */
+#define	USB_PRODUCT_FTDI_IBS_PICPRO	0xff39		/* PIC-Programmer */
+#define	USB_PRODUCT_FTDI_IBS_PCMCIA	0xff3a		/* PCMCIA SRAM-cards reader */
+#define	USB_PRODUCT_FTDI_IBS_PK1	0xff3b		/* Particel counter PK1 */
+#define	USB_PRODUCT_FTDI_IBS_RS232MON	0xff3c		/* RS232 */
+#define	USB_PRODUCT_FTDI_IBS_APP70	0xff3d		/* APP 70 dust monitoring */
+#define	USB_PRODUCT_FTDI_IBS_PEDO	0xff3e		/* IBS PEDO-Modem */
+#define	USB_PRODUCT_FTDI_IBS_1	0xff3f		/* Serial */
+#define	USB_PRODUCT_FTDI_CANUSB	0xffa8		/* CANUSB */
 
 /* Fuji photo products */
 #define	USB_PRODUCT_FUJIPHOTO_MASS0100	0x0100		/* Mass Storage */
@@ -1399,6 +1519,21 @@
 /* id Quantique */
 #define	USB_PRODUCT_IDQUANTIQUE_QUANTISUSB	0x0102		/* Quantis USB */
 
+/* Icom, Inc. */
+#define	USB_PRODUCT_ICOM_ID1	0x0004		/* ID-1 */
+#define	USB_PRODUCT_ICOM_RP2C1	0x0009		/* ID-RP2C service 1 */
+#define	USB_PRODUCT_ICOM_RP2C2	0x000a		/* ID-RP2C service 2 */
+#define	USB_PRODUCT_ICOM_RP2D	0x000b		/* ID-RP2D */
+#define	USB_PRODUCT_ICOM_RP2VT	0x000c		/* ID-RP2V service T */
+#define	USB_PRODUCT_ICOM_RP2VR	0x000d		/* ID-RP2V service R */
+#define	USB_PRODUCT_ICOM_RP4000VT	0x0010		/* ID-RP4000V service T */
+#define	USB_PRODUCT_ICOM_RP4000VR	0x0011		/* ID-RP4000V service R */
+#define	USB_PRODUCT_ICOM_RP2000VT	0x0012		/* ID-RP2000V service T */
+#define	USB_PRODUCT_ICOM_RP2000VR	0x0013		/* ID-RP2000V service R */
+
+/* ID TECH products */
+#define	USB_PRODUCT_IDTECH_SERIAL	0x0300		/* Serial */
+
 /* Iiyama products */
 #define	USB_PRODUCT_IIYAMA_HUB	0x0201		/* Hub */
 
@@ -1445,6 +1580,10 @@
 #define	USB_PRODUCT_INTEL_I2011B	0x1111		/* Wireless 2011B */
 #define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
 
+/* InterBiometrics products */
+#define	USB_PRODUCT_INTERBIO_IOBOARD	0x1002		/* IO Board */
+#define	USB_PRODUCT_INTERBIO_MINIIOBOARD	0x1003		/* Mini IO Board */
+
 /* Intersil products */
 #define	USB_PRODUCT_INTERSIL_PRISM_GT	0x1000		/* PrismGT USB 2.0 WLAN */
 #define	USB_PRODUCT_INTERSIL_PRISM_2X	0x3642		/* Prism2.x WLAN */
@@ -1548,6 +1687,10 @@
 #define	USB_PRODUCT_KINGSTON_XX1	0x0008		/* Ethernet */
 #define	USB_PRODUCT_KINGSTON_KNU101TX	0x000a		/* KNU101TX Ethernet */
 
+/* Kobil Systems products */
+#define	USB_PRODUCT_KOBIL_B1	0x2020		/* Konverter for B1 */
+#define	USB_PRODUCT_KOBIL_KAAN	0x2021		/* Konverter for KAAN */
+
 /* Kodak products */
 #define	USB_PRODUCT_KODAK_DC220	0x0100		/* Digital Science DC220 */
 #define	USB_PRODUCT_KODAK_DC260	0x0110		/* Digital Science DC260 */
@@ -1672,6 +1815,7 @@
 #define	USB_PRODUCT_MELCO_KG54YB	0x005e		/* WLI-U2-KG54-YB WLAN */
 #define	USB_PRODUCT_MELCO_KG54	0x0066		/* WLI-U2-KG54 WLAN */
 #define	USB_PRODUCT_MELCO_KG54AI	0x0067		/* WLI-U2-KG54-AI WLAN */
+#define	USB_PRODUCT_MELCO_PCOPRS1	0x00b3		/* PC-OP-RS1 RemoteStation */
 #define	USB_PRODUCT_MELCO_SG54HP	0x00d8		/* WLI-U2-SG54HP */
 #define	USB_PRODUCT_MELCO_G54HP	0x00d9		/* WLI-U2-G54HP */
 #define	USB_PRODUCT_MELCO_KG54L	0x00da		/* WLI-U2-KG54L */
@@ -1756,6 +1900,7 @@
 #define	USB_PRODUCT_MOBILEACTION_MA620	0x0620		/* MA-620 IrDA */
 
 /* Mobility products */
+#define	USB_PRODUCT_MOBILITY_ED200H	0x0202		/* EasiDock 200 Serial */
 #define	USB_PRODUCT_MOBILITY_EA	0x0204		/* Ethernet */
 #define	USB_PRODUCT_MOBILITY_EASIDOCK	0x0304		/* EasiDock Ethernet */
 
@@ -1870,7 +2015,7 @@
 #define	USB_PRODUCT_OLYMPUS_C700	0x0105		/* C-700 Ultra Zoom */
 
 /* Omnidirectional Control Technology products */
-#define	USB_PRODUCT_SIIG2_USBTOETHER	0x0109		/* USB TO Ethernet */
+#define	USB_PRODUCT_OCT_USBTOETHER	0x0109		/* Ethernet */
 
 /* OmniVision Technologies, Inc. products */
 #define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 */
@@ -1920,6 +2065,37 @@
 #define	USB_PRODUCT_PANASONIC_SDCAAE	0x1b00		/* MultiMediaCard */
 #define	USB_PRODUCT_PANASONIC_TYTP50P6S	0x3900		/* TY-TP50P6-S 50in Touch Panel */
 
+/* Papouch products */
+#define	USB_PRODUCT_PAPOUCH_SB485_1	0x0100		/* SB485 USB-485/422 */
+#define	USB_PRODUCT_PAPOUCH_AP485_1	0x0101		/* AP485 USB-RS485 */
+#define	USB_PRODUCT_PAPOUCH_SB422_1	0x0102		/* SB422 USB-RS422 */
+#define	USB_PRODUCT_PAPOUCH_SB485_2	0x0103		/* SB485 USB-485/422 */
+#define	USB_PRODUCT_PAPOUCH_AP485_2	0x0104		/* AP485 USB-RS485 */
+#define	USB_PRODUCT_PAPOUCH_SB422_2	0x0105		/* SB422 USB-RS422 */
+#define	USB_PRODUCT_PAPOUCH_SB485S	0x0106		/* SB485S USB-485/422 */
+#define	USB_PRODUCT_PAPOUCH_SB485C	0x0107		/* SB485C USB-485/422 */
+#define	USB_PRODUCT_PAPOUCH_SERIAL	0x0200		/* Serial */
+#define	USB_PRODUCT_PAPOUCH_LEC	0x0300		/* Serial */
+#define	USB_PRODUCT_PAPOUCH_SB232	0x0301		/* SB232 USB-RS232 */
+#define	USB_PRODUCT_PAPOUCH_TMU	0x0400		/* TMU Thermometer */
+#define	USB_PRODUCT_PAPOUCH_IRAMP	0x0500		/* IRAmp Duplex */
+#define	USB_PRODUCT_PAPOUCH_DRAK5	0x0700		/* DRAK5 */
+#define	USB_PRODUCT_PAPOUCH_QUIDO88	0x0800		/* QUIDO USB 8/8 */
+#define	USB_PRODUCT_PAPOUCH_QUIDO44	0x0900		/* QUIDO USB 4/4 */
+#define	USB_PRODUCT_PAPOUCH_QUIDO22	0x0A00		/* QUIDO USB 2/2 */
+#define	USB_PRODUCT_PAPOUCH_QUIDO101	0x0B00		/* QUIDO USB 10/1 */
+#define	USB_PRODUCT_PAPOUCH_QUIDO303	0x0C00		/* QUIDO USB 30/3 */
+#define	USB_PRODUCT_PAPOUCH_QUIDO603	0x0D00		/* QUIDO USB 60(100)/3 */
+#define	USB_PRODUCT_PAPOUCH_QUIDO216	0x0E00		/* QUIDO USB 2/16 */
+#define	USB_PRODUCT_PAPOUCH_QUIDO332	0x0F00		/* QUIDO USB 3/32 */
+#define	USB_PRODUCT_PAPOUCH_DRAK6	0x1000		/* DRAK6 USB */
+#define	USB_PRODUCT_PAPOUCH_STAVOVY	0x8000		/* UPS-USB Stavovy */
+#define	USB_PRODUCT_PAPOUCH_MUC	0x8001		/* MU Controller */
+#define	USB_PRODUCT_PAPOUCH_SIMUKEY	0x8002		/* SimuKey */
+#define	USB_PRODUCT_PAPOUCH_AD4USB	0x8003		/* AD4USB */
+#define	USB_PRODUCT_PAPOUCH_GOLIATH_MUX	0x8004		/* GOLIATH MUX */
+#define	USB_PRODUCT_PAPOUCH_GOLIATH_MSR	0x8005		/* GOLIATH MSR */
+
 /* Pen Driver */
 #define	USB_PRODUCT_PEN_USBREADER	0x0240		/* 6 in 1 */
 #define	USB_PRODUCT_PEN_MOBILEDRIVE	0x0280		/* 3 in 1 */
@@ -1991,6 +2167,10 @@
 /* Portsmith products */
 #define	USB_PRODUCT_PORTSMITH_EEA	0x3003		/* Express Ethernet */
 
+/* Posiflex Technologies products */
+#define	USB_PRODUCT_POSIFLEX_PP7000_1	0x0300		/* PP7000 series printer */
+#define	USB_PRODUCT_POSIFLEX_PP7000_2	0x0400		/* PP7000 series printer */
+
 /* PQI products */
 #define	USB_PRODUCT_PQI_TRAVELFLASH	0x0001		/* Travel Flash Drive */
 
@@ -2128,7 +2308,53 @@
 #define	USB_PRODUCT_SCANLOGIC_336CX	0x0300		/* Phantom 336CX - C3 */
 
 /* Sealevel products */
-#define	USB_PRODUCT_SEALEVEL_USBSERIAL	0x2101		/* USB-Serial converter */
+#define	USB_PRODUCT_SEALEVEL_2101	0x2101		/* SeaLINK+232 (2101/2105) */
+#define	USB_PRODUCT_SEALEVEL_2102	0x2102		/* SeaLINK+485 (2102) */
+#define	USB_PRODUCT_SEALEVEL_2103	0x2103		/* SeaLINK+232I (2103) */
+#define	USB_PRODUCT_SEALEVEL_2104	0x2104		/* SeaLINK+485I (2104) */
+#define	USB_PRODUCT_SEALEVEL_2106	0x9020		/* SeaLINK+422 (2106) */
+#define	USB_PRODUCT_SEALEVEL_2201_1	0x2211		/* SeaPORT+2/232 (2201) Port 1 */
+#define	USB_PRODUCT_SEALEVEL_2201_2	0x2221		/* SeaPORT+2/232 (2201) Port 2 */
+#define	USB_PRODUCT_SEALEVEL_2202_1	0x2212		/* SeaPORT+2/485 (2202) Port 1 */
+#define	USB_PRODUCT_SEALEVEL_2202_2	0x2222		/* SeaPORT+2/485 (2202) Port 2 */
+#define	USB_PRODUCT_SEALEVEL_2203_1	0x2213		/* SeaPORT+2 (2203) Port 1 */
+#define	USB_PRODUCT_SEALEVEL_2203_2	0x2223		/* SeaPORT+2 (2203) Port 2 */
+#define	USB_PRODUCT_SEALEVEL_2401_1	0x2411		/* SeaPORT+4/232 (2401) Port 1 */
+#define	USB_PRODUCT_SEALEVEL_2401_2	0x2421		/* SeaPORT+4/232 (2401) Port 2 */
+#define	USB_PRODUCT_SEALEVEL_2401_3	0x2431		/* SeaPORT+4/232 (2401) Port 3 */
+#define	USB_PRODUCT_SEALEVEL_2401_4	0x2441		/* SeaPORT+4/232 (2401) Port 4 */
+#define	USB_PRODUCT_SEALEVEL_2402_1	0x2412		/* SeaPORT+4/485 (2402) Port 1 */
+#define	USB_PRODUCT_SEALEVEL_2402_2	0x2422		/* SeaPORT+4/485 (2402) Port 2 */
+#define	USB_PRODUCT_SEALEVEL_2402_3	0x2432		/* SeaPORT+4/485 (2402) Port 3 */
+#define	USB_PRODUCT_SEALEVEL_2402_4	0x2442		/* SeaPORT+4/485 (2402) Port 4 */
+#define	USB_PRODUCT_SEALEVEL_2403_1	0x2413		/* SeaPORT+4 (2403) Port 1 */
+#define	USB_PRODUCT_SEALEVEL_2403_2	0x2423		/* SeaPORT+4 (2403) Port 2 */
+#define	USB_PRODUCT_SEALEVEL_2403_3	0x2433		/* SeaPORT+4 (2403) Port 3 */
+#define	USB_PRODUCT_SEALEVEL_2403_4	0x2443		/* SeaPORT+4 (2403) Port 4 */
+#define	USB_PRODUCT_SEALEVEL_2801_1	0X2811		/* SeaLINK+8/232 (2801) Port 1 */
+#define	USB_PRODUCT_SEALEVEL_2801_2	0X2821		/* SeaLINK+8/232 (2801) Port 2 */
+#define	USB_PRODUCT_SEALEVEL_2801_3	0X2831		/* SeaLINK+8/232 (2801) Port 3 */
+#define	USB_PRODUCT_SEALEVEL_2801_4	0X2841		/* SeaLINK+8/232 (2801) Port 4 */
+#define	USB_PRODUCT_SEALEVEL_2801_5	0X2851		/* SeaLINK+8/232 (2801) Port 5 */
+#define	USB_PRODUCT_SEALEVEL_2801_6	0X2861		/* SeaLINK+8/232 (2801) Port 6 */
+#define	USB_PRODUCT_SEALEVEL_2801_7	0X2871		/* SeaLINK+8/232 (2801) Port 7 */
+#define	USB_PRODUCT_SEALEVEL_2801_8	0X2881		/* SeaLINK+8/232 (2801) Port 8 */
+#define	USB_PRODUCT_SEALEVEL_2802_1	0X2812		/* SeaLINK+8/485 (2802) Port 1 */
+#define	USB_PRODUCT_SEALEVEL_2802_2	0X2822		/* SeaLINK+8/485 (2802) Port 2 */
+#define	USB_PRODUCT_SEALEVEL_2802_3	0X2832		/* SeaLINK+8/485 (2802) Port 3 */
+#define	USB_PRODUCT_SEALEVEL_2802_4	0X2842		/* SeaLINK+8/485 (2802) Port 4 */
+#define	USB_PRODUCT_SEALEVEL_2802_5	0X2852		/* SeaLINK+8/485 (2802) Port 5 */
+#define	USB_PRODUCT_SEALEVEL_2802_6	0X2862		/* SeaLINK+8/485 (2802) Port 6 */
+#define	USB_PRODUCT_SEALEVEL_2802_7	0X2872		/* SeaLINK+8/485 (2802) Port 7 */
+#define	USB_PRODUCT_SEALEVEL_2802_8	0X2882		/* SeaLINK+8/485 (2802) Port 8 */
+#define	USB_PRODUCT_SEALEVEL_2803_1	0X2813		/* SeaLINK+8 (2803) Port 1 */
+#define	USB_PRODUCT_SEALEVEL_2803_2	0X2823		/* SeaLINK+8 (2803) Port 2 */
+#define	USB_PRODUCT_SEALEVEL_2803_3	0X2833		/* SeaLINK+8 (2803) Port 3 */
+#define	USB_PRODUCT_SEALEVEL_2803_4	0X2843		/* SeaLINK+8 (2803) Port 4 */
+#define	USB_PRODUCT_SEALEVEL_2803_5	0X2853		/* SeaLINK+8 (2803) Port 5 */
+#define	USB_PRODUCT_SEALEVEL_2803_6	0X2863		/* SeaLINK+8 (2803) Port 6 */
+#define	USB_PRODUCT_SEALEVEL_2803_7	0X2873		/* SeaLINK+8 (2803) Port 7 */
+#define	USB_PRODUCT_SEALEVEL_2803_8	0X2883		/* SeaLINK+8 (2803) Port 8 */
 
 /* Senao products */
 #define	USB_PRODUCT_SENAO_NUB8301	0x2000		/* NUB-8301 */
@@ -2202,7 +2428,7 @@
 /* SIIG products */
 #define	USB_PRODUCT_SIIG_DIGIFILMREADER	0x0004		/* DigiFilm-Combo */
 #define	USB_PRODUCT_SIIG_MULTICARDREADER	0x0201		/* MULTICARDREADER */
-#define	USB_PRODUCT_SIIG2_US2308	0x0421		/* Serial */
+#define	USB_PRODUCT_OCT_US2308	0x0421		/* Serial */
 
 /* Silicom products */
 #define	USB_PRODUCT_SILICOM_U2E	0x0001		/* U2E */
@@ -2391,6 +2617,18 @@
 /* Integrated System Solution Corp. */
 #define	USB_PRODUCT_ISSC_KYBT100	0x1001		/* KY-BT100 Bluetooth */
 
+/* Testo AG products */
+#define	USB_PRODUCT_TESTO_175	0x0001		/* 175/177 USB interface */
+#define	USB_PRODUCT_TESTO_330	0x0002		/* 330 USB interface */
+#define	USB_PRODUCT_TESTO_435	0x0003		/* 435/635/735 USB interface */
+#define	USB_PRODUCT_TESTO_845	0x0004		/* 845 USB interface */
+#define	USB_PRODUCT_TESTO_SERVICE	0x0005		/* Service adapter */
+#define	USB_PRODUCT_TESTO_580	0x0006		/* 580 USB interface */
+#define	USB_PRODUCT_TESTO_174	0x0007		/* 174 USB interface */
+#define	USB_PRODUCT_TESTO_556	0x0009		/* 556/560 USB interface */
+#define	USB_PRODUCT_TESTO_SERIAL_1	0x000a		/* USB adapter */
+#define	USB_PRODUCT_TESTO_SERIAL_2	0xf001		/* USB to serial converter */
+
 /* Texas Intel products */
 #define	USB_PRODUCT_TI_UTUSB41	0x1446		/* UT-USB41 hub */
 #define	USB_PRODUCT_TI_TUSB2046	0x2046		/* TUSB2046 hub */
@@ -2400,6 +2638,9 @@
 /* Thrustmaster products */
 #define	USB_PRODUCT_THRUST_FUSION_PAD	0xa0a3		/* Fusion Digital Gamepad */
 
+/* Thurlby Thandar Instruments products */
+#define	USB_PRODUCT_THURLBY_QL355P	0x03e8		/* QL355P power supply */
+
 /* Todos Data System products */
 #define	USB_PRODUCT_TODOS_ARGOS_MINI	0x0002		/* Argos Mini Smartcard */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 9762a30434c..085f439d4b3 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.346 2008/03/03 20:56:11 jsg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.347 2008/03/18 12:25:18 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.341 2008/03/03 20:55:22 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.342 2008/03/18 12:24:19 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -781,8 +781,52 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2870",
 	},
 	{
-	    USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4,
-	    "uLinks RS-422/485",
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_USOTL4,
+	    "USOTL4 RS-422/485",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_USTL4,
+	    "USTL4 RS-422/485",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_USO9ML2,
+	    "USO9ML2 RS-232",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_USOPTL4,
+	    "USOPTL4 RS-422/485",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_USPTL4,
+	    "USPTL4 RS-422/485",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_USO9ML2DR2,
+	    "USO9ML2DR-2 RS-232",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_USO9ML2DR,
+	    "USO9ML2DR RS-232",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_USOPTL4DR2,
+	    "USOPTL4DR-2 RS-422/485",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_USOPTL4DR,
+	    "USOPTL4DR RS-422/485",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_485USB9F2W,
+	    "485USB9F-2W RS-422/485",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_485USB9F4W,
+	    "485USB9F-4W RS-422/485",
+	},
+	{
+	    USB_VENDOR_BBELECTR, USB_PRODUCT_BBELECTR_232USB9M,
+	    "232USB9M RS-232",
 	},
 	{
 	    USB_VENDOR_BALTECH, USB_PRODUCT_BALTECH_CARDREADER,
@@ -1729,16 +1773,28 @@ const struct usb_known_product usb_known_products[] = {
 	    "Serial",
 	},
 	{
+	    USB_VENDOR_EVOLUTION, USB_PRODUCT_EVOLUTION_ER1,
+	    "ER1 Control Module",
+	},
+	{
+	    USB_VENDOR_EVOLUTION, USB_PRODUCT_EVOLUTION_RCM4_1,
+	    "RCM4 interface",
+	},
+	{
+	    USB_VENDOR_EVOLUTION, USB_PRODUCT_EVOLUTION_RCM4_2,
+	    "RCM4 interface",
+	},
+	{
 	    USB_VENDOR_EXTENDED, USB_PRODUCT_EXTENDED_XTNDACCESS,
 	    "XTNDAccess IrDA",
 	},
 	{
 	    USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST,
-	    "Falcom Twist USB",
+	    "Twist",
 	},
 	{
 	    USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA,
-	    "Falcom Samba USB",
+	    "Samba",
 	},
 	{
 	    USB_VENDOR_FIBERLINE, USB_PRODUCT_FIBERLINE_WL430U,
@@ -1753,10 +1809,30 @@ const struct usb_known_product usb_known_products[] = {
 	    "Connector for DVD drive",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_1,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM,
 	    "8U232AM Serial",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_3,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_4,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_5,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_6,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C,
 	    "2232C Serial",
 	},
@@ -1773,10 +1849,54 @@ const struct usb_known_product usb_known_products[] = {
 	    "Serial",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_DMX4ALL,
+	    "DMX4ALL DMX interface",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LOCOBUFFER,
+	    "RR-CirKits LocoBuffer",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ASK_RDR4X7_1,
+	    "ASK RDR 4X7",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ASK_RDR4X7_2,
+	    "ASK RDR 4X7",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ASK_RDR4X7_3,
+	    "ASK RDR 4X7",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ASK_RDR4X7_4,
+	    "ASK RDR 4X7",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ASK_RDR4X7_5,
+	    "ASK RDR 4X7",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ASK_RDR4X7_6,
+	    "ASK RDR 4X7",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ASK_RDR4X7_7,
+	    "ASK RDR 4X7",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ASK_RDR4X7_8,
+	    "ASK RDR 4X7",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MJS_SIRIUS_PC,
 	    "MJS Sirius To PC Interface",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CHAMELEON,
+	    "µChameleon",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OPENPORT_13M,
 	    "OpenPort 1.3 Mitsubishi",
 	},
@@ -1789,6 +1909,126 @@ const struct usb_known_product usb_known_products[] = {
 	    "OpenPort 1.3 Universal",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IPLUS,
+	    "iPlus",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_XSENS_1,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_XSENS_2,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_XSENS_3,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_XSENS_4,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_XSENS_5,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_XSENS_6,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_XSENS_7,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_XSENS_8,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GAMMASCOUT,
+	    "Gamma Scout Online",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_WESTREX_777,
+	    "Westrex 777",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_WESTREX_8900F,
+	    "Westrex 8900F",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ACG_HFDUAL,
+	    "HF Dual ISO Reader",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ARTEMIS,
+	    "CCD camera",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ATK16,
+	    "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_ATK16HRC,
+	    "ATK-16HRC Camera",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_YEI_SC31,
+	    "ServoCenter3.1",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ECO_PRO,
+	    "EVER Eco Pro UPS",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ACTROBOTS,
+	    "Active Robots comms",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PYRAMID,
+	    "Pyramid Display",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_1,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_2,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_3,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_4,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_5,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_6,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_7,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_8,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_EISCOU,
 	    "Expert ISDN",
 	},
@@ -1809,6 +2049,34 @@ const struct usb_known_product usb_known_products[] = {
 	    "Expert mouseCLOCK USB II HBG",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_9,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_A,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_B,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ECLO_1WIRE,
+	    "1-Wire",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TNCX,
+	    "TNC-X packet-radio",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TERATRONIK_VCP,
+	    "VCP",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TERATRONIK_D2XX,
+	    "D2XX",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232BM,
 	    "FT232BM Serial",
 	},
@@ -1845,14 +2113,78 @@ const struct usb_known_product usb_known_products[] = {
 	    "Y9",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_ALC8500,
+	    "ALC 8500 Expert",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_FHZ1000PC,
+	    "FHZ 1000 PC",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PERLE_UP,
+	    "UltraPort",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ACTZWAVE,
+	    "HomePro ZWave",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GALAXY_1,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GALAXY_2,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_COASTAL_TNCX,
 	    "Coastal ChipWorks TNC-X",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LINX_MASTER2,
+	    "Master Development 2.0",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LINX_1,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LINX_2,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LINX_3,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SUUNTO,
+	    "Suunto Sports",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_USBUIRT,
+	    "USB-UIRT",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CCS_ICDU20,
+	    "ICD-U20",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CCS_ICDU40,
+	    "ICD-U40",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CCS_MACHX,
+	    "MACH-X",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ITM_TOUCH,
 	    "ITM Touchscreen",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_USBSERIAL,
+	    "Matrix Orbital USB Serial",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_MX200,
 	    "Matrix Orbital MX200 Series LCD",
 	},
@@ -1865,30 +2197,134 @@ const struct usb_known_product usb_known_products[] = {
 	    "Matrix Orbital LK204-24 LCD",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_631,
-	    "Crystalfontz CFA-631 LCD",
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MATRIX_2,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MATRIX_3,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TIRA1,
+	    "Tira-1",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PCDJ_DAC2,
+	    "DAC-2",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ACCESSO,
+	    "Accesso reader",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_THORLABS,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_UR100,
+	    "UR 100",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_UM100,
+	    "UM 100",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ELV_UO100,
+	    "UO 100",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_632,
 	    "Crystalfontz CFA-632 LCD",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_634,
+	    "Crystalfontz CFA-634 LCD",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_547,
+	    "Crystalfontz CFA-547 LCD",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_633,
 	    "Crystalfontz CFA-633 LCD",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_634,
-	    "Crystalfontz CFA-634 LCD",
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_631,
+	    "Crystalfontz CFA-631 LCD",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_635,
 	    "Crystalfontz CFA-635 LCD",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_640,
+	    "Crystalfontz CFA-640 LCD",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_642,
+	    "Crystalfontz CFA-642 LCD",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IRTRANS,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SEMC_DSS20,
 	    "SEMC DSS-20 SyncStation",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CANVIEW,
+	    "CANview",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_VNHC,
+	    "Modem",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_AMC232,
+	    "AMC-232USB0",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TTUSB,
+	    "TT-USB",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IBS_US485,
+	    "US485",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IBS_PICPRO,
+	    "PIC-Programmer",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IBS_PCMCIA,
+	    "PCMCIA SRAM-cards reader",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IBS_PK1,
+	    "Particel counter PK1",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IBS_RS232MON,
+	    "RS232",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IBS_APP70,
+	    "APP 70 dust monitoring",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IBS_PEDO,
+	    "IBS PEDO-Modem",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IBS_1,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CANUSB,
+	    "CANUSB",
+	},
+	{
 	    USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100,
 	    "Mass Storage",
 	},
@@ -2289,6 +2725,50 @@ const struct usb_known_product usb_known_products[] = {
 	    "Quantis USB",
 	},
 	{
+	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_ID1,
+	    "ID-1",
+	},
+	{
+	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_RP2C1,
+	    "ID-RP2C service 1",
+	},
+	{
+	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_RP2C2,
+	    "ID-RP2C service 2",
+	},
+	{
+	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_RP2D,
+	    "ID-RP2D",
+	},
+	{
+	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_RP2VT,
+	    "ID-RP2V service T",
+	},
+	{
+	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_RP2VR,
+	    "ID-RP2V service R",
+	},
+	{
+	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_RP4000VT,
+	    "ID-RP4000V service T",
+	},
+	{
+	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_RP4000VR,
+	    "ID-RP4000V service R",
+	},
+	{
+	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_RP2000VT,
+	    "ID-RP2000V service T",
+	},
+	{
+	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_RP2000VR,
+	    "ID-RP2000V service R",
+	},
+	{
+	    USB_VENDOR_IDTECH, USB_PRODUCT_IDTECH_SERIAL,
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_IIYAMA, USB_PRODUCT_IIYAMA_HUB,
 	    "Hub",
 	},
@@ -2433,6 +2913,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "82930 test board",
 	},
 	{
+	    USB_VENDOR_INTERBIO, USB_PRODUCT_INTERBIO_IOBOARD,
+	    "IO Board",
+	},
+	{
+	    USB_VENDOR_INTERBIO, USB_PRODUCT_INTERBIO_MINIIOBOARD,
+	    "Mini IO Board",
+	},
+	{
 	    USB_VENDOR_INTERSIL, USB_PRODUCT_INTERSIL_PRISM_GT,
 	    "PrismGT USB 2.0 WLAN",
 	},
@@ -2709,6 +3197,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "KNU101TX Ethernet",
 	},
 	{
+	    USB_VENDOR_KOBIL, USB_PRODUCT_KOBIL_B1,
+	    "Konverter for B1",
+	},
+	{
+	    USB_VENDOR_KOBIL, USB_PRODUCT_KOBIL_KAAN,
+	    "Konverter for KAAN",
+	},
+	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC220,
 	    "Digital Science DC220",
 	},
@@ -3073,6 +3569,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "WLI-U2-KG54-AI WLAN",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_PCOPRS1,
+	    "PC-OP-RS1 RemoteStation",
+	},
+	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_SG54HP,
 	    "WLI-U2-SG54HP",
 	},
@@ -3297,6 +3797,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "MA-620 IrDA",
 	},
 	{
+	    USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_ED200H,
+	    "EasiDock 200 Serial",
+	},
+	{
 	    USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA,
 	    "Ethernet",
 	},
@@ -3597,8 +4101,8 @@ const struct usb_known_product usb_known_products[] = {
 	    "C-700 Ultra Zoom",
 	},
 	{
-	    USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER,
-	    "USB TO Ethernet",
+	    USB_VENDOR_OCT, USB_PRODUCT_OCT_USBTOETHER,
+	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
@@ -3733,6 +4237,122 @@ const struct usb_known_product usb_known_products[] = {
 	    "TY-TP50P6-S 50in Touch Panel",
 	},
 	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_SB485_1,
+	    "SB485 USB-485/422",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_AP485_1,
+	    "AP485 USB-RS485",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_SB422_1,
+	    "SB422 USB-RS422",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_SB485_2,
+	    "SB485 USB-485/422",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_AP485_2,
+	    "AP485 USB-RS485",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_SB422_2,
+	    "SB422 USB-RS422",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_SB485S,
+	    "SB485S USB-485/422",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_SB485C,
+	    "SB485C USB-485/422",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_SERIAL,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_LEC,
+	    "Serial",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_SB232,
+	    "SB232 USB-RS232",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_TMU,
+	    "TMU Thermometer",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_IRAMP,
+	    "IRAmp Duplex",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_DRAK5,
+	    "DRAK5",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_QUIDO88,
+	    "QUIDO USB 8/8",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_QUIDO44,
+	    "QUIDO USB 4/4",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_QUIDO22,
+	    "QUIDO USB 2/2",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_QUIDO101,
+	    "QUIDO USB 10/1",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_QUIDO303,
+	    "QUIDO USB 30/3",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_QUIDO603,
+	    "QUIDO USB 60(100)/3",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_QUIDO216,
+	    "QUIDO USB 2/16",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_QUIDO332,
+	    "QUIDO USB 3/32",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_DRAK6,
+	    "DRAK6 USB",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_STAVOVY,
+	    "UPS-USB Stavovy",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_MUC,
+	    "MU Controller",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_SIMUKEY,
+	    "SimuKey",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_AD4USB,
+	    "AD4USB",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_GOLIATH_MUX,
+	    "GOLIATH MUX",
+	},
+	{
+	    USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_GOLIATH_MSR,
+	    "GOLIATH MSR",
+	},
+	{
 	    USB_VENDOR_PEN, USB_PRODUCT_PEN_USBREADER,
 	    "6 in 1",
 	},
@@ -3921,6 +4541,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "Express Ethernet",
 	},
 	{
+	    USB_VENDOR_POSIFLEX, USB_PRODUCT_POSIFLEX_PP7000_1,
+	    "PP7000 series printer",
+	},
+	{
+	    USB_VENDOR_POSIFLEX, USB_PRODUCT_POSIFLEX_PP7000_2,
+	    "PP7000 series printer",
+	},
+	{
 	    USB_VENDOR_PQI, USB_PRODUCT_PQI_TRAVELFLASH,
 	    "Travel Flash Drive",
 	},
@@ -4273,8 +4901,192 @@ const struct usb_known_product usb_known_products[] = {
 	    "Phantom 336CX - C3",
 	},
 	{
-	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_USBSERIAL,
-	    "USB-Serial converter",
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2101,
+	    "SeaLINK+232 (2101/2105)",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2102,
+	    "SeaLINK+485 (2102)",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2103,
+	    "SeaLINK+232I (2103)",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2104,
+	    "SeaLINK+485I (2104)",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2106,
+	    "SeaLINK+422 (2106)",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2201_1,
+	    "SeaPORT+2/232 (2201) Port 1",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2201_2,
+	    "SeaPORT+2/232 (2201) Port 2",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2202_1,
+	    "SeaPORT+2/485 (2202) Port 1",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2202_2,
+	    "SeaPORT+2/485 (2202) Port 2",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2203_1,
+	    "SeaPORT+2 (2203) Port 1",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2203_2,
+	    "SeaPORT+2 (2203) Port 2",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2401_1,
+	    "SeaPORT+4/232 (2401) Port 1",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2401_2,
+	    "SeaPORT+4/232 (2401) Port 2",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2401_3,
+	    "SeaPORT+4/232 (2401) Port 3",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2401_4,
+	    "SeaPORT+4/232 (2401) Port 4",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2402_1,
+	    "SeaPORT+4/485 (2402) Port 1",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2402_2,
+	    "SeaPORT+4/485 (2402) Port 2",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2402_3,
+	    "SeaPORT+4/485 (2402) Port 3",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2402_4,
+	    "SeaPORT+4/485 (2402) Port 4",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2403_1,
+	    "SeaPORT+4 (2403) Port 1",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2403_2,
+	    "SeaPORT+4 (2403) Port 2",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2403_3,
+	    "SeaPORT+4 (2403) Port 3",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2403_4,
+	    "SeaPORT+4 (2403) Port 4",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2801_1,
+	    "SeaLINK+8/232 (2801) Port 1",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2801_2,
+	    "SeaLINK+8/232 (2801) Port 2",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2801_3,
+	    "SeaLINK+8/232 (2801) Port 3",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2801_4,
+	    "SeaLINK+8/232 (2801) Port 4",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2801_5,
+	    "SeaLINK+8/232 (2801) Port 5",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2801_6,
+	    "SeaLINK+8/232 (2801) Port 6",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2801_7,
+	    "SeaLINK+8/232 (2801) Port 7",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2801_8,
+	    "SeaLINK+8/232 (2801) Port 8",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2802_1,
+	    "SeaLINK+8/485 (2802) Port 1",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2802_2,
+	    "SeaLINK+8/485 (2802) Port 2",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2802_3,
+	    "SeaLINK+8/485 (2802) Port 3",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2802_4,
+	    "SeaLINK+8/485 (2802) Port 4",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2802_5,
+	    "SeaLINK+8/485 (2802) Port 5",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2802_6,
+	    "SeaLINK+8/485 (2802) Port 6",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2802_7,
+	    "SeaLINK+8/485 (2802) Port 7",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2802_8,
+	    "SeaLINK+8/485 (2802) Port 8",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2803_1,
+	    "SeaLINK+8 (2803) Port 1",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2803_2,
+	    "SeaLINK+8 (2803) Port 2",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2803_3,
+	    "SeaLINK+8 (2803) Port 3",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2803_4,
+	    "SeaLINK+8 (2803) Port 4",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2803_5,
+	    "SeaLINK+8 (2803) Port 5",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2803_6,
+	    "SeaLINK+8 (2803) Port 6",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2803_7,
+	    "SeaLINK+8 (2803) Port 7",
+	},
+	{
+	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_2803_8,
+	    "SeaLINK+8 (2803) Port 8",
 	},
 	{
 	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_NUB8301,
@@ -4481,7 +5293,7 @@ const struct usb_known_product usb_known_products[] = {
 	    "MULTICARDREADER",
 	},
 	{
-	    USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308,
+	    USB_VENDOR_OCT, USB_PRODUCT_OCT_US2308,
 	    "Serial",
 	},
 	{
@@ -4933,6 +5745,46 @@ const struct usb_known_product usb_known_products[] = {
 	    "KY-BT100 Bluetooth",
 	},
 	{
+	    USB_VENDOR_TESTO, USB_PRODUCT_TESTO_175,
+	    "175/177 USB interface",
+	},
+	{
+	    USB_VENDOR_TESTO, USB_PRODUCT_TESTO_330,
+	    "330 USB interface",
+	},
+	{
+	    USB_VENDOR_TESTO, USB_PRODUCT_TESTO_435,
+	    "435/635/735 USB interface",
+	},
+	{
+	    USB_VENDOR_TESTO, USB_PRODUCT_TESTO_845,
+	    "845 USB interface",
+	},
+	{
+	    USB_VENDOR_TESTO, USB_PRODUCT_TESTO_SERVICE,
+	    "Service adapter",
+	},
+	{
+	    USB_VENDOR_TESTO, USB_PRODUCT_TESTO_580,
+	    "580 USB interface",
+	},
+	{
+	    USB_VENDOR_TESTO, USB_PRODUCT_TESTO_174,
+	    "174 USB interface",
+	},
+	{
+	    USB_VENDOR_TESTO, USB_PRODUCT_TESTO_556,
+	    "556/560 USB interface",
+	},
+	{
+	    USB_VENDOR_TESTO, USB_PRODUCT_TESTO_SERIAL_1,
+	    "USB adapter",
+	},
+	{
+	    USB_VENDOR_TESTO, USB_PRODUCT_TESTO_SERIAL_2,
+	    "USB to serial converter",
+	},
+	{
 	    USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,
 	    "UT-USB41 hub",
 	},
@@ -4953,6 +5805,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Fusion Digital Gamepad",
 	},
 	{
+	    USB_VENDOR_THURLBY, USB_PRODUCT_THURLBY_QL355P,
+	    "QL355P power supply",
+	},
+	{
 	    USB_VENDOR_TODOS, USB_PRODUCT_TODOS_ARGOS_MINI,
 	    "Argos Mini Smartcard",
 	},
@@ -6477,7 +7333,7 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "ActiveWire",
 	},
 	{
-	    USB_VENDOR_BBELECTRONICS,
+	    USB_VENDOR_BBELECTR,
 	    "B&B Electronics",
 	},
 	{
@@ -6713,6 +7569,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "id Quantique",
 	},
 	{
+	    USB_VENDOR_IDTECH,
+	    "ID TECH",
+	},
+	{
 	    USB_VENDOR_ZYDAS,
 	    "ZyDAS Technology",
 	},
@@ -6733,8 +7593,8 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "ASUS",
 	},
 	{
-	    USB_VENDOR_SIIG2,
-	    "SIIG",
+	    USB_VENDOR_OCT,
+	    "Omnidirectional Control Technology",
 	},
 	{
 	    USB_VENDOR_TEKRAM,
@@ -6797,6 +7657,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "DMI",
 	},
 	{
+	    USB_VENDOR_ICOM,
+	    "Icom",
+	},
+	{
 	    USB_VENDOR_MICRODIA,
 	    "Microdia",
 	},
@@ -6825,6 +7689,14 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Tangtop",
 	},
 	{
+	    USB_VENDOR_KOBIL,
+	    "Kobil Systems",
+	},
+	{
+	    USB_VENDOR_POSIFLEX,
+	    "Posiflex Technologies",
+	},
+	{
 	    USB_VENDOR_SMC3,
 	    "SMC",
 	},
@@ -6902,7 +7774,7 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	},
 	{
 	    USB_VENDOR_FALCOM,
-	    "Falcom Wireless Communications GmbH",
+	    "Falcom Wireless Communications",
 	},
 	{
 	    USB_VENDOR_RIM,
@@ -6917,6 +7789,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Qualcomm",
 	},
 	{
+	    USB_VENDOR_THURLBY,
+	    "Thurlby Thandar Instruments",
+	},
+	{
 	    USB_VENDOR_GIGABYTE,
 	    "GIGABYTE",
 	},
@@ -6970,7 +7846,7 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	},
 	{
 	    USB_VENDOR_SPHAIRON,
-	    "Sphairon Access Systems GmbH",
+	    "Sphairon Access Systems",
 	},
 	{
 	    USB_VENDOR_DELORME,
@@ -6997,6 +7873,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Alcatel",
 	},
 	{
+	    USB_VENDOR_INTERBIO,
+	    "InterBiometrics",
+	},
+	{
 	    USB_VENDOR_UNKNOWN3,
 	    "Unknown vendor",
 	},
@@ -7021,6 +7901,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Tenda",
 	},
 	{
+	    USB_VENDOR_TESTO,
+	    "Testo AG",
+	},
+	{
 	    USB_VENDOR_BELKIN2,
 	    "Belkin Components",
 	},
@@ -7285,6 +8169,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Aceeca",
 	},
 	{
+	    USB_VENDOR_PAPOUCH,
+	    "Papouch s.r.o.",
+	},
+	{
 	    USB_VENDOR_AVERATEC,
 	    "Averatec",
 	},
@@ -7329,6 +8217,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "3Com",
 	},
 	{
+	    USB_VENDOR_EVOLUTION,
+	    "Evolution Robotics",
+	},
+	{
 	    USB_VENDOR_HP2,
 	    "Hewlett Packard",
 	},