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/uslcom.c b/sys/dev/usb/uslcom.c
index dbbc893..e30042f 100644 (file)
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uslcom.c,v 1.34 2015/03/14 03:38:50 jsg Exp $ */
+/*     $OpenBSD: uslcom.c,v 1.35 2015/06/16 05:08:55 jsg Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -121,6 +121,7 @@ static const struct usb_devno uslcom_devs[] = {
        { USB_VENDOR_CLIPSAL,           USB_PRODUCT_CLIPSAL_5800PC },
        { USB_VENDOR_CLIPSAL,           USB_PRODUCT_CLIPSAL_C5000CT2 },
        { USB_VENDOR_CLIPSAL,           USB_PRODUCT_CLIPSAL_L51xx },
+       { USB_VENDOR_CORSAIR,           USB_PRODUCT_CORSAIR_CP210X },
        { USB_VENDOR_DATAAPEX,          USB_PRODUCT_DATAAPEX_MULTICOM },
        { USB_VENDOR_DELL,              USB_PRODUCT_DELL_DW700 },
        { USB_VENDOR_DIGIANSWER,        USB_PRODUCT_DIGIANSWER_ZIGBEE802154 },
@@ -136,14 +137,38 @@ static const struct usb_devno uslcom_devs[] = {
        { USB_VENDOR_JABLOTRON,         USB_PRODUCT_JABLOTRON_PC60B },
        { USB_VENDOR_KAMSTRUP,          USB_PRODUCT_KAMSTRUP_MBUS_250D },
        { USB_VENDOR_KAMSTRUP,          USB_PRODUCT_KAMSTRUP_OPTICALEYE },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M121 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M218A },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M219 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M233 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M235 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M335 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M336 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M350 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M371 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M411 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M425 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M455A },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M465 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M475A },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M625A },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M642A },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M648 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M737 },
+       { USB_VENDOR_LAKESHORE,         USB_PRODUCT_LAKESHORE_M776 },
        { USB_VENDOR_LINKINSTRUMENTS,   USB_PRODUCT_LINKINSTRUMENTS_MSO19 },
        { USB_VENDOR_LINKINSTRUMENTS,   USB_PRODUCT_LINKINSTRUMENTS_MSO28 },
        { USB_VENDOR_LINKINSTRUMENTS,   USB_PRODUCT_LINKINSTRUMENTS_MSO28_2 },
        { USB_VENDOR_MEI,               USB_PRODUCT_MEI_CASHFLOW_SC },
        { USB_VENDOR_MEI,               USB_PRODUCT_MEI_S2000 },
+       { USB_VENDOR_NETGEAR,           USB_PRODUCT_NETGEAR_M7100 },
+       { USB_VENDOR_OREGONSCI,         USB_PRODUCT_OREGONSCI_OWL_CM160 },
        { USB_VENDOR_OWEN,              USB_PRODUCT_OWEN_AC4 },
        { USB_VENDOR_PHILIPS,           USB_PRODUCT_PHILIPS_ACE1001 },
        { USB_VENDOR_RENESAS,           USB_PRODUCT_RENESAS_RX610 },
+       { USB_VENDOR_SEL,               USB_PRODUCT_SEL_C662 },
+       { USB_VENDOR_SELUXIT,           USB_PRODUCT_SELUXIT_RF },
+       { USB_VENDOR_SIEMENS4,          USB_PRODUCT_SIEMENS4_RUGGEDCOM },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_AC_SERV_CAN },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_AC_SERV_CIS },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_AC_SERV_IBUS },
@@ -160,9 +185,11 @@ static const struct usb_devno uslcom_devs[] = {
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_BSM7DUSB },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_B_G_H3000 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_C2_EDGE_MODEM },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_CELDEVKIT },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_CP210X_1 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_CP210X_2 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_CP210X_3 },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_CP2110 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_CRUMB128 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_CYGNAL },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_CYGNAL_DEBUG },
@@ -171,27 +198,38 @@ static const struct usb_devno uslcom_devs[] = {
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_DEKTEK_DTAPLUS },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_DESKTOPMOBILE },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_EDG1228 },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_EM357 },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_EM357LR },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_EMS_C1007 },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_GSM2228 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_HAMLINKUSB },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_HUBZ },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_IMS_USB_RS422 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_INFINITY_MIC },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_INSYS_MODEM },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_IPLINK1220 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_IRZ_SG10 },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_KCF_PRN },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_KETRA_N1 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_KYOCERA_GPS },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_LIPOWSKY_HARP },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_LIPOWSKY_JTAG },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_LIPOWSKY_LIN },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_MC35PU },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_MJS_TOSLINK },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_MMB_ZIGBEE },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_MSD_DASHHAWK },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_MULTIPLEX_RC },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_OPTRIS_MSPRO },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_PII_ZIGBEE },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_PLUGDRIVE },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_POLOLU },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_PREON32 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_PROCYON_AVS },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_RIGBLASTER },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_RIGTALK },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_SB_PARAMOUNT_ME },
+       { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_SB_PARAMOUNT_ME2 },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_SUUNTO },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_TAMSMASTER },
        { USB_VENDOR_SILABS,            USB_PRODUCT_SILABS_TELEGESIS_ETRX2 },
@@ -207,15 +245,19 @@ static const struct usb_devno uslcom_devs[] = {
        { USB_VENDOR_SILABS2,           USB_PRODUCT_SILABS2_DCU11CLONE },
        { USB_VENDOR_SILABS3,           USB_PRODUCT_SILABS3_GPRS_MODEM },
        { USB_VENDOR_SILABS4,           USB_PRODUCT_SILABS4_100EU_MODEM },
+       { USB_VENDOR_SILABS5,           USB_PRODUCT_SILABS5_EM358X },
        { USB_VENDOR_SYNTECH,           USB_PRODUCT_SYNTECH_CIPHERLAB100 },
        { USB_VENDOR_USI,               USB_PRODUCT_USI_MC60 },
        { USB_VENDOR_VAISALA,           USB_PRODUCT_VAISALA_USBINSTCABLE },
+       { USB_VENDOR_VOTI,              USB_PRODUCT_VOTI_SELETEK_1 },
+       { USB_VENDOR_VOTI,              USB_PRODUCT_VOTI_SELETEK_2 },
        { USB_VENDOR_WAGO,              USB_PRODUCT_WAGO_SERVICECABLE },
        { USB_VENDOR_WAVESENSE,         USB_PRODUCT_WAVESENSE_JAZZ },
        { USB_VENDOR_WIENERPLEINBAUS,   USB_PRODUCT_WIENERPLEINBAUS_CML },
        { USB_VENDOR_WIENERPLEINBAUS,   USB_PRODUCT_WIENERPLEINBAUS_MPOD },
        { USB_VENDOR_WIENERPLEINBAUS,   USB_PRODUCT_WIENERPLEINBAUS_PL512 },
        { USB_VENDOR_WIENERPLEINBAUS,   USB_PRODUCT_WIENERPLEINBAUS_RCM },
+       { USB_VENDOR_WMR,               USB_PRODUCT_WMR_RIGBLASTER },
 };
 
 int uslcom_match(struct device *, void *, void *);