From owner-svn-src-all@FreeBSD.ORG Tue Aug 3 22:06:34 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7D15106567B; Tue, 3 Aug 2010 22:06:34 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B53AF8FC2A; Tue, 3 Aug 2010 22:06:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o73M6Ywl074595; Tue, 3 Aug 2010 22:06:34 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o73M6YkX074592; Tue, 3 Aug 2010 22:06:34 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201008032206.o73M6YkX074592@svn.freebsd.org> From: Gavin Atkinson Date: Tue, 3 Aug 2010 22:06:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210828 - stable/7/sys/dev/usb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Aug 2010 22:06:35 -0000 Author: gavin Date: Tue Aug 3 22:06:34 2010 New Revision: 210828 URL: http://svn.freebsd.org/changeset/base/210828 Log: Merge r210515,210516,210543 from head: Prevent ukbd(4) and uhid(4) from attaching when a WiSPY DBx Spectrum Analyzer is attached. [1] Prevent uhid(4) from attaching to the Gembird Silver Shield remote power plug. [2] Prevent uhid(4) from attaching to the Liebert PowerSure Personal XT UPS. [3] PR: usb/134631 [1], usb/132785 [2], usb/129251 [3] Submitted by: Jesse Kempf [1] Submitted by: Dirk-Willem van Gulik [2] Submitted by: Andrew D Wiles [3] Modified: stable/7/sys/dev/usb/usb_quirks.c stable/7/sys/dev/usb/usbdevs Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/usb/usb_quirks.c ============================================================================== --- stable/7/sys/dev/usb/usb_quirks.c Tue Aug 3 20:56:23 2010 (r210827) +++ stable/7/sys/dev/usb/usb_quirks.c Tue Aug 3 22:06:34 2010 (r210828) @@ -100,8 +100,12 @@ static const struct usbd_quirk_entry { ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500CAVRLCD, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_SILVERSHIELD, + ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_LIEBERT, USB_PRODUCT_LIEBERT_POWERSURE_PXT, + ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_ITUNERNET, USB_PRODUCT_ITUNERNET_USBLCD2X20, ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, @@ -120,6 +124,8 @@ static const struct usbd_quirk_entry { ANY, { UQ_KBD_IGNORE }}, { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY24X, ANY, { UQ_KBD_IGNORE }}, + { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK2_WISPYDBX, + ANY, { UQ_KBD_IGNORE }}, { 0, 0, 0, { 0 } } }; Modified: stable/7/sys/dev/usb/usbdevs ============================================================================== --- stable/7/sys/dev/usb/usbdevs Tue Aug 3 20:56:23 2010 (r210827) +++ stable/7/sys/dev/usb/usbdevs Tue Aug 3 22:06:34 2010 (r210828) @@ -350,6 +350,7 @@ vendor ASIAMD 0x06be Asia Microelectron vendor BIZLINK 0x06c4 Bizlink International vendor KEYSPAN 0x06cd Keyspan / InnoSys Inc. vendor AASHIMA 0x06d6 Aashima Technology +vendor LIEBERT 0x06da Liebert vendor MULTITECH 0x06e0 MultiTech vendor ADS 0x06e1 ADS Technologies vendor ALCATELM 0x06e4 Alcatel Microelectronics @@ -627,6 +628,7 @@ vendor QUALCOMMINC 0x19d2 Qualcomm, Inco vendor MATRIXORBITAL 0x1b3d Matrix Orbital vendor STELERA 0x1a8d Stelera Wireless vendor DRESDENELEKTRONIK 0x1cf1 dresden elektronik +vendor METAGEEK2 0x1dd5 MetaGeek vendor DLINK 0x2001 D-Link vendor PLANEX2 0x2019 Planex Communications vendor ERICSSON 0x2282 Ericsson @@ -1108,6 +1110,7 @@ product CYPRESS KBDHUB 0x0101 Keyboard/ product CYPRESS FMRADIO 0x1002 FM Radio product CYPRESS USBRS232 0x5500 USB-RS232 Interface product CYPRESS SLIM_HUB 0x6560 Slim Hub +product CYPRESS SILVERSHIELD 0xfd13 Gembird Silver Shield PM /* Daisy Technology products */ product DAISY DMC 0x6901 USB MultiMedia Reader @@ -1619,6 +1622,9 @@ product LEXAR CF_READER 0xb002 USB CF R /* Lexmark products */ product LEXMARK S2450 0x0009 Optra S 2450 +/* Liebert products */ +product LIEBERT POWERSURE_PXT 0xffff PowerSure Personal XT + /* Linksys products */ product LINKSYS MAUSB2 0x0105 Camedia MAUSB-2 product LINKSYS USB10TX1 0x200c USB10TX @@ -1702,6 +1708,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