From nobody@FreeBSD.org  Wed Nov 29 21:51:27 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B280A16A536
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 29 Nov 2006 21:51:27 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2644743E03
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 29 Nov 2006 21:50:10 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id kATLoDai035230
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 29 Nov 2006 21:50:13 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id kATLoDEt035227;
	Wed, 29 Nov 2006 21:50:13 GMT
	(envelope-from nobody)
Message-Id: <200611292150.kATLoDEt035227@www.freebsd.org>
Date: Wed, 29 Nov 2006 21:50:13 GMT
From: Volker Werth<volker@vwsoft.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] support for 3G/WCDMA cards Option Globetrotter, Novatel Merlin U740
X-Send-Pr-Version: www-3.0

>Number:         106033
>Category:       kern
>Synopsis:       [usb] [patch] support for 3G/WCDMA cards Option Globetrotter, Novatel Merlin U740
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    le
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 29 22:00:30 GMT 2006
>Closed-Date:    Wed Feb 07 19:54:45 GMT 2007
>Last-Modified:  Wed Feb 07 19:54:45 GMT 2007
>Originator:     Volker Werth
>Release:        RELENG_6
>Organization:
>Environment:
FreeBSD cesar.sz.vwsoft.com 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #55: Sun Nov 26 02:23:07 CET 2006     root@cesar.sz.vwsoft.com:/usr/obj/usr/src/sys/CESAR  i386
>Description:
add support for the following 3G / WCDMA (UMTS/UTRAN) cards (cardbus):

Novatel Wireless Merlin U740 
Option N.V. Globetrotter 3G
Option N.V. Globetrotter 3G Quad
Option N.V. Globetrotter 3G Fusion
Option N.V. Globetrotter 3G Fusion Quad

change usb vendor VODAFONE to vendor OPTIONNV as Option N.V. is original manufacturer (Vodafone MCC-3G is an OEM product).

Patchset is against recent (2006-11-26) RELENG_6.

All listed cards support GSM, GPRS and UMTS (3G) mode.
Merlin U740 also supports EDGE and HSDPA (1.8 MBit/s). HSDPA throughput
not tested with ubsa as I don't have HSDPA connectivity here in my reception
area.

3G support using ubsa is only a temporary solution as most cards support
more than just the modem channel and ubsa is somewhat limited. But at least
we're getting support of basic functionality of these cards.


+++
Please add the following text to ubsa man-page description (I'm not an
expert to Latex, so I'm unable to modify the manpage quickly):

"The supported 3G cards provide the neccessary modem port to support ppp,
pppd or mpd connections. All other functionality is currently not supported
(diagnostic port, SIM toolkit port). Support for this functionality require
a complete rewrite of ubsa or the creation of a new driver for 3G / GPRS cards.

The modem port of these cards provides a set of Hayes compatible AT modem
commands.

Novatel Merlin U740 supports HSDPA and EDGE mode operation which has not
been tested (no HSDPA / EDGE reception for testing).

The WLAN functionality of the Option Globetrotter Fusion family is completely
not supported by this driver and would require further development."
>How-To-Repeat:

>Fix:
--- usbdevs.orig        Wed Nov 29 21:28:55 2006
+++ usbdevs     Wed Nov 29 21:46:17 2006
@@ -452,7 +452,7 @@
 vendor GREENHOUSE      0x0a6b  GREENHOUSE
 vendor GEOCAST         0x0a79  Geocast
 vendor NEODIO          0x0aec  Neodio
-vendor VODAFONE                0x0af0  Vodafone
+vendor OPTIONNV                0x0af0  Option N.V.
 vendor ASUS            0x0b05  ASUS
 vendor TODOS           0x0b0c  Todos Data System
 vendor SIIG2           0x0b39  SIIG
@@ -509,6 +509,7 @@
 vendor MOBILITY                0x1342  Mobility
 vendor LINKSYS4                0x13b1  Linksys
 vendor SHARK           0x13d2  Shark
+vendor NOVATEL         0x1410  Novatel Wireless
 vendor RADIOSHACK      0x1453  Radio Shack
 vendor SILICOM         0x1485  Silicom
 vendor RALINK          0x148f  Ralink Technology
@@ -1334,6 +1335,9 @@
 /* NovaTech Products */
 product NOVATECH NV902         0x9020  NovaTech NV-902W
 
+/* Novatel Wireless products */
+product NOVATEL        U740            0x1400  Merlin U740
+
 /* Olympus products */
 product OLYMPUS C1             0x0102  C-1 Digital Camera
 product OLYMPUS C700           0x0105  C-700 Ultra Zoom
@@ -1345,6 +1349,11 @@
 /* OnSpec Electronic, Inc. */
 product ONSPEC UCF100          0xa400  FlashLink UCF-100 CompactFlash Reader
 
+/* Option N.V. Wireless */
+product        OPTIONNV MC3G           0x5000  Globetrotter 3G/Vodafone MCC
+product        OPTIONNV GT3GFUSION     0x6000  Globetrotter 3G Fusion
+product        OPTIONNV GT3GQUAD       0x6300  Globetrotter 3G Quad
+
 /* Palm Computing, Inc. product */
 product PALM SERIAL            0x0080  USB Serial
 product PALM M500              0x0001  Palm m500
@@ -1667,9 +1676,6 @@
 product VISIONEER 6200         0x0311  OneTouch 6200
 product VISIONEER 8100         0x0321  OneTouch 8100
 product VISIONEER 8600         0x0331  OneTouch 8600
-
-/* Vodafone products */
-product VODAFONE MC3G          0x5000  Mobile Connect 3G datacard
 
 /* VTech products */
 product VTECH RT2570           0x3012  RT2570


--- ubsa.c.orig Wed Nov 29 22:08:32 2006
+++ ubsa.c      Wed Nov 29 22:11:19 2006
@@ -224,8 +224,12 @@
        { USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232 },
        /* Peracom */
        { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 },
-       /* Vodafone */
-       { USB_VENDOR_VODAFONE, USB_PRODUCT_VODAFONE_MC3G },
+       /* Novatel Wireless Merlin cards */
+       { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740 },
+       /* Option N.V. Wireless */
+       { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_MC3G },
+       { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GT3GFUSION },
+       { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GT3GQUAD },
        { 0, 0 }
 };


--- ubsa.4.orig Wed Nov 29 22:35:39 2006
+++ ubsa.4      Wed Nov 29 22:40:08 2006
@@ -83,7 +83,15 @@
 .It
 Peracom single port serial adapter
 .It
-Vodafone Mobile Connect 3G datacard
+Novatel Wireless Merlin U740 (only basic modem port supported)
+.It
+Option Globetrotter 3G (aka Vodafone Mobile Connect Card 3G)
+.It
+Option Globetrotter 3G Quad
+.It
+Option Globetrotter 3G Fusion (no WLAN support, only basic 3G modem port)
+.It
+Option Globetrotter 3G Fusion Quad (no WLAN support)
 .El
 .Sh SEE ALSO
 .Xr tty 4 ,

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-usb 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Nov 30 09:07:35 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106033 
Responsible-Changed-From-To: freebsd-usb->le 
Responsible-Changed-By: le 
Responsible-Changed-When: Sun Feb 4 21:49:00 UTC 2007 
Responsible-Changed-Why:  
Take care of this one. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106033 
State-Changed-From-To: open->patched 
State-Changed-By: le 
State-Changed-When: Sun Feb 4 22:16:58 UTC 2007 
State-Changed-Why:  
Thank you, patch adjusted and committed to -current. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106033 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/106033: commit references a PR
Date: Sun,  4 Feb 2007 22:14:27 +0000 (UTC)

 le          2007-02-04 22:14:18 UTC
 
   FreeBSD src repository
 
   Modified files:
     sys/dev/usb          usbdevs ubsa.c 
     share/man/man4       ubsa.4 
   Log:
   Add support for another 3G card and update man page accordingly.
   The patch from the PR was a little outdated w/regards to the
   Vodafone vendor string.
   
   PR:            kern/106033
   Submitted by:  Volker Werth <volker_AT_vwsoft.com>
   MFC in:        3 days
   
   Revision  Changes    Path
   1.8       +14 -2     src/share/man/man4/ubsa.4
   1.21      +2 -0      src/sys/dev/usb/ubsa.c
   1.286     +4 -0      src/sys/dev/usb/usbdevs
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: le 
State-Changed-When: Wed Feb 7 19:54:22 UTC 2007 
State-Changed-Why:  
Changes merged to RELENG_6. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106033 
>Unformatted:
