Author: gavin
Date: Wed Aug 18 21:17:57 2010
New Revision: 211470
URL: http://svn.freebsd.org/changeset/base/211470
Log:
Merge r210524 from head:
- Support two devices made by West Mountain Radio in uslcom(4) [1]
- Remove duplicate SILABS CP2102 define from usbdevs
Merge r211022 from head:
Sync the list of devices supported by uslcom(4) with NetBSD, Linux, OpenBSD
and BeOS. The devices supported by uslcom(4) are now in sync with:
NetBSD src/sys/dev/usb/uslsa.c 1.11
OpenBSD src/sys/dev/usb/uslcom.c 1.20
Linux source/drivers/usb/serial/cp210x.c from kernel 2.6.35
BeOS usb_serial/driver.c 1.32
Two vendor/product IDs from Linux have not been added to uslcom(4):
SILABS SAEL - This device has special code in u3g to support it
SILABS GSM2228 - I suspect this should also be covered by u3g(4).
PR: usb/131912 [1]
Submitted by: Jack Twilley <mathuin gmail.com> [1]
Modified:
stable/8/sys/dev/usb/serial/uslcom.c
stable/8/sys/dev/usb/usbdevs
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cam/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/usb/serial/uslcom.c
==============================================================================
--- stable/8/sys/dev/usb/serial/uslcom.c Wed Aug 18 20:39:00 2010
(r211469)
+++ stable/8/sys/dev/usb/serial/uslcom.c Wed Aug 18 21:17:57 2010
(r211470)
@@ -177,23 +177,78 @@ static struct ucom_callback uslcom_callb
static const struct usb_device_id uslcom_devs[] = {
#define USLCOM_DEV(v,p) { USB_VP(USB_VENDOR_##v,
USB_PRODUCT_##v##_##p) }
USLCOM_DEV(BALTECH, CARDREADER),
+ USLCOM_DEV(CLIPSAL, 5500PCU),
+ USLCOM_DEV(DATAAPEX, MULTICOM),
+ USLCOM_DEV(DELL, DW700),
+ USLCOM_DEV(DIGIANSWER, ZIGBEE802154),
USLCOM_DEV(DYNASTREAM, ANTDEVBOARD),
+ USLCOM_DEV(DYNASTREAM, ANTDEVBOARD2),
+ USLCOM_DEV(DYNASTREAM, ANT2USB),
+ USLCOM_DEV(ELV, USBI2C),
+ USLCOM_DEV(FOXCONN, PIRELLI_DP_L10),
+ USLCOM_DEV(GEMALTO, PROXPU),
USLCOM_DEV(JABLOTRON, PC60B),
+ USLCOM_DEV(MEI, CASHFLOW_SC),
+ USLCOM_DEV(MEI, S2000),
+ USLCOM_DEV(JABLOTRON, PC60B),
+ USLCOM_DEV(OWEN, AC4),
+ USLCOM_DEV(PHILIPS, ACE1001),
+ USLCOM_DEV(PLX, CA42),
+ USLCOM_DEV(SILABS, AEROCOMM),
+ USLCOM_DEV(SILABS, AMBER_AMB2560),
USLCOM_DEV(SILABS, ARGUSISP),
+ USLCOM_DEV(SILABS, ARKHAM_DS101_A),
+ USLCOM_DEV(SILABS, ARKHAM_DS101_M),
+ USLCOM_DEV(SILABS, ARYGON_MIFARE),
+ USLCOM_DEV(SILABS, AVIT_USB_TTL),
+ USLCOM_DEV(SILABS, BEI_VCP),
+ USLCOM_DEV(SILABS, BSM7DUSB),
+ USLCOM_DEV(SILABS, BURNSIDE),
+ USLCOM_DEV(SILABS, C2_EDGE_MODEM),
+ USLCOM_DEV(SILABS, CP2102),
+ USLCOM_DEV(SILABS, CP210X_2),
USLCOM_DEV(SILABS, CRUMB128),
+ USLCOM_DEV(SILABS, CYGNAL),
+ USLCOM_DEV(SILABS, CYGNAL_DEBUG),
+ USLCOM_DEV(SILABS, CYGNAL_GPS),
USLCOM_DEV(SILABS, DEGREE),
- USLCOM_DEV(SILABS, BURNSIDE),
+ USLCOM_DEV(SILABS, EMS_C1007),
USLCOM_DEV(SILABS, HELICOM),
+ USLCOM_DEV(SILABS, IMS_USB_RS422),
+ USLCOM_DEV(SILABS, INFINITY_MIC),
+ USLCOM_DEV(SILABS, INSYS_MODEM),
+ USLCOM_DEV(SILABS, KYOCERA_GPS),
USLCOM_DEV(SILABS, LIPOWSKY_HARP),
USLCOM_DEV(SILABS, LIPOWSKY_JTAG),
USLCOM_DEV(SILABS, LIPOWSKY_LIN),
+ USLCOM_DEV(SILABS, MC35PU),
+ USLCOM_DEV(SILABS, MJS_TOSLINK),
+ USLCOM_DEV(SILABS, MSD_DASHHAWK),
USLCOM_DEV(SILABS, POLOLU),
- USLCOM_DEV(SILABS, CP2102),
- USLCOM_DEV(SILABS, CP210X_2),
+ USLCOM_DEV(SILABS, PROCYON_AVS),
+ USLCOM_DEV(SILABS, SB_PARAMOUNT_ME),
USLCOM_DEV(SILABS, SUUNTO),
+ USLCOM_DEV(SILABS, TAMSMASTER),
+ USLCOM_DEV(SILABS, TELEGESYS_ETRX2),
+ USLCOM_DEV(SILABS, TRACIENT),
USLCOM_DEV(SILABS, TRAQMATE),
+ USLCOM_DEV(SILABS, USBCOUNT50),
+ USLCOM_DEV(SILABS, USBPULSE100),
+ USLCOM_DEV(SILABS, USBSCOPE50),
+ USLCOM_DEV(SILABS, USBWAVE12),
+ USLCOM_DEV(SILABS, VSTABI),
+ USLCOM_DEV(SILABS, WAVIT),
+ USLCOM_DEV(SILABS, WMRBATT),
+ USLCOM_DEV(SILABS, WMRRIGBLASTER),
+ USLCOM_DEV(SILABS, WMRRIGTALK),
+ USLCOM_DEV(SILABS, ZEPHYR_BIO),
USLCOM_DEV(SILABS2, DCU11CLONE),
+ USLCOM_DEV(SILABS3, GPRS_MODEM),
+ USLCOM_DEV(SILABS4, 100EU_MODEM),
+ USLCOM_DEV(SYNTECH, CYPHERLAB100),
USLCOM_DEV(USI, MC60),
+ USLCOM_DEV(VAISALA, CABLE),
+ USLCOM_DEV(WAVESENSE, JAZZ),
#undef USLCOM_DEV
};
Modified: stable/8/sys/dev/usb/usbdevs
==============================================================================
--- stable/8/sys/dev/usb/usbdevs Wed Aug 18 20:39:00 2010
(r211469)
+++ stable/8/sys/dev/usb/usbdevs Wed Aug 18 21:17:57 2010
(r211470)
@@ -440,8 +440,10 @@ vendor AIPTEK 0x08ca AIPTEK Internation
vendor SMARTBRIDGES 0x08d1 SmartBridges
vendor FUJITSUSIEMENS 0x08d4 Fujitsu-Siemens
vendor BILLIONTON 0x08dd Billionton Systems
+vendor GEMALTO 0x08e6 Gemalto SA
vendor EXTENDED 0x08e9 Extended Systems
vendor MSYSTEMS 0x08ec M-Systems
+vendor DIGIANSWER 0x08fd Digianswer
vendor AUTHENTEC 0x08ff AuthenTec
vendor AUDIOTECHNICA 0x0909 Audio-Technica
vendor TRUMPION 0x090a Trumpion Microelectronics
@@ -509,6 +511,7 @@ vendor USR 0x0baf U.S. Robotics
vendor AMBIT 0x0bb2 Ambit Microsystems
vendor HTC 0x0bb4 HTC
vendor REALTEK 0x0bda Realtek
+vendor MEI 0x0bed MEI
vendor ADDONICS2 0x0bf6 Addonics Technology
vendor FSC 0x0bf8 Fujitsu Siemens Computers
vendor AGATE 0x0c08 Agate Technologies
@@ -565,6 +568,8 @@ vendor USI 0x10ab USI
vendor PLX 0x10b5 PLX
vendor ASANTE 0x10bd Asante
vendor SILABS 0x10c4 Silicon Labs
+vendor SILABS3 0x10c5 Silicon Labs
+vendor SILABS4 0x10ce Silicon Labs
vendor ACTIONS 0x10d6 Actions
vendor AIRPLUS 0x1011 Airplus
vendor ANALOG 0x1110 Analog Devices
@@ -619,6 +624,7 @@ vendor UBIQUAM 0x1529 UBIQUAM Co., Ltd.
vendor JMICRON 0x152d JMicron
vendor UBLOX 0x1546 U-blox
vendor PNY 0x154b PNY
+vendor OWEN 0x1555 Owen
vendor OQO 0x1557 OQO
vendor UMEDIA 0x157e U-MEDIA Communications
vendor FIBERLINE 0x1582 Fiberline
@@ -631,6 +637,7 @@ vendor AMOI 0x1614 Amoi Electronics
vendor GOODWAY 0x1631 Good Way Technology
vendor ENTREGA 0x1645 Entrega
vendor ACTIONTEC 0x1668 Actiontec Electronics
+vendor CLIPSAL 0x166a Clipsal
vendor CISCOLINKSYS2 0x167b Cisco-Linksys
vendor ATHEROS 0x168c Atheros Communications
vendor GIGASET 0x1690 Gigaset
@@ -644,8 +651,11 @@ vendor SENAO 0x1740 Senao
vendor ASUS2 0x1761 ASUS
vendor SWEEX2 0x177f Sweex
vendor METAGEEK 0x1781 MetaGeek
+vendor WAVESENSE 0x17f4 WaveSense
+vendor VAISALA 0x1843 Vaisala
vendor AMIT 0x18c5 AMIT
vendor QCOM 0x18e8 Qcom
+vendor ELV 0x18ef ELV
vendor LINKSYS3 0x1915 Linksys
vendor QUALCOMMINC 0x19d2 Qualcomm, Incorporated
vendor WCH2 0x1a86 QinHeng Electronics
@@ -699,6 +709,7 @@ vendor SITECOM2 0x9016 Sitecom
vendor MOSCHIP 0x9710 MosChip Semiconductor
vendor MARVELL 0x9e88 Marvell Technology Group Ltd.
vendor 3COM3 0xa727 3Com
+vendor DATAAPEX 0xdaae DataApex
vendor HP2 0xf003 Hewlett Packard
vendor USRP 0xfffe GNU Radio USRP
@@ -1186,6 +1197,9 @@ product CISCOLINKSYS WUSBF54G 0x0024 WUS
product CISCOLINKSYS2 RT3070 0x4001 RT3070
product CISCOLINKSYS3 RT3070 0x0101 RT3070
+/* Clipsal products */
+product CLIPSAL 5500PCU 0x0303 5500PCU C-Bus
+
/* CMOTECH products */
product CMOTECH CNU510 0x5141 CDMA Technologies USB modem
product CMOTECH CNU550 0x5543 CDMA 2000 1xRTT/1xEVDO USB modem
@@ -1291,6 +1305,9 @@ product DAISY DMC 0x6901 USB MultiMedia
/* Dallas Semiconductor products */
product DALLAS J6502 0x4201 J-6502 speakers
+/* DataApex products */
+product DATAAPEX MULTICOM 0xead6 MultiCom
+
/* Dell products */
product DELL PORT 0x0058 Port Replicator
product DELL AIO926 0x5115 Photo AIO Printer 926
@@ -1314,6 +1331,7 @@ product DELL U5520_3 0x8138 Dell 5520 3
product DELL U5730 0x8180 Dell 5730 3G
product DELL U5730_2 0x8181 Dell 5730 3G
product DELL U5730_3 0x8182 Dell 5730 3G
+product DELL DW700 0x9500 Dell DW700 GPS
/* Delorme Paublishing products */
product DELORME EARTHMATE 0x0100 Earthmate GPS
@@ -1333,6 +1351,9 @@ product DIGI ACCELEPORT2 0x0002 AccelePo
product DIGI ACCELEPORT4 0x0004 AccelePort USB 4
product DIGI ACCELEPORT8 0x0008 AccelePort USB 8
+/* Digianswer A/S products */
+product DIGIANSWER ZIGBEE802154 0x000a ZigBee/802.15.4 MAC
+
/* D-Link products */
/*product DLINK DSBS25 0x0100 DSB-S25 serial*/
product DLINK DUBE100 0x1a00 10/100 Ethernet
@@ -1389,6 +1410,8 @@ product DRESDENELEKTRONIK WIRELESSHANDHE
/* Dynastream Innovations */
product DYNASTREAM ANTDEVBOARD 0x1003 ANT dev board
+product DYNASTREAM ANT2USB 0x1004 ANT2USB
+product DYNASTREAM ANTDEVBOARD2 0x1006 ANT dev board
/* Edimax products */
product EDIMAX EW7318USG 0x7318 USB Wireless dongle
@@ -1426,6 +1449,9 @@ product ELECOM LDUSBTX3 0xabc1 LD-USB/T
product ELSA MODEM1 0x2265 ELSA Modem Board
product ELSA USB2ETHERNET 0x3000 Microlink USB2Ethernet
+/* ELV products */
+product ELV USBI2C 0xe00f USB-I2C interface
+
/* EMS products */
product EMS DUAL_SHOOTER 0x0003 PSX gun controller converter
@@ -1506,6 +1532,9 @@ product FIBERLINE WL430U 0x6003 WL-430U
/* Fossil, Inc products */
product FOSSIL WRISTPDA 0x0002 Wrist PDA
+/* Foxconn products */
+product FOXCONN PIRELLI_DP_L10 0xe000 Pirelli DP-L10
+
/* Freecom products */
product FREECOM DVD 0xfc01 DVD drive
product FREECOM HDD 0xfc05 Classic SL Hard Drive
@@ -1558,6 +1587,9 @@ product FUJITSUSIEMENS SCR 0x0009 Fujits
/* Garmin products */
product GARMIN IQUE_3600 0x0004 iQue 3600
+/* Gemalto products */
+product GEMALTO PROXPU 0x5501 Prox-PU/CU
+
/* General Instruments (Motorola) products */
product GENERALINSTMNTS SB5100 0x5100 SURFboard SB5100 Cable modem
@@ -2058,6 +2090,10 @@ product METRICOM RICOCHET_GS 0x0001 Rico
product MGE UPS1 0x0001 MGE UPS SYSTEMS PROTECTIONCENTER 1
product MGE UPS2 0xffff MGE UPS SYSTEMS PROTECTIONCENTER 2
+/* MEI products */
+product MEI CASHFLOW_SC 0x1100 Cashflow-SC Cash Acceptor
+product MEI S2000 0x1101 Seies 2000 Combo Acceptor
+
/* Micro Star International products */
product MSI BT_DONGLE 0x1967 Bluetooth USB dongle
product MSI RT3070_1 0x3820 RT3070
@@ -2339,6 +2375,9 @@ product OQO BT01 0x0003 model 01 Blueto
product OQO ETHER01PLUS 0x7720 model 01+ Ethernet
product OQO ETHER01 0x8150 model 01 Ethernet interface
+/* Owen.ru products */
+product OWEN AC4 0x0004 AC4 USB-RS485 converter
+
/* Palm Computing, Inc. product */
product PALM SERIAL 0x0080 USB Serial
product PALM M500 0x0001 Palm m500
@@ -2382,6 +2421,7 @@ product PHILIPS HUB 0x0201 hub
product PHILIPS PCA646VC 0x0303 PCA646VC PC Camera
product PHILIPS PCVC680K 0x0308 PCVC680K Vesta Pro PC Camera
product PHILIPS DSS150 0x0471 DSS 150 Digital Speaker System
+product PHILIPS ACE1001 0x066a AKTAKOM ACE-1001 cable
product PHILIPS SPE3030CC 0x083a USB 2.0 External Disk
product PHILIPS SNU5600 0x1236 SNU5600
product PHILIPS UM10016 0x1552 ISP 1581 Hi-Speed USB MPEG2
Encoder Reference Kit
@@ -2420,6 +2460,7 @@ product PLEXTOR 40_12_40U 0x0011 PlexWri
/* PLX products */
product PLX TESTBOARD 0x9060 test board
+product PLX CA42 0xac70 CA-42
/* PNY products */
product PNY ATTACHE2 0x0010 USB 2.0 Flash Drive
@@ -2793,22 +2834,59 @@ product SILICOM U2E 0x0001 U2E
product SILICOM GPE 0x0002 Psion Gold Port Ethernet
/* SI Labs */
+product SILABS VSTABI 0x0f91 Vstabi
+product SILABS ARKHAM_DS101_M 0x1101 Arkham DS101 Monitor
+product SILABS ARKHAM_DS101_A 0x1601 Arkham DS101 Adapter
+product SILABS BSM7DUSB 0x800a BSM7-D-USB
product SILABS POLOLU 0x803b Pololu Serial
+product SILABS CYGNAL_DEBUG 0x8044 Cygnal Debug Adapter
+product SILABS SB_PARAMOUNT_ME 0x8043 Software Bisque Paramount ME
product SILABS SAEL 0x8053 SA-EL USB
+product SILABS GSM2228 0x8054 Enfora GSM2228 USB
product SILABS ARGUSISP 0x8066 Argussoft ISP
+product SILABS IMS_USB_RS422 0x806f IMS USB-RS422
product SILABS CRUMB128 0x807a Crumb128 board
product SILABS DEGREE 0x80ca Degree Controls Inc
+product SILABS TRACIENT 0x80dd Tracient RFID
product SILABS TRAQMATE 0x80ed Track Systems Traqmate
product SILABS SUUNTO 0x80f6 Suunto Sports Instrument
+product SILABS ARYGON_MIFARE 0x8115 Arygon Mifare RFID reader
product SILABS BURNSIDE 0x813d Burnside Telecon Deskmobile
+product SILABS TAMSMASTER 0x813f Tams Master Easy Control
+product SILABS WMRBATT 0x814a WMR RIGblaster Plug&Play
+product SILABS WMRRIGBLASTER 0x814a WMR RIGblaster Plug&Play
+product SILABS WMRRIGTALK 0x814b WMR RIGtalk RT1
product SILABS HELICOM 0x815e Helicomm IP-Link 1220-DVM
-product SILABS CP2102 0xea60 SILABS USB UART
+product SILABS AVIT_USB_TTL 0x818b AVIT Research USB-TTL
+product SILABS MJS_TOSLINK 0x819f MJS USB-TOSLINk
+product SILABS WAVIT 0x81a6 ThinkOptics WavIt
+product SILABS MSD_DASHHAWK 0x81ac MSD DashHawk
+product SILABS INSYS_MODEM 0x81ad INSYS Modem
product SILABS LIPOWSKY_JTAG 0x81c8 Lipowsky Baby-JTAG
product SILABS LIPOWSKY_LIN 0x81e2 Lipowsky Baby-LIN
+product SILABS AEROCOMM 0x81e7 Aerocomm Radio
+product SILABS ZEPHYR_BIO 0x81e8 Zephyr Bioharness
+product SILABS EMS_C1007 0x81f2 EMS C1007 HF RFID controller
product SILABS LIPOWSKY_HARP 0x8218 Lipowsky HARP-1
-product SILABS CP2102 0xea60 SILABS USB UARTa
+product SILABS C2_EDGE_MODEM 0x822b Commander 2 EDGE(GSM) Modem
+product SILABS CYGNAL_GPS 0x826b Cygnal Fasttrax GPS
+product SILABS TELEGESYS_ETRX2 0x8293 Telegesys ETRX2USB
+product SILABS PROCYON_AVS 0x82f9 Procyon AVS
+product SILABS MC35PU 0x8341 MC35pu
+product SILABS CYGNAL 0x8382 Cygnal
+product SILABS AMBER_AMB2560 0x83a8 Amber Wireless AMB2560
+product SILABS KYOCERA_GPS 0x8411 Kyocera GPS
+product SILABS BEI_VCP 0x846e BEI USB Sensor (VCP)
+product SILABS CP2102 0xea60 SILABS USB UART
product SILABS CP210X_2 0xea61 CP210x Serial
+product SILABS INFINITY_MIC 0xea71 Infinity GPS-MIC-1 Radio Monophone
+product SILABS USBSCOPE50 0xf001 USBscope50
+product SILABS USBWAVE12 0xf002 USBwave12
+product SILABS USBPULSE100 0xf003 USBpulse100
+product SILABS USBCOUNT50 0xf004 USBcount50
product SILABS2 DCU11CLONE 0xaa26 DCU-11 clone
+product SILABS3 GPRS_MODEM 0xea61 GPRS Modem
+product SILABS4 100EU_MODEM 0xea61 GPRS Modem 100EU
/* Silicon Portals Inc. */
product SILICONPORTALS YAPPH_NF 0x0200 YAP Phone (no firmware)
@@ -2956,6 +3034,9 @@ product SUN KBD_HUB 0x100e Kbd Hub
/* Super Top products */
product SUPERTOP IDE 0x6600 USB-IDE
+/* Syntech products */
+product SYNTECH CYPHERLAB100 0x1000 CipherLab USB Barcode Scanner
+
/* Teclast products */
product TECLAST TLC300 0x3203 USB Media Player
@@ -3093,6 +3174,9 @@ product VIA USB2IDEBRIDGE 0x6204 USB 2.0
/* USI products */
product USI MC60 0x10c5 MC60 Serial
+/* Vaisala products */
+product VAISALA CABLE 0x0200 USB Interface cable
+
/* VidzMedia products */
product VIDZMEDIA MONSTERTV 0x4fb1 MonsterTV P2H
@@ -3122,6 +3206,9 @@ product WACOM GRAPHIRE3_4X5 0x0013 Graph
product WACOM INTUOSA5 0x0021 Intuos A5
product WACOM GD0912U 0x0022 Intuos 9x12 Graphics Tablet
+/* WaveSense products */
+product WAVESENSE JAZZ 0xaaaa Jazz blood glucose meter
+
/* WCH products */
product WCH CH341SER 0x5523 CH341/CH340 USB-Serial Bridge
product WCH2 CH341SER 0x7523 CH341/CH340 USB-Serial Bridge
_______________________________________________
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"
