[src/trunk]: src/sys/dev/usb Add support for the Novatel Wireless U760 3g USB...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3f8847e0d488
branches:  trunk
changeset: 755729:3f8847e0d488
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Jun 17 23:25:01 2010 +0000

description:
Add support for the Novatel Wireless U760 3g USB Modem.  Tested
by Matthew Sporleder.

diffstat:

 sys/dev/usb/u3g.c |  34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diffs (77 lines):

diff -r 5c65797216f8 -r 3f8847e0d488 sys/dev/usb/u3g.c
--- a/sys/dev/usb/u3g.c Thu Jun 17 23:22:50 2010 +0000
+++ b/sys/dev/usb/u3g.c Thu Jun 17 23:25:01 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: u3g.c,v 1.13 2010/06/14 22:22:44 riz Exp $     */
+/*     $NetBSD: u3g.c,v 1.14 2010/06/17 23:25:01 riz Exp $     */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.13 2010/06/14 22:22:44 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.14 2010/06/17 23:25:01 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -191,7 +191,9 @@
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_ES620 },
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MC950D },
 #if 0
+       /* These are matched in u3ginit_match() */
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MC950D_DRIVER },
+       { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U760_DRIVER },
 #endif
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MERLINU740 },
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MERLINV620 },
@@ -199,6 +201,7 @@
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U720 },
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U727 },
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U740_2 },
+       { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U760 },
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U870 },
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_V740 },
        { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_X950D },
@@ -453,9 +456,16 @@
                        return u3g_huawei_reinit(uaa->device);
        }
 
-       if (uaa->vendor == USB_VENDOR_NOVATEL2 &&
-           uaa->product == USB_PRODUCT_NOVATEL2_MC950D_DRIVER)
-               return u3g_novatel_reinit(uaa->device);
+       if (uaa->vendor == USB_VENDOR_NOVATEL2) {
+               switch (uaa->product){
+               case USB_PRODUCT_NOVATEL2_MC950D_DRIVER:
+               case USB_PRODUCT_NOVATEL2_U760_DRIVER:
+                       return u3g_novatel_reinit(uaa->device);
+                       break;
+               default:
+                       break;
+               }
+       }
 
        if (uaa->vendor == USB_VENDOR_SIERRA &&
            uaa->product == USB_PRODUCT_SIERRA_INSTALLER)
@@ -472,10 +482,16 @@
        aprint_naive("\n");
        aprint_normal(": Switching to 3G mode\n");
 
-       if (uaa->vendor == USB_VENDOR_NOVATEL2 &&
-           uaa->product == USB_PRODUCT_NOVATEL2_MC950D_DRIVER) {
-               /* About to disappear... */
-               return;
+       if (uaa->vendor == USB_VENDOR_NOVATEL2) {
+               switch (uaa->product) {
+               case USB_PRODUCT_NOVATEL2_MC950D_DRIVER:
+               case USB_PRODUCT_NOVATEL2_U760_DRIVER:
+                       /* About to disappear... */
+                       return;
+                       break;
+               default:
+                       break;
+               }
        }
 
        /* Move the device into the configured state. */