From owner-svn-src-all@FreeBSD.ORG Tue Apr 6 13:12:12 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72867106566B; Tue, 6 Apr 2010 13:12:12 +0000 (UTC) (envelope-from n_hibma@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4617F8FC17; Tue, 6 Apr 2010 13:12:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o36DCCZZ074042; Tue, 6 Apr 2010 13:12:12 GMT (envelope-from n_hibma@svn.freebsd.org) Received: (from n_hibma@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o36DCCYA074039; Tue, 6 Apr 2010 13:12:12 GMT (envelope-from n_hibma@svn.freebsd.org) Message-Id: <201004061312.o36DCCYA074039@svn.freebsd.org> From: Nick Hibma Date: Tue, 6 Apr 2010 13:12:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206270 - stable/7/sys/dev/usb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2010 13:12:12 -0000 Author: n_hibma Date: Tue Apr 6 13:12:11 2010 New Revision: 206270 URL: http://svn.freebsd.org/changeset/base/206270 Log: Add the ID of the Option GTM382 Mini PCI express module Approved by: re (implicit) Modified: stable/7/sys/dev/usb/u3g.c stable/7/sys/dev/usb/usbdevs Modified: stable/7/sys/dev/usb/u3g.c ============================================================================== --- stable/7/sys/dev/usb/u3g.c Tue Apr 6 13:04:27 2010 (r206269) +++ stable/7/sys/dev/usb/u3g.c Tue Apr 6 13:12:11 2010 (r206270) @@ -99,11 +99,11 @@ static const struct u3g_speeds_s u3g_spe #define U3GSP_UMTS 3 {384000, 64000}, #define U3GSP_HSDPA 4 - {1200000, 384000}, + {7200000, 384000}, #define U3GSP_HSUPA 5 - {1200000, 384000}, + {7200000, 2000000}, #define U3GSP_HSPA 6 - {7200000, 384000}, + {7200000, 2000000}, }; #define U3GIBUFSIZE 1024 @@ -135,6 +135,7 @@ static const struct u3g_dev_type_s u3g_d {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36 }, U3GSP_HSDPA, U3GINIT_NONE }, {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAXHSUPA }, U3GSP_HSDPA, U3GINIT_NONE }, {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G }, U3GSP_UMTS, U3GINIT_NONE }, + {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTM382 }, U3GSP_HSPA, U3GINIT_NONE }, /* OEM: Qualcomm, Inc. */ {{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_STOR }, U3GSP_CDMA, U3GINIT_ZTESTOR }, {{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM }, U3GSP_CDMA, U3GINIT_EJECT }, Modified: stable/7/sys/dev/usb/usbdevs ============================================================================== --- stable/7/sys/dev/usb/usbdevs Tue Apr 6 13:04:27 2010 (r206269) +++ stable/7/sys/dev/usb/usbdevs Tue Apr 6 13:12:11 2010 (r206270) @@ -1917,6 +1917,7 @@ product OPTION GT3GPLUS 0x6600 GlobeTro product OPTION GTICON322 0xd033 GlobeTrotter Icon322 storage product OPTION GTMAX36 0x6701 GlobeTrotter Max 3.6 Modem product OPTION GTMAXHSUPA 0x7001 GlobeTrotter HSUPA +product OPTION GTM382 0x7601 GTM382 /* OQO */ product OQO WIFI01 0x0002 model 01 WiFi interface