From owner-svn-src-stable-7@FreeBSD.ORG Fri Jul 10 06:55:30 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7BFC1065670; Fri, 10 Jul 2009 06:55:30 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B56518FC0A; Fri, 10 Jul 2009 06:55:30 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6A6tUNT009992; Fri, 10 Jul 2009 06:55:30 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6A6tUaW009989; Fri, 10 Jul 2009 06:55:30 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200907100655.n6A6tUaW009989@svn.freebsd.org> From: Xin LI Date: Fri, 10 Jul 2009 06:55:30 +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: r195528 - in stable/7/sys: . contrib/pf dev/usb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jul 2009 06:55:31 -0000 Author: delphij Date: Fri Jul 10 06:55:30 2009 New Revision: 195528 URL: http://svn.freebsd.org/changeset/base/195528 Log: MFC r195080 (technically this is not really a MFC but an new implementation of the original patch to apply against 7-STABLE). Add quirks for Actions MP4 player. Submitted by: John Hixson Approved by: re (kib) Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/usb/umass.c stable/7/sys/dev/usb/usbdevs Modified: stable/7/sys/dev/usb/umass.c ============================================================================== --- stable/7/sys/dev/usb/umass.c Fri Jul 10 02:19:57 2009 (r195527) +++ stable/7/sys/dev/usb/umass.c Fri Jul 10 06:55:30 2009 (r195528) @@ -887,6 +887,10 @@ static struct umass_devdescr_t umass_dev UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_INQUIRY | NO_SYNCHRONIZE_CACHE }, + { USB_VENDOR_ACTIONS, USB_PRODUCT_ACTIONS_MP4, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + NO_SYNCHRONIZE_CACHE + }, { VID_EOT, PID_EOT, RID_EOT, 0, 0 } }; Modified: stable/7/sys/dev/usb/usbdevs ============================================================================== --- stable/7/sys/dev/usb/usbdevs Fri Jul 10 02:19:57 2009 (r195527) +++ stable/7/sys/dev/usb/usbdevs Fri Jul 10 06:55:30 2009 (r195528) @@ -552,6 +552,7 @@ vendor USI 0x10ab USI vendor PLX 0x10b5 PLX vendor ASANTE 0x10bd Asante vendor SILABS 0x10c4 Silicon Labs +vendor ACTIONS 0x10d6 Actions vendor ANALOG 0x1110 Analog Devices vendor TENX 0x1130 Ten X Technology, Inc. vendor ISSC 0x1131 Integrated System Solution Corp. @@ -2471,6 +2472,9 @@ product WESTERN EXTHDD 0x0400 External product WESTERN HUB 0x0500 USB HUB product WESTERN MYBOOK 0x0901 MyBook External HDD +/* Wilson Co. Ltd products */ +product ACTIONS MP4 0x1101 Mp4 Player + /* Windbond Electronics */ product WINBOND UH104 0x5518 4-port USB Hub