From 92fb2d84f5f829bb3deeb6c5d5635c551e9a93b4 Mon Sep 17 00:00:00 2001 From: Lukas Ertl Date: Sun, 4 Feb 2007 22:14:18 +0000 Subject: [PATCH] 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 MFC in: 3 days --- share/man/man4/ubsa.4 | 16 ++++++++++++++-- sys/dev/usb/ubsa.c | 2 ++ sys/dev/usb/usbdevs | 4 ++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/share/man/man4/ubsa.4 b/share/man/man4/ubsa.4 index 0c5e834ca06b..76b196f48d08 100644 --- a/share/man/man4/ubsa.4 +++ b/share/man/man4/ubsa.4 @@ -35,7 +35,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 22, 2006 +.Dd February 4, 2007 .Dt UBSA 4 .Os .Sh NAME @@ -83,8 +83,20 @@ GoHubs GoCOM232 .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 +.Pp +The supported 3G cards provide the necessary modem port for ppp, +pppd, or mpd connections; other functions of these cards (diagnostic port, +SIM toolkit port, WLAN) are not supported. .Sh SEE ALSO .Xr tty 4 , .Xr ucom 4 , diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index b29b306e3470..f382c1d7ed9a 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -224,6 +224,8 @@ static const struct ubsa_product { { USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232 }, /* Peracom */ { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 }, + /* Novatel Wireless Merlin cards */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740 }, /* Option Vodafone MC3G */ { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G }, /* Option GlobeTrotter 3G */ diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 8aa339f8007c..7d463c8867b9 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -517,6 +517,7 @@ vendor AINCOMM 0x12fd Aincomm 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 @@ -1403,6 +1404,9 @@ product NIKON LS40 0x4000 CoolScan LS40 ED /* 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