USB: Update to FreeBSD trunk 2015-11-10

1 files changed, 79 insertions, 4 deletions

diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs.h b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
index 7472c005..cee4d28f 100644
--- a/rtemsbsd/include/rtems/bsd/local/usbdevs.h
+++ b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
@@ -459,6 +459,7 @@
 #define	USB_VENDOR_CONCORDCAMERA	0x0919		/* Concord Camera */
 #define	USB_VENDOR_GARMIN	0x091e		/* Garmin International */
 #define	USB_VENDOR_GOHUBS	0x0921		/* GoHubs */
+#define	USB_VENDOR_DYMO	0x0922		/* DYMO */
 #define	USB_VENDOR_XEROX	0x0924		/* Xerox */
 #define	USB_VENDOR_BIOMETRIC	0x0929		/* American Biometric Company */
 #define	USB_VENDOR_TOSHIBA	0x0930		/* Toshiba */
@@ -531,7 +532,7 @@
 #define	USB_VENDOR_CANYON	0x0c10		/* Canyon */
 #define	USB_VENDOR_ICOM	0x0c26		/* Icom Inc. */
 #define	USB_VENDOR_GNOTOMETRICS	0x0c33		/* GN Otometrics */
-#define	USB_VENDOR_CHICONY2	0x0c45		/* Chicony */
+#define	USB_VENDOR_CHICONY2	0x0c45		/* Chicony / Microdia / Sonix Technology Co., Ltd. */
 #define	USB_VENDOR_REINERSCT	0x0c4b		/* Reiner-SCT */
 #define	USB_VENDOR_SEALEVEL	0x0c52		/* Sealevel System */
 #define	USB_VENDOR_JETI	0x0c6c		/* Jeti */
@@ -693,6 +694,7 @@
 #define	USB_VENDOR_SWEEX2	0x177f		/* Sweex */
 #define	USB_VENDOR_METAGEEK	0x1781		/* MetaGeek */
 #define	USB_VENDOR_KAMSTRUP	0x17a8		/* Kamstrup A/S */
+#define	USB_VENDOR_DISPLAYLINK	0x17e9		/* DisplayLink */
 #define	USB_VENDOR_LENOVO	0x17ef		/* Lenovo */
 #define	USB_VENDOR_WAVESENSE	0x17f4		/* WaveSense */
 #define	USB_VENDOR_VAISALA	0x1843		/* Vaisala */
@@ -781,6 +783,7 @@
 #define	USB_VENDOR_NETGEAR4	0x9846		/* Netgear */
 #define	USB_VENDOR_MARVELL	0x9e88		/* Marvell Technology Group Ltd. */
 #define	USB_VENDOR_3COM3	0xa727		/* 3Com */
+#define	USB_VENDOR_CACE	0xcace		/* CACE Technologies */
 #define	USB_VENDOR_EVOLUTION	0xdeee		/* Evolution Robotics products */
 #define	USB_VENDOR_DATAAPEX	0xdaae		/* DataApex */
 #define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
@@ -868,6 +871,7 @@
 #define	USB_PRODUCT_ACCTON_RT3070_5	0xd522		/* RT3070 */
 #define	USB_PRODUCT_ACCTON_RTL8192SU	0xc512		/* RTL8192SU */
 #define	USB_PRODUCT_ACCTON_ZD1211B	0xe501		/* ZD1211B */
+#define	USB_PRODUCT_ACCTON_WN7512	0xf522		/* WN7512 */
 
 /* Aceeca products */
 #define	USB_PRODUCT_ACEECA_MEZ1000	0x0001		/* MEZ1000 RDA */
@@ -1228,6 +1232,11 @@
 #define	USB_PRODUCT_ATHEROS2_AR5523_2_NF	0x0004		/* AR5523 (no firmware) */
 #define	USB_PRODUCT_ATHEROS2_AR5523_3	0x0005		/* AR5523 */
 #define	USB_PRODUCT_ATHEROS2_AR5523_3_NF	0x0006		/* AR5523 (no firmware) */
+#define	USB_PRODUCT_ATHEROS2_TG121N	0x1001		/* TG121N */
+#define	USB_PRODUCT_ATHEROS2_WN821NV2	0x1002		/* WN821NV2 */
+#define	USB_PRODUCT_ATHEROS2_3CRUSBN275	0x1010		/* 3CRUSBN275 */
+#define	USB_PRODUCT_ATHEROS2_WN612	0x1011		/* WN612 */
+#define	USB_PRODUCT_ATHEROS2_AR9170	0x9170		/* AR9170 */
 
 /* Atmel Comp. products */
 #define	USB_PRODUCT_ATMEL_STK541	0x2109		/* Zigbee Controller */
@@ -1243,6 +1252,9 @@
 /* Avision products */
 #define	USB_PRODUCT_AVISION_1200U	0x0268		/* 1200U scanner */
 
+/* AVM products */
+#define	USB_PRODUCT_AVM_FRITZWLAN	0x8401		/* FRITZ!WLAN N */
+
 /* Axesstel products */
 #define	USB_PRODUCT_AXESSTEL_DATAMODEM	0x1000		/* Data Modem */
 
@@ -1345,6 +1357,9 @@
 #define	USB_PRODUCT_BTC_BTC6100	0x5550		/* 6100C Keyboard */
 #define	USB_PRODUCT_BTC_BTC7932	0x6782		/* Keyboard with mouse port */
 
+/* CACE Technologies products */
+#define	USB_PRODUCT_CACE_AIRPCAPNX	0x0300		/* AirPcap NX */
+
 /* Canon, Inc. products */
 #define	USB_PRODUCT_CANON_N656U	0x2206		/* CanoScan N656U */
 #define	USB_PRODUCT_CANON_N1220U	0x2207		/* CanoScan N1220U */
@@ -1413,6 +1428,7 @@
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GR	0x0023		/* WUSB54GR */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSBF54G	0x0024		/* WUSBF54G */
 #define	USB_PRODUCT_CISCOLINKSYS_AE1000	0x002f		/* AE1000 */
+#define	USB_PRODUCT_CISCOLINKSYS_USB3GIGV1	0x0041		/* USB3GIGV1 USB Ethernet Adapter */
 #define	USB_PRODUCT_CISCOLINKSYS2_RT3070	0x4001		/* RT3070 */
 #define	USB_PRODUCT_CISCOLINKSYS3_RT3070	0x0101		/* RT3070 */
 
@@ -1604,6 +1620,7 @@
 #define	USB_PRODUCT_DLINK_DSB650TX4	0x200c		/* 10/100 Ethernet */
 #define	USB_PRODUCT_DLINK_DWL120E	0x3200		/* DWL-120 rev E */
 #define	USB_PRODUCT_DLINK_DWA125D1	0x330f		/* DWA-125 rev D1 */
+#define	USB_PRODUCT_DLINK_DWA123D1	0x3310		/* DWA-123 rev D1 */
 #define	USB_PRODUCT_DLINK_DWL122	0x3700		/* DWL-122 */
 #define	USB_PRODUCT_DLINK_DWLG120	0x3701		/* DWL-G120 */
 #define	USB_PRODUCT_DLINK_DWL120F	0x3702		/* DWL-120 rev F */
@@ -1643,8 +1660,10 @@
 #define	USB_PRODUCT_DLINK2_RTL8192SU_1	0x3300		/* RTL8192SU */
 #define	USB_PRODUCT_DLINK2_RTL8192SU_2	0x3302		/* RTL8192SU */
 #define	USB_PRODUCT_DLINK2_DWA131A1	0x3303		/* DWA-131 A1 */
+#define	USB_PRODUCT_DLINK2_DWA160A2	0x3a09		/* DWA-160 A2 */
 #define	USB_PRODUCT_DLINK2_DWA120	0x3a0c		/* DWA-120 */
 #define	USB_PRODUCT_DLINK2_DWA120_NF	0x3a0d		/* DWA-120 (no firmware) */
+#define	USB_PRODUCT_DLINK2_DWA130D1	0x3a0f		/* DWA-130 D1 */
 #define	USB_PRODUCT_DLINK2_DWLG122C1	0x3c03		/* DWL-G122 c1 */
 #define	USB_PRODUCT_DLINK2_WUA1340	0x3c04		/* WUA-1340 */
 #define	USB_PRODUCT_DLINK2_DWA111	0x3c06		/* DWA-111 */
@@ -1655,12 +1674,35 @@
 #define	USB_PRODUCT_DLINK2_RT3070_1	0x3c0d		/* RT3070 */
 #define	USB_PRODUCT_DLINK2_RT3070_2	0x3c0e		/* RT3070 */
 #define	USB_PRODUCT_DLINK2_RT3070_3	0x3c0f		/* RT3070 */
+#define	USB_PRODUCT_DLINK2_DWA160A1	0x3c10		/* DWA-160 A1 */
 #define	USB_PRODUCT_DLINK2_RT2870_2	0x3c11		/* RT2870 */
 #define	USB_PRODUCT_DLINK2_DWA130	0x3c13		/* DWA-130 */
 #define	USB_PRODUCT_DLINK2_RT3070_4	0x3c15		/* RT3070 */
 #define	USB_PRODUCT_DLINK2_RT3070_5	0x3c16		/* RT3070 */
 #define	USB_PRODUCT_DLINK3_DWM652	0x3e04		/* DWM-652 */
 
+/* DisplayLink products */
+#define	USB_PRODUCT_DISPLAYLINK_LCD4300U	0x01ba		/* LCD-4300U */
+#define	USB_PRODUCT_DISPLAYLINK_LCD8000U	0x01bb		/* LCD-8000U */
+#define	USB_PRODUCT_DISPLAYLINK_LD220	0x0100		/* Samsung LD220 */
+#define	USB_PRODUCT_DISPLAYLINK_GUC2020	0x0059		/* IOGEAR DVI GUC2020 */
+#define	USB_PRODUCT_DISPLAYLINK_VCUD60	0x0136		/* Rextron DVI */
+#define	USB_PRODUCT_DISPLAYLINK_CONV	0x0138		/* StarTech CONV-USB2DVI */
+#define	USB_PRODUCT_DISPLAYLINK_DLDVI	0x0141		/* DisplayLink DVI */
+#define	USB_PRODUCT_DISPLAYLINK_VGA10	0x015a		/* CMP-USBVGA10 */
+#define	USB_PRODUCT_DISPLAYLINK_WSDVI	0x0198		/* WS Tech DVI */
+#define	USB_PRODUCT_DISPLAYLINK_EC008	0x019b		/* EasyCAP008 DVI */
+#define	USB_PRODUCT_DISPLAYLINK_HPDOCK	0x01d4		/* HP USB Docking */
+#define	USB_PRODUCT_DISPLAYLINK_NL571	0x01d7		/* HP USB DVI */
+#define	USB_PRODUCT_DISPLAYLINK_M01061	0x01e2		/* Lenovo DVI */
+#define	USB_PRODUCT_DISPLAYLINK_SWDVI	0x024c		/* SUNWEIT DVI */
+#define	USB_PRODUCT_DISPLAYLINK_NBDOCK	0x0215		/* VideoHome NBdock1920 */
+#define	USB_PRODUCT_DISPLAYLINK_LUM70	0x02a9		/* Lilliput UM-70 */
+#define	USB_PRODUCT_DISPLAYLINK_UM7X0	0x401a		/* nanovision MiMo */
+#define	USB_PRODUCT_DISPLAYLINK_LT1421	0x03e0		/* Lenovo ThinkVision LT1421 */
+#define	USB_PRODUCT_DISPLAYLINK_POLARIS2	0x0117		/* Polaris2 USB dock */
+#define	USB_PRODUCT_DISPLAYLINK_PLUGABLE	0x0377		/* Plugable docking station */
+
 /* DMI products */
 #define	USB_PRODUCT_DMI_CFSM_RW	0xa109		/* CF/SM Reader/Writer */
 #define	USB_PRODUCT_DMI_DISK	0x2bcf		/* Generic Disk */
@@ -1677,6 +1719,9 @@
 #define	USB_PRODUCT_DRESDENELEKTRONIK_DE_RFNODE	0x001c		/* deRFnode */
 #define	USB_PRODUCT_DRESDENELEKTRONIK_LEVELSHIFTERSTICKLOWCOST	0x0022		/* Levelshifter Stick Low Cost */
 
+/* DYMO */
+#define	USB_PRODUCT_DYMO_LABELMANAGERPNP	0x1001		/* DYMO LabelManager PnP */
+
 /* Dynastream Innovations */
 #define	USB_PRODUCT_DYNASTREAM_ANTDEVBOARD	0x1003		/* ANT dev board */
 #define	USB_PRODUCT_DYNASTREAM_ANT2USB	0x1004		/* ANT2USB */
@@ -1718,6 +1763,7 @@
 #define	USB_PRODUCT_ELECOM_LDUSBTX0	0x200c		/* LD-USB/TX */
 #define	USB_PRODUCT_ELECOM_LDUSBTX1	0x4002		/* LD-USB/TX */
 #define	USB_PRODUCT_ELECOM_LDUSBLTX	0x4005		/* LD-USBL/TX */
+#define	USB_PRODUCT_ELECOM_WDC150SU2M	0x4008		/* WDC-150SU2M */
 #define	USB_PRODUCT_ELECOM_LDUSBTX2	0x400b		/* LD-USB/TX */
 #define	USB_PRODUCT_ELECOM_LDUSB20	0x4010		/* LD-USB20 */
 #define	USB_PRODUCT_ELECOM_UCSGT	0x5003		/* UC-SGT */
@@ -1854,6 +1900,7 @@
 #define	USB_PRODUCT_FSC_E5400	0x1009		/* PrismGT USB 2.0 WLAN */
 
 /* Future Technology Devices products */
+#define	USB_PRODUCT_FTDI_SCX8_USB_PHOENIX	0x5259		/* SCx8 USB Phoenix interface */
 #define	USB_PRODUCT_FTDI_SERIAL_8U100AX	0x8372		/* 8U100AX Serial */
 #define	USB_PRODUCT_FTDI_SERIAL_8U232AM	0x6001		/* 8U232AM Serial */
 #define	USB_PRODUCT_FTDI_SERIAL_8U232AM4	0x6004		/* 8U232AM Serial */
@@ -2366,6 +2413,7 @@
 #define	USB_PRODUCT_HUAWEI_K4505_INIT	0x1521		/* K4505 Initial */
 #define	USB_PRODUCT_HUAWEI_K3772_INIT	0x1526		/* K3772 Initial */
 #define	USB_PRODUCT_HUAWEI_E3272_INIT	0x155b		/* LTE modem initial */
+#define	USB_PRODUCT_HUAWEI_ME909U	0x1573		/* LTE modem */
 #define	USB_PRODUCT_HUAWEI_R215_INIT	0x1582		/* LTE modem initial */
 #define	USB_PRODUCT_HUAWEI_R215	0x1588		/* LTE modem */
 #define	USB_PRODUCT_HUAWEI_ETS2055	0x1803		/* CDMA modem */
@@ -2444,6 +2492,7 @@
 #define	USB_PRODUCT_IODATA_USBWNB11A	0x0919		/* USB WN-B11 */
 #define	USB_PRODUCT_IODATA_USBWNB11	0x0922		/* USB Airport WN-B11 */
 #define	USB_PRODUCT_IODATA_ETGUS2	0x0930		/* ETG-US2 */
+#define	USB_PRODUCT_IODATA_WNGDNUS2	0x093f		/* WN-GDN/US2 */
 #define	USB_PRODUCT_IODATA_RT3072_1	0x0944		/* RT3072 */
 #define	USB_PRODUCT_IODATA_RT3072_2	0x0945		/* RT3072 */
 #define	USB_PRODUCT_IODATA_RT3072_3	0x0947		/* RT3072 */
@@ -2609,6 +2658,7 @@
 #define	USB_PRODUCT_LEADTEK_9531	0x2101		/* 9531 GPS */
 
 /* Lenovo products */
+#define	USB_PRODUCT_LENOVO_GIGALAN	0x304b		/* USB 3.0 Ethernet */
 #define	USB_PRODUCT_LENOVO_ETHERNET	0x7203		/* USB 2.0 Ethernet */
 
 /* Lexar products */
@@ -2998,11 +3048,12 @@
 #define	USB_PRODUCT_MELCO_WLRUCGAOSS	0x0119		/* WLR-UC-G-AOSS */
 #define	USB_PRODUCT_MELCO_WLIUCAG300N	0x012e		/* WLI-UC-AG300N */
 #define	USB_PRODUCT_MELCO_WLIUCG	0x0137		/* WLI-UC-G */
-#define	USB_PRODUCT_MELCO_RT2870_1	0x0148		/* RT2870 */
+#define	USB_PRODUCT_MELCO_WLIUCG300HP	0x0148		/* WLI-UC-G300HP */
 #define	USB_PRODUCT_MELCO_RT2870_2	0x0150		/* RT2870 */
 #define	USB_PRODUCT_MELCO_WLIUCGN	0x015d		/* WLI-UC-GN */
 #define	USB_PRODUCT_MELCO_WLIUCG301N	0x016f		/* WLI-UC-G301N */
 #define	USB_PRODUCT_MELCO_WLIUCGNM	0x01a2		/* WLI-UC-GNM */
+#define	USB_PRODUCT_MELCO_WLIUCG300HPV1	0x01a8		/* WLI-UC-G300HP-V1 */
 #define	USB_PRODUCT_MELCO_WLIUCGNM2	0x01ee		/* WLI-UC-GNM2 */
 
 /* Merlin products */
@@ -3025,6 +3076,11 @@
 #define	USB_PRODUCT_MEI_CASHFLOW_SC	0x1100		/* Cashflow-SC Cash Acceptor */
 #define	USB_PRODUCT_MEI_S2000	0x1101		/* Series 2000 Combo Acceptor */
 
+/* Microdia / Sonix Techonology Co., Ltd. products */
+#define	USB_PRODUCT_CHICONY2_YUREX	0x1010		/* YUREX */
+#define	USB_PRODUCT_CHICONY2_CAM_1	0x62c0		/* CAM_1 */
+#define	USB_PRODUCT_CHICONY2_TEMPER	0x7401		/* TEMPer sensor */
+
 /* Micro Star International products */
 #define	USB_PRODUCT_MSI_BT_DONGLE	0x1967		/* Bluetooth USB dongle */
 #define	USB_PRODUCT_MSI_RT3070_1	0x3820		/* RT3070 */
@@ -3177,6 +3233,7 @@
 /* NEC products */
 #define	USB_PRODUCT_NEC_HUB_0050	0x0050		/* USB 2.0 7-Port Hub */
 #define	USB_PRODUCT_NEC_HUB_005A	0x005a		/* USB 2.0 4-Port Hub */
+#define	USB_PRODUCT_NEC_WL300NUG	0x0249		/* WL300NU-G */
 #define	USB_PRODUCT_NEC_HUB	0x55aa		/* hub */
 #define	USB_PRODUCT_NEC_HUB_B	0x55ab		/* hub */
 
@@ -3204,12 +3261,17 @@
 #define	USB_PRODUCT_NETGEAR_FA101	0x1020		/* Ethernet 10/100, USB1.1 */
 #define	USB_PRODUCT_NETGEAR_FA120	0x1040		/* USB 2.0 Ethernet */
 #define	USB_PRODUCT_NETGEAR_M4100	0x1100		/* M4100/M5300/M7100 series switch */
-#define	USB_PRODUCT_NETGEAR_WG111V2_2	0x4240		/* PrismGT USB 2.0 WLAN */
+#define	USB_PRODUCT_NETGEAR_WG111V1_2	0x4240		/* PrismGT USB 2.0 WLAN */
 #define	USB_PRODUCT_NETGEAR_WG111V3	0x4260		/* WG111v3 */
 #define	USB_PRODUCT_NETGEAR_WG111U	0x4300		/* WG111U */
 #define	USB_PRODUCT_NETGEAR_WG111U_NF	0x4301		/* WG111U (no firmware) */
 #define	USB_PRODUCT_NETGEAR_WG111V2	0x6a00		/* WG111V2 */
+#define	USB_PRODUCT_NETGEAR_WN111V2	0x9001		/* WN111V2 */
+#define	USB_PRODUCT_NETGEAR_WNDA3100	0x9010		/* WNDA3100 */
+#define	USB_PRODUCT_NETGEAR_WNDA4100	0x9012		/* WNDA4100 */
+#define	USB_PRODUCT_NETGEAR_WNDA3200	0x9018		/* WNDA3200 */
 #define	USB_PRODUCT_NETGEAR_RTL8192CU	0x9021		/* RTL8192CU */
+#define	USB_PRODUCT_NETGEAR_WNA1000	0x9040		/* WNA1000 */
 #define	USB_PRODUCT_NETGEAR_WNA1000M	0x9041		/* WNA1000M */
 #define	USB_PRODUCT_NETGEAR2_MA101	0x4100		/* MA101 */
 #define	USB_PRODUCT_NETGEAR2_MA101B	0x4102		/* MA101 Rev B */
@@ -3473,6 +3535,7 @@
 #define	USB_PRODUCT_PLANEX2_RTL8188CUS	0x1201		/* RTL8188CUS */
 #define	USB_PRODUCT_PLANEX2_GW_US11S	0x3220		/* GW-US11S WLAN */
 #define	USB_PRODUCT_PLANEX2_GW_US54GXS	0x5303		/* GW-US54GXS WLAN */
+#define	USB_PRODUCT_PLANEX2_GW_US300	0x5304		/* GW-US300 */
 #define	USB_PRODUCT_PLANEX2_RTL8188CU_1	0xab2a		/* RTL8188CU */
 #define	USB_PRODUCT_PLANEX2_RTL8188CU_2	0xed17		/* RTL8188CU */
 #define	USB_PRODUCT_PLANEX2_RTL8188CU_3	0x4902		/* RTL8188CU */
@@ -3653,6 +3716,7 @@
 #define	USB_PRODUCT_QUALCOMMINC_E0078	0x0078		/* 3G modem */
 #define	USB_PRODUCT_QUALCOMMINC_E0082	0x0082		/* 3G modem */
 #define	USB_PRODUCT_QUALCOMMINC_E0086	0x0086		/* 3G modem */
+#define	USB_PRODUCT_QUALCOMMINC_MF112	0x0103		/* 3G modem */
 #define	USB_PRODUCT_QUALCOMMINC_SURFSTICK	0x0117		/* 1&1 Surf Stick */
 #define	USB_PRODUCT_QUALCOMMINC_K3772_Z_INIT	0x1179		/* K3772-Z Initial */
 #define	USB_PRODUCT_QUALCOMMINC_K3772_Z	0x1181		/* K3772-Z */
@@ -3723,6 +3787,7 @@
 #define	USB_PRODUCT_REALTEK_RTL8188ETV	0x0179		/* RTL8188ETV */
 #define	USB_PRODUCT_REALTEK_RTL8188CTV	0x018a		/* RTL8188CTV */
 #define	USB_PRODUCT_REALTEK_USBKR100	0x8150		/* USBKR100 USB Ethernet */
+#define	USB_PRODUCT_REALTEK_RTL8153	0x8153		/* RTL8153 USB Ethernet */
 #define	USB_PRODUCT_REALTEK_RTL8188CE_0	0x8170		/* RTL8188CE */
 #define	USB_PRODUCT_REALTEK_RTL8171	0x8171		/* RTL8171 */
 #define	USB_PRODUCT_REALTEK_RTL8172	0x8172		/* RTL8172 */
@@ -3735,6 +3800,7 @@
 #define	USB_PRODUCT_REALTEK_RTL8188CU_2	0x817b		/* RTL8188CU */
 #define	USB_PRODUCT_REALTEK_RTL8187	0x8187		/* RTL8187 Wireless Adapter */
 #define	USB_PRODUCT_REALTEK_RTL8187B_0	0x8189		/* RTL8187B Wireless Adapter */
+#define	USB_PRODUCT_REALTEK_RTL8188CU_3	0x8191		/* RTL8188CU */
 #define	USB_PRODUCT_REALTEK_RTL8196EU	0x8196		/* RTL8196EU */
 #define	USB_PRODUCT_REALTEK_RTL8187B_1	0x8197		/* RTL8187B Wireless Adapter */
 #define	USB_PRODUCT_REALTEK_RTL8187B_2	0x8198		/* RTL8187B Wireless Adapter */
@@ -4008,7 +4074,8 @@
 #define	USB_PRODUCT_SIERRA_E6892	0x6892		/* E6892 */
 #define	USB_PRODUCT_SIERRA_E6893	0x6893		/* E6893 */
 #define	USB_PRODUCT_SIERRA_MC8700	0x68A3		/* MC8700 */
-#define	USB_PRODUCT_SIERRA_AIRCARD875	0x6820		/* Aircard 875 HSDPA */
+#define	USB_PRODUCT_SIERRA_MC7354	0x68C0		/* MC7354 */
+#define	USB_PRODUCT_SIERRA_MC7355	0x9041		/* MC7355 */
 #define	USB_PRODUCT_SIERRA_AC313U	0x68aa		/* Sierra Wireless AirCard 313U */
 #define	USB_PRODUCT_SIERRA_TRUINSTALL	0x0fff		/* Aircard Tru Installer */
 
@@ -4387,6 +4454,7 @@
 
 /* TRENDnet products */
 #define	USB_PRODUCT_TRENDNET_RTL8192CU	0x624d		/* RTL8192CU */
+#define	USB_PRODUCT_TRENDNET_TEW646UBH	0x646b		/* TEW-646UBH */
 #define	USB_PRODUCT_TRENDNET_RTL8188CU	0x648b		/* RTL8188CU */
 
 /* Tripp-Lite products */
@@ -4540,8 +4608,10 @@
 #define	USB_PRODUCT_WINMAXGROUP_FLASH64MC	0x6660		/* USB Flash Disk 64M-C */
 
 /* Wistron NeWeb products */
+#define	USB_PRODUCT_WISTRONNEWEB_WNC0600	0x0326		/* WNC-0600USB */
 #define	USB_PRODUCT_WISTRONNEWEB_UR045G	0x0427		/* PrismGT USB 2.0 WLAN */
 #define	USB_PRODUCT_WISTRONNEWEB_UR055G	0x0711		/* UR055G */
+#define	USB_PRODUCT_WISTRONNEWEB_O8494	0x0804		/* ORiNOCO 802.11n */
 #define	USB_PRODUCT_WISTRONNEWEB_AR5523_1	0x0826		/* AR5523 */
 #define	USB_PRODUCT_WISTRONNEWEB_AR5523_1_NF	0x0827		/* AR5523 (no firmware) */
 #define	USB_PRODUCT_WISTRONNEWEB_AR5523_2	0x082a		/* AR5523 */
@@ -4590,7 +4660,9 @@
 #define	USB_PRODUCT_ZCOM_XM142	0x0015		/* XM-142 */
 #define	USB_PRODUCT_ZCOM_ZD1211B	0x001a		/* ZD1211B */
 #define	USB_PRODUCT_ZCOM_RT2870_1	0x0022		/* RT2870 */
+#define	USB_PRODUCT_ZCOM_UB81	0x0023		/* UB81 */
 #define	USB_PRODUCT_ZCOM_RT2870_2	0x0025		/* RT2870 */
+#define	USB_PRODUCT_ZCOM_UB82	0x0026		/* UB82 */
 
 /* Zinwell products */
 #define	USB_PRODUCT_ZINWELL_RT2570	0x0260		/* RT2570 */
@@ -4609,6 +4681,7 @@
 /* Zydas Technology Corporation products */
 #define	USB_PRODUCT_ZYDAS_ZD1211	0x1211		/* ZD1211 WLAN abg */
 #define	USB_PRODUCT_ZYDAS_ZD1211B	0x1215		/* ZD1211B */
+#define	USB_PRODUCT_ZYDAS_ZD1221	0x1221		/* ZD1221 */
 
 /* ZyXEL Communication Co. products */
 #define	USB_PRODUCT_ZYXEL_OMNI56K	0x1500		/* Omni 56K Plus */
@@ -4620,6 +4693,8 @@
 #define	USB_PRODUCT_ZYXEL_G220V2	0x340f		/* G-220 v2 */
 #define	USB_PRODUCT_ZYXEL_G202	0x3410		/* G-202 */
 #define	USB_PRODUCT_ZYXEL_RT2870_1	0x3416		/* RT2870 */
+#define	USB_PRODUCT_ZYXEL_NWD271N	0x3417		/* NWD-271N */
+#define	USB_PRODUCT_ZYXEL_NWD211AN	0x3418		/* NWD-211AN */
 #define	USB_PRODUCT_ZYXEL_RT2870_2	0x341a		/* RT2870 */
 #define	USB_PRODUCT_ZYXEL_RT3070	0x341e		/* NWD2105 */
 #define	USB_PRODUCT_ZYXEL_RTL8192CU	0x341f		/* RTL8192CU */