Huawei E618 and E620 is not compatible with ubsa(4).

This patch moves these device to umsm(4).

reported by Aleksander Piotrowski, ok jsg@

diff --git a/share/man/man4/ubsa.4 b/share/man/man4/ubsa.4
index 9435356..d73cd82 100644 (file)
--- a/share/man/man4/ubsa.4
+++ b/share/man/man4/ubsa.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ubsa.4,v 1.16 2008/06/26 05:42:07 ray Exp $
+.\" $OpenBSD: ubsa.4,v 1.17 2008/07/20 14:24:49 yuo Exp $
 .\" $NetBSD: ubsa.4,v 1.1 2002/10/08 13:18:42 augustss Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 26 2008 $
+.Dd $Mdocdate: July 20 2008 $
 .Dt UBSA 4
 .Os
 .Sh NAME
@@ -65,8 +65,6 @@ driver supports the following adapters:
 .It Belkin F5U120
 .It e-Tek Labs Kwik232
 .It GoHubs GoCOM232
-.It HUAWEI Mobile Connect E618
-.It HUAWEI Mobile Connect E620
 .It Novatel Wireless Merlin U740
 .It Option GlobeTrotter 3G FUSION
 .It Option GlobeTrotter 3G QUAD

diff --git a/share/man/man4/umsm.4 b/share/man/man4/umsm.4
index 935cd20..150e06d 100644 (file)
--- a/share/man/man4/umsm.4
+++ b/share/man/man4/umsm.4
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: umsm.4,v 1.29 2008/05/28 19:53:04 jmc Exp $
+.\"    $OpenBSD: umsm.4,v 1.30 2008/07/20 14:24:49 yuo Exp $
 .\"
 .\" Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 28 2008 $
+.Dd $Mdocdate: July 20 2008 $
 .Dt UMSM 4
 .Os
 .Sh NAME
@@ -43,6 +43,8 @@ driver:
 .It Li "Emobile D02HW" Ta Ta USB
 .It Li "Huawei Mobile E172" Ta Ta USB
 .It Li "Huawei Mobile E220" Ta Ta USB
+.It Li "Huawei Mobile Connect E618" Ta Ta USB
+.It Li "Huawei Mobile Connect E620" Ta Ta USB
 .It Li "Kyocera KPC650" Ta Ta CardBus
 .It Li "Novatel Wireless ES620" Ta Ta USB
 .It Li "NTT DoCoMo A2502" Ta Ta USB

diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 0853623..d56f120 100644 (file)
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ubsa.c,v 1.35 2008/07/02 15:12:18 yuo Exp $   */
+/*     $OpenBSD: ubsa.c,v 1.36 2008/07/20 14:24:49 yuo Exp $   */
 /*     $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $    */
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -215,8 +215,6 @@ const struct usb_devno ubsa_devs[] = {
        { USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM },
        /* GoHubs GO-COM232 */
        { USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232 },
-       /* HUAWEI Mobile */
-       { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E618 },
        /* Novatel Wireless U740 */
        { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINU740 },
        /* Option Vodafone Mobile Connect 3G */

diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index 9930dc7..c14aa96 100644 (file)
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: umsm.c,v 1.30 2008/07/02 07:30:13 yuo Exp $   */
+/*     $OpenBSD: umsm.c,v 1.31 2008/07/20 14:24:49 yuo Exp $   */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -101,6 +101,7 @@ static const struct usb_devno umsm_devs[] = {
        { USB_VENDOR_ANYDATA,   USB_PRODUCT_ANYDATA_ADU_500A },
        { USB_VENDOR_DELL,      USB_PRODUCT_DELL_W5500 },
        { USB_VENDOR_HUAWEI,    USB_PRODUCT_HUAWEI_E220 },
+       { USB_VENDOR_HUAWEI,    USB_PRODUCT_HUAWEI_E618 },
        { USB_VENDOR_KYOCERA2,  USB_PRODUCT_KYOCERA2_KPC650 },
        { USB_VENDOR_NOVATEL1,  USB_PRODUCT_NOVATEL1_FLEXPACKGPS },
        { USB_VENDOR_NOVATEL,   USB_PRODUCT_NOVATEL_EXPRESSCARD },