diff options
| -rw-r--r-- | sys/dev/usb/ubsa.c | 79 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 34 |
2 files changed, 106 insertions, 7 deletions
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 8e2c236..01ecf17 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -226,12 +226,8 @@ static const struct ubsa_product { { USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232 }, /* Peracom */ { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 }, - /* Novatel Wireless Merlin cards */ - { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740 }, - /* Dell version of the above */ + /* Dell version of the Novatel 740 */ { USB_VENDOR_DELL, USB_PRODUCT_DELL_U740 }, - /* Novatel Wireless Merlin v740 */ - { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V740 }, /* Option Vodafone MC3G */ { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G }, /* Option GlobeTrotter 3G */ @@ -244,10 +240,79 @@ static const struct ubsa_product { { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36 }, /* Huawei Mobile */ { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE }, - /* Sierra Wireless LENOVO UMTS card */ - { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_3 }, + { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E270 }, + { USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620 }, /* Qualcomm, Inc. ZTE CDMA */ { USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM }, + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM }, + /* Novatel Wireless Merlin ES620 */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620 }, + /* Novatel Wireless Merlin U720 */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U720 }, + /* Novatel Wireless Merlin U727 */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U727 }, + /* Novatel Wireless Merlin U740 */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740 }, + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740_2 }, + /* Novatel Wireless Merlin U950D */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U950D }, + /* Novatel Wireless Merlin V620 */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V620 }, + /* Novatel Wireless Merlin V640 */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V640 }, + /* Novatel Wireless Merlin V720 */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V720 }, + /* Novatel Wireless Merlin V740 */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V740 }, + /* Novatel Wireless Merlin X950D */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_X950D }, + /* Novatel Wireless Merlin U870 */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U870 }, + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_XU870 }, + /* Sierra Wireless AirCard 580 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580 }, + /* Sierra Wireless AirCard 595 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD595 }, + /* Sierra Wireless AirCard 595U */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U }, + /* Sierra Wireless AirCard 597E */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC597E }, + /* Sierra Wireless Compass 597 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_C597 }, + /* Sierra Wireless AirCard 880 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880 }, + /* Sierra Wireless AirCard 880E */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880E }, + /* Sierra Wireless AirCard 880U */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880U }, + /* Sierra Wireless AirCard 881 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881 }, + /* Sierra Wireless AirCard 881E */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881E }, + /* Sierra Wireless AirCard 881U */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881U }, + /* Sierra Wireless EM5625 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625 }, + /* Sierra Wireless MC5720 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720 }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720_2 }, + /* Sierra Wireless MC5725 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725 }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725 }, + /* Sierra Wireless MC8755 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD875 }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755 }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2 }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_3 }, + /* Sierra Wireless MC8765 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8765 }, + /* Sierra Wireless MC8775 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC875U }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2 }, + /* Sierra Wireless MC8780 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780 }, + /* Sierra Wireless MC8781 */ + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781 }, { 0, 0 } }; diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index fe4e5dd..51d32b9 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1433,6 +1433,7 @@ product HTC SMARTPHONE 0x0a51 SmartPhone USB Sync /* HUAWEI products */ product HUAWEI MOBILE 0x1001 Huawei Mobile +product HUAWEI E270 0x1003 Huawei HSPA modem /* HUAWEI 3com products */ product HUAWEI3COM WUB320G 0x0009 Aolynk WUB320g @@ -1656,6 +1657,9 @@ product MELCO SG54HP 0x00d8 WLI-U2-SG54HP product MELCO G54HP 0x00d9 WLI-U2-G54HP product MELCO KG54L 0x00da WLI-U2-KG54L +/* Merlin products */ +product MERLIN V620 0x1110 Merlin V620 + /* MetaGeek products */ product METAGEEK WISPY1B 0x083e MetaGeek Wi-Spy product METAGEEK WISPY24X 0x083f MetaGeek Wi-Spy 2.4x @@ -1821,13 +1825,21 @@ product NOVATECH NV902 0x9020 NovaTech NV-902W product NOVATECH RT2573 0x9021 RT2573 /* Novatel Wireless products */ +product NOVATEL V640 0x1100 Merlin V620 product NOVATEL CDMA_MODEM 0x1110 Novatel Wireless Merlin CDMA product NOVATEL V620 0x1110 Merlin V620 product NOVATEL V740 0x1120 Merlin V740 product NOVATEL V720 0x1130 Merlin V720 product NOVATEL U740 0x1400 Merlin U740 +product NOVATEL U740_2 0x1410 Merlin U740 +product NOVATEL U870 0x1420 Merlin U870 +product NOVATEL XU870 0x1430 Merlin XU870 +product NOVATEL X950D 0x1450 Merlin X950D +product NOVATEL ES620 0x2100 ES620 CDMA product NOVATEL U720 0x2110 Merlin U720 product NOVATEL U727 0x4100 Merlin U727 CDMA +product NOVATEL U950D 0x4400 Novatel MC950D HSUPA +product NOVATEL ZEROCD 0x5010 Novatel ZeroCD product NOVATEL2 FLEXPACKGPS 0x0100 NovAtel FlexPack GPS receiver /* Merlin products */ @@ -2100,9 +2112,31 @@ product SIEMENS3 X75 0x0004 X75 /* Sierra Wireless products */ product SIERRA AIRCARD580 0x0112 Sierra Wireless AirCard 580 +product SIERRA AIRCARD595 0x0019 Sierra Wireless AirCard 595 +product SIERRA AC595U 0x0120 Sierra Wireless AirCard 595U +product SIERRA AC597E 0x0021 Sierra Wireless AirCard 597E +product SIERRA C597 0x0023 Sierra Wireless Compass 597 +product SIERRA AC880 0x6850 Sierra Wireless AirCard 880 +product SIERRA AC881 0x6851 Sierra Wireless AirCard 881 +product SIERRA AC880E 0x6852 Sierra Wireless AirCard 880E +product SIERRA AC881E 0x6853 Sierra Wireless AirCard 881E +product SIERRA AC880U 0x6855 Sierra Wireless AirCard 880U +product SIERRA AC881U 0x6856 Sierra Wireless AirCard 881U +product SIERRA EM5625 0x0017 EM5625 product SIERRA MC5720 0x0218 MC5720 Wireless Modem +product SIERRA MC5720_2 0x0018 MC5720 +product SIERRA MC5725 0x0020 MC5725 +product SIERRA MINI5725 0x0220 Sierra Wireless miniPCI 5275 +product SIERRA MC8755_2 0x6802 MC8755 +product SIERRA MC8765 0x6803 MC8765 +product SIERRA MC8755 0x6804 MC8755 product SIERRA AC875U 0x6812 AC875U HSDPA USB Modem product SIERRA MC8755_3 0x6813 MC8755 HSDPA +product SIERRA MC8775_2 0x6815 MC8775 +product SIERRA AIRCARD875 0x6820 Aircard 875 HSDPA +product SIERRA MC8780 0x6832 MC8780 +product SIERRA MC8781 0x6833 MC8781 +product SIERRA TRUINSTALL 0x0fff Aircard Tru Installer /* Sigmatel products */ product SIGMATEL I_BEAD100 0x8008 i-Bead 100 MP3 Player |
