svn commit: r191832 - in stable/6/sys: . contrib/pf dev/cxgb dev/usb

[Remko Lodder]

Author: remko
Date: Tue May  5 17:22:48 2009
New Revision: 191832
URL: http://svn.freebsd.org/changeset/base/191832

Log:
  MFC r182896
  
     Add support for the CyberPower CP1500AVRLCD.
  
     PR: 126845
     Submitted by: gavin
     Approved by: imp (mentor, implicit)
     MFC after: 1 week
  
  Approved by:	imp (mentor, implicit)

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)
  stable/6/sys/dev/usb/usb_quirks.c
  stable/6/sys/dev/usb/usbdevs

Modified: stable/6/sys/dev/usb/usb_quirks.c
==============================================================================
--- stable/6/sys/dev/usb/usb_quirks.c	Tue May  5 16:45:25 2009	(r191831)
+++ stable/6/sys/dev/usb/usb_quirks.c	Tue May  5 17:22:48 2009	(r191832)
@@ -122,6 +122,8 @@ Static const struct usbd_quirk_entry {
 	ANY, { UQ_HID_IGNORE }},
  { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR,
 	ANY, { UQ_HID_IGNORE }},
+ { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500CAVRLCD,
+	ANY, { UQ_HID_IGNORE }},
  { USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE,
 	ANY, { UQ_HID_IGNORE }},
  { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1,

Modified: stable/6/sys/dev/usb/usbdevs
==============================================================================
--- stable/6/sys/dev/usb/usbdevs	Tue May  5 16:45:25 2009	(r191831)
+++ stable/6/sys/dev/usb/usbdevs	Tue May  5 17:22:48 2009	(r191832)
@@ -351,6 +351,7 @@ vendor EICON		0x0734	Eicon Networks
 vendor DIGITALSTREAM	0x074e	Digital Stream
 vendor AUREAL		0x0755	Aureal
 vendor MIDIMAN		0x0763	Midiman
+vendor CYBERPOWER	0x0764	Cyber Power Systems, Inc.
 vendor LINKSYS2		0x077b	Linksys
 vendor GRIFFIN		0x077d	Griffin
 vendor SANDISK		0x0781	SanDisk
@@ -820,6 +821,9 @@ product CURITEL HX550C		0x1101	CDMA 2000
 product CURITEL HX57XB		0x2101	CDMA 2000 1xRTT USB modem (HX-570/575B/PR-600)
 product CURITEL PC5740		0x3701	Broadband wireless modem
 
+/* CyberPower products */
+product CYBERPOWER 1500CAVRLCD	0x0501	1500CAVRLCD
+
 /* Cypress Semiconductor products */
 product CYPRESS MOUSE		0x0001	mouse
 product CYPRESS THERMO		0x0002	thermometer