From patchwork Sun Jul 8 05:49:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuri Khan X-Patchwork-Id: 1169291 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id E2A123FC33 for ; Sun, 8 Jul 2012 05:51:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751125Ab2GHFuD (ORCPT ); Sun, 8 Jul 2012 01:50:03 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:36338 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751120Ab2GHFuC (ORCPT ); Sun, 8 Jul 2012 01:50:02 -0400 Received: by lbbgm6 with SMTP id gm6so17990240lbb.19 for ; Sat, 07 Jul 2012 22:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=0zK+BEdRL+jdxemPOL5ktUOJsyV0AubNPxt9m8mvtfM=; b=wFO3D2eFLgYMGSn61uFjYNLQ5VTllE1CbkCrtbmHAcHweuYYybq06Yomzpkbd+Ase/ l3FADJnweH30nOS0wYKBFH/rEBS92RVexg8cSAPaOtNAC9rtgN8HWBd7bwkaDZaawIgP XopPEKnldZNmr9kV/KHczueSxMSTcwsG0SB9NAu6bqjspkyLAbYjo0f+lx4YC/XSbGkU PlwmCr9Vec9HAucQFZBq97Xoae+Zc+Uke+CnWKrMChrV4Zz+TqQnpxy6E37oEYiJ3z16 wTyDBuYj+rPhZmuDZeT6cqk3Edvk2AdAJGk/0xTaEAHeNrfMagzAStmsOWutrTr0DpKY hvfw== Received: by 10.152.122.12 with SMTP id lo12mr35916866lab.3.1341726600311; Sat, 07 Jul 2012 22:50:00 -0700 (PDT) Received: from centaur-pc.khan.local (l49-192-196.cn.ru. [178.49.192.196]) by mx.google.com with ESMTPS id p2sm15820759lbj.4.2012.07.07.22.49.57 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 07 Jul 2012 22:49:59 -0700 (PDT) From: Yuri Khan To: Dmitry Torokhov Cc: Jiri Kosina , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Yuri Khan Subject: [PATCH v2 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad Date: Sun, 8 Jul 2012 12:49:49 +0700 Message-Id: <1341726589-5400-1-git-send-email-yurivkhan@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341592324-665-1-git-send-email-yurivkhan@gmail.com> References: <1341592324-665-1-git-send-email-yurivkhan@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org * Add a quirk to usbhid to ignore this device --- drivers/hid/hid-ids.h | 3 +++ drivers/hid/usbhid/hid-quirks.c | 2 ++ drivers/input/joystick/xpad.c | 1 + 3 files changed, 6 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index d1cdd2d..43c3d75 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -518,6 +518,9 @@ #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006 #define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007 +#define USB_VENDOR_ID_MADCATZ 0x0738 +#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 + #define USB_VENDOR_ID_MCC 0x09db #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 0597ee6..8726d33 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -45,6 +45,8 @@ static const struct hid_blacklist { { USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD }, + { USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL }, { USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II, HID_QUIRK_MULTI_INPUT }, diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index ee16fb6..16974ef 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = { XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ + { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */