svn commit: r210516 - in head/sys/dev/usb: . quirk

[Gavin Atkinson]

Author: gavin
Date: Mon Jul 26 21:22:57 2010
New Revision: 210516
URL: http://svn.freebsd.org/changeset/base/210516

Log:
  Prevent uhid(4) from attaching to the Gembird Silver Shield remote power
  plug.  Note that the Vendor ID 0x04b4 is officially assigned to Cypress,
  so use that instead of adding a second vendor with an identical ID, in the
  same way other similar cases are treated in usb/usbdevs.
  
  PR:		usb/132785
  Submitted by:	Dirk-Willem van Gulik <dirkx webweaving.org>
  MFC after:	1 week

Modified:
  head/sys/dev/usb/quirk/usb_quirk.c
  head/sys/dev/usb/usbdevs

Modified: head/sys/dev/usb/quirk/usb_quirk.c
==============================================================================
--- head/sys/dev/usb/quirk/usb_quirk.c	Mon Jul 26 20:44:29 2010	(r210515)
+++ head/sys/dev/usb/quirk/usb_quirk.c	Mon Jul 26 21:22:57 2010	(r210516)
@@ -111,6 +111,7 @@ static struct usb_quirk_entry usb_quirks
 	USB_QUIRK(APC, UPS, 0x0000, 0xffff, UQ_HID_IGNORE),
 	USB_QUIRK(BELKIN, F6C550AVR, 0x0000, 0xffff, UQ_HID_IGNORE),
 	USB_QUIRK(CYBERPOWER, 1500CAVRLCD, 0x0000, 0xffff, UQ_HID_IGNORE),
+	USB_QUIRK(CYPRESS, SILVERSHIELD, 0x0000, 0xffff, UQ_HID_IGNORE),
 	USB_QUIRK(DELORME, EARTHMATE, 0x0000, 0xffff, UQ_HID_IGNORE),
 	USB_QUIRK(ITUNERNET, USBLCD2X20, 0x0000, 0xffff, UQ_HID_IGNORE),
 	USB_QUIRK(ITUNERNET, USBLCD4X20, 0x0000, 0xffff, UQ_HID_IGNORE),

Modified: head/sys/dev/usb/usbdevs
==============================================================================
--- head/sys/dev/usb/usbdevs	Mon Jul 26 20:44:29 2010	(r210515)
+++ head/sys/dev/usb/usbdevs	Mon Jul 26 21:22:57 2010	(r210516)
@@ -1268,6 +1268,7 @@ product CYPRESS IKARILASER	0x121f	Ikari 
 product CYPRESS USBRS232	0x5500	USB-RS232 Interface
 product CYPRESS SLIM_HUB	0x6560	Slim Hub
 product CYPRESS XX6830XX	0x6830	PATA Storage Device
+product CYPRESS SILVERSHIELD	0xfd13	Gembird Silver Shield PM
 
 /* Daisy Technology products */
 product DAISY DMC		0x6901	USB MultiMedia Reader