Add a uslcom id for the Netgear M7100 console from Andrew Daugherity.

Add some additional uslcom ids found in the Linux driver while here.

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 76dadeb..cf9039a 100644 (file)
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.650 2015/05/12 11:14:06 stsp Exp $
+$OpenBSD: usbdevs,v 1.651 2015/06/16 05:07:25 jsg Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -352,6 +352,7 @@ vendor EXTENDED             0x08e9  Extended Systems
 vendor MSYSTEMS                0x08ec  M-Systems
 vendor DIGIANSWER      0x08fd  Digianswer
 vendor AUTHENTEC       0x08ff  AuthenTec
+vendor SIEMENS4                0x0908  Siemens
 vendor AUDIOTECHNICA   0x0909  Audio-Technica
 vendor TRUMPION                0x090a  Trumpion Microelectronics
 vendor ALATION         0x0910  Alation Systems
@@ -462,6 +463,7 @@ vendor NORITAKE             0x0eda  Noritake itron Corp
 vendor XIRING          0x0f14  XIRING
 vendor AIRPRIME                0x0f3d  Airprime
 vendor LARSENBRUSGAARD 0x0fd8  Larsen and Brusgaard
+vendor OREGONSCI       0x0fde  Oregon Scientific
 vendor UNKNOWN4                0x0fe6  Unknown Vendor
 vendor VTECH           0x0f88  VTech
 vendor FALCOM          0x0f94  Falcom Wireless Communications
@@ -478,7 +480,7 @@ vendor MOTOROLA             0x1063  Motorola
 vendor CCYU            0x1065  CCYU Technology
 vendor HYUNDAI         0x106c  Hyundai
 vendor GCTSEMICON      0x1076  GCT Semiconductor
-vendor SILABS2         0x10a6  SILABS2
+vendor SILABS2         0x10a6  Silicon Labs
 vendor USI             0x10ab  USI
 vendor LIEBERT2                0x10af  Liebert
 vendor PLX             0x10b5  PLX
@@ -554,6 +556,7 @@ vendor ATHEROS              0x168c  Atheros Communications
 vendor CISCOLINKSYS2   0x167b  Cisco-Linksys
 vendor GIGASET         0x1690  Gigaset
 vendor GLOBALSUN       0x16ab  Global Sun Technology
+vendor VOTI            0x16c0  Van Ooijen Technische Informatica
 vendor ANYDATA         0x16d5  AnyDATA Inc.
 vendor JABLOTRON       0x16d6  Jablotron
 vendor CMOTECH         0x16d8  CMOTECH
@@ -582,6 +585,9 @@ vendor TERMINUS             0x1a40  Terminus Technology
 vendor ABBOTT          0x1a61  Abbott Labs
 vendor BAYER           0x1a79  Bayer Health Care
 vendor WCH2            0x1a86  QinHeng Electronics
+vendor SEL             0x1adb  Schweitzer Engineering Laboratories
+vendor SILABS5         0x1ba4  Silicon Labs
+vendor CORSAIR         0x1b1c  Corsair
 vendor MATRIXORB       0x1b3d  Matrix Orbital
 vendor TORADEX         0x1b67  Toradex inc.
 vendor OVISLINK                0x1b75  OvisLink
@@ -595,11 +601,13 @@ vendor LONGCHEER  0x1c9e  Longcheer Technology
 vendor DRESDENELEC     0x1cf1  Dresden Elektronic
 vendor DREAMLINK       0x1d34  Dream Link
 vendor PEGATRON                0x1d4d  Pegatron
+vendor SELUXIT         0x1d6f  Seluxit
 vendor METAGEEK                0x1dd5  MetaGeek
 vendor FESTO           0x1e29  Festo
 vendor MODACOM         0x1eb8  Modacom
 vendor AIRTIES         0x1eda  AirTies
 vendor VERTEX          0x1fe7  Vertex Wireless Co., Ltd.
+vendor LAKESHORE       0x1fb9  Lake Shore
 vendor DLINK           0x2001  D-Link
 vendor PLANEX2         0x2019  Planex Communications
 vendor ENCORE          0x203d  Encore
@@ -611,6 +619,7 @@ vendor VIALABS              0x2109  VIA Labs
 vendor MOTOROLA2       0x22b8  Motorola
 vendor ARDUINO         0x2341  Arduino SA
 vendor TPLINK          0x2357  TP-Link
+vendor WMR             0x2405  West Mountain Radio
 vendor TRIPPLITE       0x2478  Tripp-Lite
 vendor NHJ             0x2770  NHJ
 vendor ASUSTEK         0x2821  ASUSTeK Computer
@@ -1395,6 +1404,9 @@ product COREGA RTL8192CU  0x0056  RTL8192CU
 product COREGA WLUSB_11_STICK  0x7613  WLAN USB Stick 11
 product COREGA FETHER_USB_TXC  0x9601  FEther USB-TXC
 
+/* Corsair products */
+product CORSAIR CP210X         0x1c00  CP210X
+
 /* Creative Labs products */
 product CREATIVE NOMAD_II      0x1002  Nomad II
 product CREATIVE NOMAD_IIMG    0x4004  Nomad II MG
@@ -2433,6 +2445,27 @@ product KYOCERA2 KPC650          0x17da  KPC650 EVDO
 product LACIE HD               0xa601  Hard Disk
 product LACIE CDRW             0xa602  CD R/W
 
+/* Lake Shore products */
+product LAKESHORE M121         0x0100  Model 121
+product LAKESHORE M218A                0x0200  Model 218A
+product LAKESHORE M219         0x0201  Model 219
+product LAKESHORE M233         0x0202  Model 233
+product LAKESHORE M235         0x0203  Model 235
+product LAKESHORE M335         0x0300  Model 335
+product LAKESHORE M336         0x0301  Model 336
+product LAKESHORE M350         0x0302  Model 350
+product LAKESHORE M371         0x0303  Model 371
+product LAKESHORE M411         0x0400  Model 411
+product LAKESHORE M425         0x0401  Model 425
+product LAKESHORE M455A                0x0402  Model 455A
+product LAKESHORE M475A                0x0403  Model 475A
+product LAKESHORE M465         0x0404  Model 465
+product LAKESHORE M625A                0x0600  Model 625A
+product LAKESHORE M642A                0x0601  Model 642A
+product LAKESHORE M648         0x0602  Model 648
+product LAKESHORE M737         0x0700  Model 737
+product LAKESHORE M776         0x0701  Model 776
+
 /* Larsen and Brusgaard products */
 product LARSENBRUSGAARD ALTITRACK      0x0001  AltiTrack
 
@@ -3085,6 +3118,7 @@ product NETGEAR EA101             0x1001  Ethernet
 product NETGEAR EA101X         0x1002  Ethernet
 product NETGEAR FA101          0x1020  10/100 Ethernet
 product NETGEAR FA120          0x1040  USB 2.0 Fast Ethernet
+product NETGEAR M7100          0x1100  M7100
 product NETGEAR MA111NA                0x4110  802.11b
 product NETGEAR MA111V2                0x4230  802.11b V2
 product        NETGEAR WG111V2_2       0x4240  PrismGT USB 2.0 WLAN
@@ -3203,6 +3237,9 @@ product OQO BT01          0x0003  model 01 Bluetooth
 product OQO ETHER01PLUS                0x7720  model 01+ Ethernet
 product OQO ETHER01            0x8150  model 01 Ethernet
 
+/* Oregon Scientific */
+product OREGONSCI OWL_CM160    0xca05  OWL CM-160
+
 /* Ours Technology Inc. */
 product OTI SOLID              0x6803  Solid state disk
 product OTI DKU5               0x6858  DKU-5 Serial
@@ -3657,6 +3694,12 @@ product SEALEVEL 2803_6          0X2863  SeaLINK+8 (2803) Port 6
 product SEALEVEL 2803_7                0X2873  SeaLINK+8 (2803) Port 7
 product SEALEVEL 2803_8                0X2883  SeaLINK+8 (2803) Port 8
 
+/* Schweitzer Engineering Laboratories */
+product SEL C662               0x0001  C662
+
+/* Seluxit products */
+product SELUXIT RF             0x0010  RF Dongle
+
 /* Senao products */
 product SENAO RT2870_3         0x0605  RT2870
 product SENAO RT2870_4         0x0615  RT2870
@@ -3729,6 +3772,9 @@ product SIEMENS3 SX1              0x0001  SX1
 product SIEMENS3 X65           0x0003  X65
 product SIEMENS3 X75           0x0004  X75
 
+/* Siemens(4) products */
+product SIEMENS4 RUGGEDCOM     0x01ff  RUGGEDCOM
+
 /* Sierra Wireless products */
 product SIERRA EM5625          0x0017  EM5625
 product SIERRA MC5720          0x0018  MC5720
@@ -3776,6 +3822,7 @@ product SILICOM U2E               0x0001  U2E
 product SILICOM GPE            0x0002  Psion Dacom Gold Port Ethernet
 
 /* Silicon Labs products */
+product SILABS5 EM358X         0x0002  EM358x
 product SILABS VSTABI          0x0f91  VStabi Controller
 product SILABS ARKHAM_DS101_M  0x1101  Arkham DS101 Monitor
 product SILABS ARKHAM_DS101_A  0x1601  Arkham DS101 Adapter
@@ -3783,7 +3830,9 @@ product SILABS BSM7DUSB           0x800a  BSM7-D-USB
 product SILABS POLOLU          0x803b  Pololu Serial
 product SILABS SB_PARAMOUNT_ME 0x8043  Software Bisque Paramount ME
 product SILABS CYGNAL_DEBUG    0x8044  Cygnal Debug Adapter
+product SILABS SB_PARAMOUNT_ME2        0x804e  Software Bisque Paramount ME
 product SILABS EDG1228         0x8053  EDG1228
+product SILABS GSM2228         0x8054  Enfora GSM2228
 product SILABS ARGUSISP                0x8066  Argussoft ISP
 product SILABS IMS_USB_RS422   0x806f  IMS USB-RS422
 product SILABS CRUMB128                0x807a  Crumb128
@@ -3814,6 +3863,7 @@ product SILABS EMS_C1007  0x81f2  EMS C1007 HF RFID reader
 product SILABS LIPOWSKY_HARP   0x8218  Lipowsky HARP-1
 product SILABS C2_EDGE_MODEM   0x822b  Commander 2 EDGE(GSM) Modem
 product SILABS CYGNAL_GPS      0x826b  Cygnal Fasttrax GPS
+product SILABS PLUGDRIVE       0x8281  Nanotec Plug & Drive
 product SILABS TELEGESIS_ETRX2 0x8293  Telegesis ETRX2USB
 product SILABS PROCYON_AVS     0x82f9  Procyon AVS
 product SILABS MC35PU          0x8341  MC35pu
@@ -3826,13 +3876,22 @@ product SILABS BEI_VCP          0x846e  BEI USB Sensor (VCP)
 product SILABS BALLUFF_RFID    0x8477  Balluff RFID reader
 product SILABS AC_SERV_IBUS    0x85ea  AC-Services IBUS
 product SILABS AC_SERV_CIS     0x85eb  AC-Services CIS-IBUS
+product SILABS PREON32         0x85f8  Virtenio Preon32
 product SILABS AC_SERV_CAN     0x8664  AC-Services CAN
 product SILABS AC_SERV_OBD     0x8665  AC-Services OBD
+product SILABS EM357LR         0x8856  CEL EM357 LR
+product SILABS EM357           0x8857  CEL EM357
+product SILABS MMB_ZIGBEE      0x88a4  MMB Networks ZigBee
+product SILABS PII_ZIGBEE      0x88a5  Planet Innovation Ingeni ZigBee
+product SILABS KETRA_N1                0x8946  Ketra N1
+product SILABS CELDEVKIT       0x8977  CEL MeshWorks DevKit
+product SILABS KCF_PRN         0x8998  KCF Technologies PRN
+product SILABS HUBZ            0x8a2a  HubZ ZigBee/Z-Wave
 product SILABS2 DCU11CLONE     0xaa26  DCU-11 clone
 product SILABS CP210X_1                0xea60  CP210x Serial
 product SILABS CP210X_2                0xea61  CP210x Serial
 product SILABS3 GPRS_MODEM     0xea61  GPRS Modem
-product SILABS4 100EU_MODEM    0xea61  GPRS Modem 100EU
+product SILABS4 100EU_MODEM    0xea6a  GPRS Modem 100EU
 product SILABS CP210X_3                0xea70  CP210x Serial
 product SILABS INFINITY_MIC    0xea71  Infinity GPS-MIC-1
 product SILABS CP2110          0xea80  CP2110 USB HID Serial
@@ -4235,6 +4294,10 @@ product  VALIDITY VFS300         0x0008  VFS300 Fingerprint Reader
 product        VALIDITY VFS5011        0x0011  VFS5011 Fingerprint Reader
 product        VALIDITY VFS5471        0x003c  VFS471 Fingerprint Reader
 
+/* Van Ooijen Technische Informatica products */
+product VOTI SELETEK_1         0x09b0  Lunatico Seletek
+product VOTI SELETEK_2         0x09b1  Lunatico Seletek
+
 /* Velleman products */
 product VELLEMAN K8055         0x5500  K8055 USB Experiment interface board
 
@@ -4303,6 +4366,9 @@ product WAGO SERVICECABLE 0x07a6  Service Cable 750-923
 /* WaveSense products */
 product WAVESENSE JAZZ         0xaaaa  Jazz blood glucose meter
 
+/* West Mountain Radio products */
+product WMR RIGBLASTER         0x0003  RIGblaster
+
 /* WIENER Plein & Baus products */
 product WIENERPLEINBAUS PL512  0x0010  PL512 PSU
 product WIENERPLEINBAUS RCM    0x0011  RCM Remote Control