summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2008-10-19 11:40:02 +0000
committerjoerg <joerg@NetBSD.org>2008-10-19 11:40:02 +0000
commit7e64fc36e4025d4a38e156f6e14ce5bb4bb0348e (patch)
tree5897ee28645833c01d15da29ef92d4ef9f4661cc /sys/dev/usb
parent5519d99b9a30a73abb9b0725747ddc9d5e2d5612 (diff)
Remove two devices that are handled by ubsa and might need special
handling from u3g until further reports. Move a number of data cards from ugensa to u3g based on the FreeBSD list.
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/u3g.c53
-rw-r--r--sys/dev/usb/ugensa.c21
2 files changed, 50 insertions, 24 deletions
diff --git a/sys/dev/usb/u3g.c b/sys/dev/usb/u3g.c
index ef504ea5992..aa161df2a53 100644
--- a/sys/dev/usb/u3g.c
+++ b/sys/dev/usb/u3g.c
@@ -75,18 +75,61 @@ struct ucom_methods u3g_methods = {
static const struct usb_devno u3g_devs[] = {
/* OEM: Option N.V. */
- { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADUMTS2 },
- { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADUMTS },
{ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADPLUSUMTS },
{ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_HSDPA },
- { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_VODAFONEMC3G },
+ { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GTMAXHSUPA },
+ /* OEM: Qualcomm, Inc. */
+ { USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM },
/* OEM: Huawei */
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE },
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220 },
/* OEM: Novatel */
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MERLINV620 },
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_ES620 },
{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MC950D },
- // { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MC950D_DRIVER },
-
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U720 },
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U727 },
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MERLINU740 },
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U740_2 },
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U870 },
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MERLINV620 },
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_S720 },
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_V740 },
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_X950D },
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_XU870 },
+ { USB_VENDOR_DELL, USB_PRODUCT_DELL_W5500 },
+#if 0
+ { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MC950D_DRIVER },
+#endif
+ /* OEM: Merlin */
+ { USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620 },
+
+ /* OEM: Sierra Wireless: */
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD595 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC597E },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_C597 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880E },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880U },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881E },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881U },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720_2 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725 },
+ { 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 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8765 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC875U },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781 },
{ 0, 0 }
};
diff --git a/sys/dev/usb/ugensa.c b/sys/dev/usb/ugensa.c
index 6ecc4e1270f..d9ba27c281e 100644
--- a/sys/dev/usb/ugensa.c
+++ b/sys/dev/usb/ugensa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.21 2008/09/06 21:38:44 rmind Exp $ */
+/* $NetBSD: ugensa.c,v 1.22 2008/10/19 11:40:02 joerg Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.21 2008/09/06 21:38:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.22 2008/10/19 11:40:02 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,9 +95,6 @@ static const struct ugensa_type ugensa_devs[] = {
{{ USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220 }, 0 },
{{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_FLEXPACKGPS }, 0 },
{{ USB_VENDOR_QUALCOMM_K, USB_PRODUCT_QUALCOMM_K_CDMA_MSM_K }, 0 },
- {{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580 }, 0 },
- {{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD595 }, 0 },
- {{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725}, 0 },
{{ USB_VENDOR_DELL, USB_PRODUCT_DELL_HSDPA }, 0 },
/*
@@ -106,24 +103,10 @@ static const struct ugensa_type ugensa_devs[] = {
*/
{{ USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_500A }, UNTESTED },
- {{ USB_VENDOR_DELL, USB_PRODUCT_DELL_W5500 }, UNTESTED },
{{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_EXPRESSCARD }, UNTESTED },
- {{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MERLINV620 }, UNTESTED },
- {{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_S720 }, UNTESTED },
- {{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U720 }, UNTESTED },
- {{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U727 }, UNTESTED },
- {{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_XU870 }, UNTESTED },
- {{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_ES620 }, UNTESTED },
{{ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_HSDPA }, UNTESTED },
{{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625 }, UNTESTED },
{{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD875 }, UNTESTED },
- {{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720 }, UNTESTED },
- {{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725 }, UNTESTED },
- {{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755 }, UNTESTED },
- {{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2 }, UNTESTED },
- {{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_3 }, UNTESTED },
- {{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8765 }, UNTESTED },
- {{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775 }, UNTESTED }
};
#define ugensa_lookup(v, p) \
((const struct ugensa_type *)usb_lookup(ugensa_devs, v, p))