svn commit: r210515 - in head/sys/dev/usb: . quirk
Gavin Atkinson
gavin at FreeBSD.org
Mon Jul 26 20:44:30 UTC 2010
Author: gavin
Date: Mon Jul 26 20:44:29 2010
New Revision: 210515
URL: http://svn.freebsd.org/changeset/base/210515
Log:
Prevent ukbd(4) and uhid(4) from attaching when a WiSPY DBx Spectrum
Analyzer is attached.
PR: usb/134631
Submitted by: Jesse Kempf <jkempf davisvision.com>
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 19:53:09 2010 (r210514)
+++ head/sys/dev/usb/quirk/usb_quirk.c Mon Jul 26 20:44:29 2010 (r210515)
@@ -121,10 +121,11 @@ static struct usb_quirk_entry usb_quirks
/* Devices which should be ignored by both ukbd and uhid */
USB_QUIRK(CYPRESS, WISPY1A, 0x0000, 0xffff, UQ_KBD_IGNORE, UQ_HID_IGNORE),
USB_QUIRK(METAGEEK, WISPY1B, 0x0000, 0xffff, UQ_KBD_IGNORE, UQ_HID_IGNORE),
+ USB_QUIRK(METAGEEK, WISPY24X, 0x0000, 0xffff, UQ_KBD_IGNORE, UQ_HID_IGNORE),
+ USB_QUIRK(METAGEEK2, WISPYDBX, 0x0000, 0xffff, UQ_KBD_IGNORE, UQ_HID_IGNORE),
USB_QUIRK(TENX, UAUDIO0, 0x0101, 0x0101, UQ_AUDIO_SWAP_LR),
/* MS keyboards do weird things */
USB_QUIRK(MICROSOFT, WLINTELLIMOUSE, 0x0000, 0xffff, UQ_MS_LEADING_BYTE),
- USB_QUIRK(METAGEEK, WISPY24X, 0x0000, 0xffff, UQ_KBD_IGNORE, UQ_HID_IGNORE),
/* 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),
Modified: head/sys/dev/usb/usbdevs
==============================================================================
--- head/sys/dev/usb/usbdevs Mon Jul 26 19:53:09 2010 (r210514)
+++ head/sys/dev/usb/usbdevs Mon Jul 26 20:44:29 2010 (r210515)
@@ -646,6 +646,7 @@ vendor MPMAN 0x1cae MpMan
vendor DRESDENELEKTRONIK 0x1cf1 dresden elektronik
vendor PEGATRON 0x1d4d Pegatron
vendor QISDA 0x1da5 Qisda
+vendor METAGEEK2 0x1dd5 MetaGeek
vendor ALINK 0x1e0e Alink
vendor AIRTIES 0x1eda AirTies
vendor DLINK 0x2001 D-Link
@@ -2021,6 +2022,7 @@ product MERLIN V620 0x1110
/* MetaGeek products */
product METAGEEK WISPY1B 0x083e MetaGeek Wi-Spy
product METAGEEK WISPY24X 0x083f MetaGeek Wi-Spy 2.4x
+product METAGEEK2 WISPYDBX 0x5000 MetaGeek Wi-Spy DBx
/* Metricom products */
product METRICOM RICOCHET_GS 0x0001 Ricochet GS
More information about the svn-src-all
mailing list