Author: hselasky
Date: Fri Apr 29 11:37:06 2016
New Revision: 298781
URL: https://svnweb.freebsd.org/changeset/base/298781

Log:
  MFC r297696 and r298424:
  Add new USB quirks.
  
  Submitted by: AJ <aleksanderlo...@live.com>
  PR:           208623
  Submitted by: Naram Qashat <cyberb...@cyberbotx.com>
  PR:           208642

Modified:
  stable/10/sys/dev/usb/quirk/usb_quirk.c
  stable/10/sys/dev/usb/usbdevs
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/quirk/usb_quirk.c
==============================================================================
--- stable/10/sys/dev/usb/quirk/usb_quirk.c     Fri Apr 29 11:31:27 2016        
(r298780)
+++ stable/10/sys/dev/usb/quirk/usb_quirk.c     Fri Apr 29 11:37:06 2016        
(r298781)
@@ -136,6 +136,8 @@ static struct usb_quirk_entry usb_quirks
        USB_QUIRK(CORSAIR, K60, 0x0000, 0xffff, UQ_KBD_BOOTPROTO),
        /* Quirk for Corsair Vengeance K70 keyboard */
        USB_QUIRK(CORSAIR, K70, 0x0000, 0xffff, UQ_KBD_BOOTPROTO),
+       /* Quirk for Corsair STRAFE Gaming keyboard */
+       USB_QUIRK(CORSAIR, STRAFE, 0x0000, 0xffff, UQ_KBD_BOOTPROTO),
        /* umodem(4) device quirks */
        USB_QUIRK(METRICOM, RICOCHET_GS, 0x100, 0x100, UQ_ASSUME_CM_OVER_DATA),
        USB_QUIRK(SANYO, SCP4900, 0x000, 0x000, UQ_ASSUME_CM_OVER_DATA),
@@ -529,6 +531,9 @@ static struct usb_quirk_entry usb_quirks
 
        /* DYMO LabelManager Pnp */
        USB_QUIRK(DYMO, LABELMANAGERPNP, 0x0000, 0xffff, UQ_MSC_DYMO_EJECT),
+
+       /* Holtek USB gaming keyboard */
+       USB_QUIRK(HOLTEK, F85, 0x0000, 0xffff, UQ_KBD_BOOTPROTO),
 };
 #undef USB_QUIRK_VP
 #undef USB_QUIRK

Modified: stable/10/sys/dev/usb/usbdevs
==============================================================================
--- stable/10/sys/dev/usb/usbdevs       Fri Apr 29 11:31:27 2016        
(r298780)
+++ stable/10/sys/dev/usb/usbdevs       Fri Apr 29 11:37:06 2016        
(r298781)
@@ -1509,6 +1509,7 @@ product COREGA FETHER_USB_TXC     0x9601  FEt
 /* Corsair products */
 product CORSAIR K60            0x0a60  Corsair Vengeance K60 keyboard
 product CORSAIR K70            0x1b09  Corsair Vengeance K70 keyboard
+product CORSAIR STRAFE         0x1b15  Cossair STRAFE Gaming keyboard
 
 /* Creative products */
 product CREATIVE NOMAD_II      0x1002  Nomad II MP3 player
@@ -2266,6 +2267,9 @@ product HIDGLOBAL CM6020  0x1784  Omnikey 
 product HITACHI DVDCAM_DZ_MV100A       0x0004  DVD-CAM DZ-MV100A Camcorder
 product HITACHI DVDCAM_USB     0x001e  DVDCAM USB HS Interface
 
+/* Holtek products */
+product HOLTEK F85             0xa030  Holtek USB gaming keyboard
+
 /* HP products */
 product HP 895C                        0x0004  DeskJet 895C
 product HP 4100C               0x0101  Scanjet 4100C
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to