From owner-svn-src-all@FreeBSD.ORG Sat Aug 7 19:27:50 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 169431065673; Sat, 7 Aug 2010 19:27:50 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DEBD48FC1C; Sat, 7 Aug 2010 19:27:49 +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 o77JRn6v033710; Sat, 7 Aug 2010 19:27:49 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o77JRnVQ033707; Sat, 7 Aug 2010 19:27:49 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201008071927.o77JRnVQ033707@svn.freebsd.org> From: Gavin Atkinson Date: Sat, 7 Aug 2010 19:27:49 +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: r211035 - 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: Sat, 07 Aug 2010 19:27:50 -0000 Author: gavin Date: Sat Aug 7 19:27:49 2010 New Revision: 211035 URL: http://svn.freebsd.org/changeset/base/211035 Log: Merge r210534 from head: Add support for the Longcheer WM66 USB HSDPA Modem to u3g(4) PR: usb/129945 Submitted by: Antonio Hilario Modified: stable/7/sys/dev/usb/u3g.c stable/7/sys/dev/usb/usbdevs Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/usb/u3g.c ============================================================================== --- stable/7/sys/dev/usb/u3g.c Sat Aug 7 19:27:36 2010 (r211034) +++ stable/7/sys/dev/usb/u3g.c Sat Aug 7 19:27:49 2010 (r211035) @@ -193,6 +193,8 @@ static const struct u3g_dev_type_s u3g_d /* OEM: CMOTECH */ {{ USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CGU628 }, U3GSP_HSDPA, U3GINIT_CMOTECH }, {{ USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_DISK }, U3GSP_HSDPA, U3GINIT_NONE }, + /* OEM: Longcheer */ + { USB_VENDOR_LONGCHEER, USB_PRODUCT_LONGCHEER_WM66 }, U3GSP_HSDPA, U3GINIT_HUAWEI }, }; #define u3g_lookup(v, p) ((const struct u3g_dev_type_s *)usb_lookup(u3g_devs, v, p)) Modified: stable/7/sys/dev/usb/usbdevs ============================================================================== --- stable/7/sys/dev/usb/usbdevs Sat Aug 7 19:27:36 2010 (r211034) +++ stable/7/sys/dev/usb/usbdevs Sat Aug 7 19:27:49 2010 (r211035) @@ -627,6 +627,7 @@ vendor LINKSYS3 0x1915 Linksys vendor QUALCOMMINC 0x19d2 Qualcomm, Incorporated vendor MATRIXORBITAL 0x1b3d Matrix Orbital vendor STELERA 0x1a8d Stelera Wireless +vendor LONGCHEER 0x1c9e Longcheer Holdings, Ltd. vendor DRESDENELEKTRONIK 0x1cf1 dresden elektronik vendor METAGEEK2 0x1dd5 MetaGeek vendor DLINK 0x2001 D-Link @@ -1667,6 +1668,9 @@ product LOGITECH QUICKCAMPRO2 0xd001 Qui product LOGITEC LDR_H443SU2 0x0033 DVD Multi-plus unit LDR-H443SU2 product LOGITEC LDR_H443U2 0x00b3 DVD Multi-plus unit LDR-H443U2 +/* Longcheer Holdings, Ltd. products */ +product LONGCHEER WM66 0x6061 Longcheer WM66 HSDPA USB modem + /* Lucent products */ product LUCENT EVALKIT 0x1001 USS-720 evaluation kit