diff options
| author | Felix Kronlage <fkr@cvs.openbsd.org> | 2008-12-04 00:23:01 +0000 |
|---|---|---|
| committer | Felix Kronlage <fkr@cvs.openbsd.org> | 2008-12-04 00:23:01 +0000 |
| commit | d7332512bd127e37c6ba4da74aa37ab915892566 (patch) | |
| tree | 310159d2e0852ca2b0dc94778bb1d1da05a20694 /sys/dev | |
| parent | 33b0d556ea11b34ad4709550e635d92027f52fef (diff) | |
move Option GlobeTrotter 3G Quad / 3G Quad Plus and the
Vodafone Mobile Connect from ubsa(4) to umsm(4) as these should work
better with that driver.
discussed with yuo@, jsg@ and deraadt@.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/ubsa.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/umsm.c | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 044a7f5f461..04c77ab2a68 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.41 2008/11/23 14:32:34 fkr Exp $ */ +/* $OpenBSD: ubsa.c,v 1.42 2008/12/04 00:23:00 fkr Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -217,12 +217,6 @@ const struct usb_devno ubsa_devs[] = { { USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232 }, /* Novatel Wireless U740 */ { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINU740 }, - /* Option Vodafone Mobile Connect 3G */ - { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G }, - /* Option GlobeTrotter 3G QUAD */ - { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD }, - /* Option GlobeTrotter 3G QUAD PLUS */ - { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUADPLUS }, /* Peracom */ { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 }, /* Qualcomm Inc. ZTE CMDMA MSM modem */ diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c index 0953b3f4842..eefce4daea7 100644 --- a/sys/dev/usb/umsm.c +++ b/sys/dev/usb/umsm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umsm.c,v 1.40 2008/12/01 22:26:27 martin Exp $ */ +/* $OpenBSD: umsm.c,v 1.41 2008/12/04 00:23:00 fkr Exp $ */ /* * Copyright (c) 2008 Yojiro UO <yuo@nui.org> @@ -128,10 +128,13 @@ static const struct umsm_type umsm_devs[] = { {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620 }, 0}, {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GFUSION }, 0}, {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GPLUS }, 0}, + {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD }, 0}, + {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUADPLUS }, 0}, {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GSICON72 }, DEV_UMASS1}, {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTHSDPA225 }, DEV_UMASS2}, {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36 }, 0}, {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_SCORPION }, 0}, + {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G }, 0}, {{ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_DRIVER }, DEV_UMASS1}, {{ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_HSDPA }, 0}, {{ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_HSDPA2 }, 0}, |