Author: hselasky
Date: Fri Oct 31 08:14:13 2014
New Revision: 273892
URL: https://svnweb.freebsd.org/changeset/base/273892
Log:
MFC r264801, r264802, r264934, r273181, r273216 and r273252:
Add more USB IDs.
Modified:
stable/9/sys/dev/usb/serial/u3g.c
stable/9/sys/dev/usb/serial/uftdi.c
stable/9/sys/dev/usb/usbdevs
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/usb/serial/u3g.c
==============================================================================
--- stable/9/sys/dev/usb/serial/u3g.c Fri Oct 31 08:12:04 2014
(r273891)
+++ stable/9/sys/dev/usb/serial/u3g.c Fri Oct 31 08:14:13 2014
(r273892)
@@ -317,6 +317,8 @@ static const STRUCT_USB_HOST_ID u3g_devs
U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI),
U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI),
U3G_DEV(HUAWEI, E1820, U3GINIT_HUAWEISCSI),
+ U3G_DEV(HUAWEI, K3772, U3GINIT_HUAWEI),
+ U3G_DEV(HUAWEI, K3772_INIT, U3GINIT_HUAWEISCSI2),
U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI),
U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI),
U3G_DEV(HUAWEI, K3770, U3GINIT_HUAWEI),
@@ -466,7 +468,8 @@ static const STRUCT_USB_HOST_ID u3g_devs
U3G_DEV(QUALCOMMINC, SURFSTICK, 0),
U3G_DEV(QUALCOMMINC, E2002, 0),
U3G_DEV(QUALCOMMINC, E2003, 0),
- U3G_DEV(QUALCOMMINC, K3772_Z, U3GINIT_SCSIEJECT),
+ U3G_DEV(QUALCOMMINC, K3772_Z, 0),
+ U3G_DEV(QUALCOMMINC, K3772_Z_INIT, U3GINIT_SCSIEJECT),
U3G_DEV(QUALCOMMINC, MF626, 0),
U3G_DEV(QUALCOMMINC, MF628, 0),
U3G_DEV(QUALCOMMINC, MF633R, 0),
Modified: stable/9/sys/dev/usb/serial/uftdi.c
==============================================================================
--- stable/9/sys/dev/usb/serial/uftdi.c Fri Oct 31 08:12:04 2014
(r273891)
+++ stable/9/sys/dev/usb/serial/uftdi.c Fri Oct 31 08:14:13 2014
(r273892)
@@ -298,6 +298,7 @@ static const STRUCT_USB_HOST_ID uftdi_de
UFTDI_DEV(CONTEC, COM1USBH, 0),
UFTDI_DEV(DRESDENELEKTRONIK, SENSORTERMINALBOARD, 0),
UFTDI_DEV(DRESDENELEKTRONIK, WIRELESSHANDHELDTERMINAL, 0),
+ UFTDI_DEV(DRESDENELEKTRONIK, DE_RFNODE, 0),
UFTDI_DEV(DRESDENELEKTRONIK, LEVELSHIFTERSTICKLOWCOST, 0),
UFTDI_DEV(ELEKTOR, FT323R, 0),
UFTDI_DEV(EVOLUTION, ER1, 0),
@@ -327,7 +328,6 @@ static const STRUCT_USB_HOST_ID uftdi_de
UFTDI_DEV(FTDI, ATIK_ATK16HRC, 0),
UFTDI_DEV(FTDI, ATIK_ATK16IC, 0),
UFTDI_DEV(FTDI, BCS_SE923, 0),
- UFTDI_DEV(FTDI, BEAGLEBONE, UFTDI_JTAG_IFACE(0)),
UFTDI_DEV(FTDI, CANDAPTER, 0),
UFTDI_DEV(FTDI, CANUSB, 0),
UFTDI_DEV(FTDI, CCSICDU20_0, 0),
@@ -537,6 +537,8 @@ static const STRUCT_USB_HOST_ID uftdi_de
UFTDI_DEV(FTDI, VNHCPCUSB_D, 0),
UFTDI_DEV(FTDI, WESTREX_MODEL_777, 0),
UFTDI_DEV(FTDI, WESTREX_MODEL_8900F, 0),
+ UFTDI_DEV(FTDI, XDS100V2, UFTDI_JTAG_IFACE(0)),
+ UFTDI_DEV(FTDI, XDS100V3, UFTDI_JTAG_IFACE(0)),
UFTDI_DEV(FTDI, XF_547, 0),
UFTDI_DEV(FTDI, XF_640, 0),
UFTDI_DEV(FTDI, XF_642, 0),
Modified: stable/9/sys/dev/usb/usbdevs
==============================================================================
--- stable/9/sys/dev/usb/usbdevs Fri Oct 31 08:12:04 2014
(r273891)
+++ stable/9/sys/dev/usb/usbdevs Fri Oct 31 08:14:13 2014
(r273892)
@@ -713,6 +713,7 @@ vendor LONGCHEER 0x1c9e Longcheer Holdin
vendor MPMAN 0x1cae MpMan
vendor DRESDENELEKTRONIK 0x1cf1 dresden elektronik
vendor NEOTEL 0x1d09 Neotel
+vendor DREAMLINK 0x1d34 Dream Link
vendor PEGATRON 0x1d4d Pegatron
vendor QISDA 0x1da5 Qisda
vendor METAGEEK2 0x1dd5 MetaGeek
@@ -1173,6 +1174,7 @@ product ASIX AX88772B_1 0x7e2b AX88772B
/* ASUS products */
product ASUS2 USBN11 0x0b05 USB-N11
+product ASUS RT2570 0x1706 RT2500USB Wireless Adapter
product ASUS WL167G 0x1707 WL-167g Wireless Adapter
product ASUS WL159G 0x170c WL-159g
product ASUS A9T_WIFI 0x171b A9T wireless
@@ -1186,16 +1188,17 @@ product ASUS RT2870_3 0x1742 RT2870
product ASUS RT2870_4 0x1760 RT2870
product ASUS RT2870_5 0x1761 RT2870
product ASUS USBN13 0x1784 USB-N13
-product ASUS RT3070_1 0x1790 RT3070
product ASUS USBN10 0x1786 USB-N10
+product ASUS RT3070_1 0x1790 RT3070
+product ASUS RTL8192SU 0x1791 RTL8192SU
+product ASUS USB_N53 0x179d ASUS Black Diamond Dual Band USB-N53
product ASUS RTL8192CU 0x17ab RTL8192CU
product ASUS USBN66 0x17ad USB-N66
-product ASUS RTL8192SU 0x1791 RTL8192SU
+product ASUS USBN10NANO 0x17ba USB-N10 Nano
+product ASUS USBAC51 0x17d1 USB-AC51
product ASUS A730W 0x4202 ASUS MyPal A730W
product ASUS P535 0x420f ASUS P535 PDA
-product ASUS GMSC 0x422f ASUS Generic Mass Storage
-product ASUS RT2570 0x1706 RT2500USB Wireless Adapter
-product ASUS USB_N53 0x179d ASUS Black Diamond Dual Band USB-N53
+product ASUS GMSC 0x422f ASUS Generic Mass Storage
/* ATen products */
product ATEN UC1284 0x2001 Parallel printer
@@ -1378,6 +1381,7 @@ product CHIC CYPRESS 0x0003 Cypress USB
product CHICONY KB8933 0x0001 KB-8933 keyboard
product CHICONY KU0325 0x0116 KU-0325 keyboard
product CHICONY CNF7129 0xb071 Notebook Web Camera
+product CHICONY HDUVCCAM 0xb40a HD UVC WebCam
product CHICONY RTL8188CUS_1 0xaff7 RTL8188CUS
product CHICONY RTL8188CUS_2 0xaff8 RTL8188CUS
product CHICONY RTL8188CUS_3 0xaff9 RTL8188CUS
@@ -1591,6 +1595,7 @@ product DLINK DUBE100 0x1a00 10/100 Eth
product DLINK DUBE100C1 0x1a02 DUB-E100 rev C1
product DLINK DSB650TX4 0x200c 10/100 Ethernet
product DLINK DWL120E 0x3200 DWL-120 rev E
+product DLINK DWA125D1 0x330f DWA-125 rev D1
product DLINK DWL122 0x3700 DWL-122
product DLINK DWLG120 0x3701 DWL-G120
product DLINK DWL120F 0x3702 DWL-120 rev F
@@ -1653,9 +1658,13 @@ product DMI DISK 0x2bcf Generic Disk
/* DrayTek products */
product DRAYTEK VIGOR550 0x0550 Vigor550
+/* Dream Link products */
+product DREAMLINK DL100B 0x0004 USB Webmail Notifier
+
/* dresden elektronik products */
product DRESDENELEKTRONIK SENSORTERMINALBOARD 0x0001 SensorTerminalBoard
product DRESDENELEKTRONIK WIRELESSHANDHELDTERMINAL 0x0004 Wireless Handheld
Terminal
+product DRESDENELEKTRONIK DE_RFNODE 0x001c deRFnode
product DRESDENELEKTRONIK LEVELSHIFTERSTICKLOWCOST 0x0022 Levelshifter Stick
Low Cost
/* Dynastream Innovations */
@@ -1844,7 +1853,8 @@ product FTDI 232H 0x6014 FTDI compatibl
product FTDI 232EX 0x6015 FTDI compatible adapter
product FTDI SERIAL_2232D 0x9e90 FT2232D Dual port Serial
product FTDI SERIAL_4232H 0x6011 FT4232H Quad port Serial
-product FTDI BEAGLEBONE 0xa6d0 BeagleBone
+product FTDI XDS100V2 0xa6d0 TI XDS100V1/V2 and early Beaglebones
+product FTDI XDS100V3 0xa6d1 TI XDS100V3
product FTDI KTLINK 0xbbe2 KT-LINK Embedded Hackers Multitool
product FTDI TURTELIZER2 0xbdc8 egnite Turtelizer 2 JTAG/RS232 Adapter
/* Gude Analog- und Digitalsysteme products also uses FTDI's id: */
@@ -2337,15 +2347,21 @@ product HUAWEI K4505 0x1464 3G modem
product HUAWEI K3765 0x1465 3G modem
product HUAWEI E1820 0x14ac E1820 HSPA+ USB Slider
product HUAWEI K3770 0x14c9 3G modem
+product HUAWEI K3772 0x14cf K3772
product HUAWEI K3770_INIT 0x14d1 K3770 Initial
product HUAWEI E3131_INIT 0x14fe 3G modem initial
product HUAWEI E392 0x1505 LTE modem
product HUAWEI E3131 0x1506 3G modem
product HUAWEI K3765_INIT 0x1520 K3765 Initial
product HUAWEI K4505_INIT 0x1521 K4505 Initial
+product HUAWEI K3772_INIT 0x1526 K3772 Initial
+product HUAWEI E3272_INIT 0x155b LTE modem initial
+product HUAWEI R215_INIT 0x1582 LTE modem initial
+product HUAWEI R215 0x1588 LTE modem
product HUAWEI ETS2055 0x1803 CDMA modem
product HUAWEI E173 0x1c05 3G modem
product HUAWEI E173_INIT 0x1c0b 3G modem initial
+product HUAWEI E3272 0x1c1e LTE modem
/* HUAWEI 3com products */
product HUAWEI3COM WUB320G 0x0009 Aolynk WUB320g
@@ -3232,6 +3248,7 @@ product NOVATEL EU740 0x2410 Expedite E
product NOVATEL EU870D 0x2420 Expedite EU870D
product NOVATEL U727 0x4100 Merlin U727 CDMA
product NOVATEL MC950D 0x4400 Novatel MC950D HSUPA
+product NOVATEL MC990D 0x7001 Novatel MC990D
product NOVATEL ZEROCD 0x5010 Novatel ZeroCD
product NOVATEL MIFI2200V 0x5020 Novatel MiFi 2200 CDMA Virgin Mobile
product NOVATEL ZEROCD2 0x5030 Novatel ZeroCD
@@ -3621,7 +3638,8 @@ product QUALCOMMINC E0078 0x0078 3G mode
product QUALCOMMINC E0082 0x0082 3G modem
product QUALCOMMINC E0086 0x0086 3G modem
product QUALCOMMINC SURFSTICK 0x0117 1&1 Surf Stick
-product QUALCOMMINC K3772_Z 0x1179 3G modem
+product QUALCOMMINC K3772_Z_INIT 0x1179 K3772-Z Initial
+product QUALCOMMINC K3772_Z 0x1181 K3772-Z
product QUALCOMMINC ZTE_STOR 0x2000 USB ZTE Storage
product QUALCOMMINC E2002 0x2002 3G modem
product QUALCOMMINC E2003 0x2003 3G modem
@@ -3681,6 +3699,7 @@ product RATOC REXUSB60F 0xb020 USB seri
/* Green House and CompUSA OEM this part */
product REALTEK DUMMY 0x0000 Dummy product
product REALTEK USB20CRW 0x0158 USB20CRW Card Reader
+product REALTEK RTL8188ETV 0x0179 RTL8188ETV
product REALTEK RTL8188CTV 0x018a RTL8188CTV
product REALTEK USBKR100 0x8150 USBKR100 USB Ethernet
product REALTEK RTL8188CE_0 0x8170 RTL8188CE
@@ -3704,6 +3723,7 @@ product REALTEK RTL8191CU 0x8177 RTL8191
product REALTEK RTL8192CU 0x8178 RTL8192CU
product REALTEK RTL8192CE 0x817c RTL8192CE
product REALTEK RTL8188RU_1 0x817d RTL8188RU
+product REALTEK RTL8188RU_3 0x817f RTL8188RU
product REALTEK RTL8712 0x8712 RTL8712
product REALTEK RTL8713 0x8712 RTL8713
product REALTEK RTL8188RU_2 0x317f RTL8188RU
@@ -4122,6 +4142,23 @@ product SMC 2862WG 0xee13 EZ Connect Wi
product SMC2 2020HUB 0x2020 USB Hub
product SMC2 2514HUB 0x2514 USB Hub
product SMC3 2662WUSB 0xa002 2662W-AR Wireless
+product SMC2 LAN9500_ETH 0x9500 USB/Ethernet
+product SMC2 LAN9505_ETH 0x9505 USB/Ethernet
+product SMC2 LAN9530_ETH 0x9530 USB/Ethernet
+product SMC2 LAN9730_ETH 0x9730 USB/Ethernet
+product SMC2 LAN9500_SAL10 0x9900 USB/Ethernet
+product SMC2 LAN9505_SAL10 0x9901 USB/Ethernet
+product SMC2 LAN9500A_SAL10 0x9902 USB/Ethernet
+product SMC2 LAN9505A_SAL10 0x9903 USB/Ethernet
+product SMC2 LAN9514_SAL10 0x9904 USB/Ethernet
+product SMC2 LAN9500A_HAL 0x9905 USB/Ethernet
+product SMC2 LAN9505A_HAL 0x9906 USB/Ethernet
+product SMC2 LAN9500_ETH_2 0x9907 USB/Ethernet
+product SMC2 LAN9500A_ETH_2 0x9908 USB/Ethernet
+product SMC2 LAN9514_ETH_2 0x9909 USB/Ethernet
+product SMC2 LAN9500A_ETH 0x9e00 USB/Ethernet
+product SMC2 LAN9505A_ETH 0x9e01 USB/Ethernet
+product SMC2 LAN89530_ETH 0x9e08 USB/Ethernet
product SMC2 LAN9514_ETH 0xec00 USB/Ethernet
/* SOHOware products */
@@ -4543,5 +4580,6 @@ product ZYXEL G220V2 0x340f G-220 v2
product ZYXEL G202 0x3410 G-202
product ZYXEL RT2870_1 0x3416 RT2870
product ZYXEL RT2870_2 0x341a RT2870
+product ZYXEL RT3070 0x341e NWD2105
product ZYXEL RTL8192CU 0x341f RTL8192CU
product ZYXEL NWD2705 0x3421 NWD2705
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
