svn commit: r195528 - in stable/7/sys: . contrib/pf dev/usb

[Xin LI]

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 <john ixsystems com>
  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