From patchwork Mon Mar 14 19:07:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silvan Jegen X-Patchwork-Id: 8583611 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 32E409F294 for ; Mon, 14 Mar 2016 19:08:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37F942012B for ; Mon, 14 Mar 2016 19:08:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34BED2021B for ; Mon, 14 Mar 2016 19:08:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753690AbcCNTIA (ORCPT ); Mon, 14 Mar 2016 15:08:00 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:34653 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751379AbcCNTIA (ORCPT ); Mon, 14 Mar 2016 15:08:00 -0400 Received: by mail-wm0-f48.google.com with SMTP id p65so115151064wmp.1; Mon, 14 Mar 2016 12:07:59 -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; bh=0tciJz7aSstsq3RBwtX4kONosZsAsrpnm9ZjTWUvOHE=; b=LFgMLiDCFIerhjk4UF6OBUy8I4zX5JQRcyzonx82zOZG0QLzKycqMjl+JhIicB/BUb TheF+NM/bd5OEwqO389DdoSIOfZ9OUg3KeJpgHImggZ9oWB4M6Um0Has2XTBH1nRvBE6 RjsltbBvMgOtYwlh7wfuBPVsfwY7yOnCtrR9rsMzfj0XztDozfk/e764NaX+fUO5FeFV 3n1n221Tr2hE3p68awb0v8ZArNvESe1B+Mixkc5ClZJwvWnZ+bpzRYtBHJa2cKk2JU6+ kIHT/5vEpndA5srmNAGppSNmyppxrXdtEr7TwdGYdB/GDjk2P5n1ODEggRImdMvWgOg4 1aFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0tciJz7aSstsq3RBwtX4kONosZsAsrpnm9ZjTWUvOHE=; b=M9Y19VfrvYPZMBInlvU9KRPSDuawHNIho0S+9IcdVPaZW2l8OjdZ2o3AerXwUEWFcc V1ovjqSEYFA2jVMVqL/PvW2Pdkw8FgIfAzsVBwsi3wHtt016qHsJfQubQ11DOxjazWwI Fp1vUiJmCvkaKQjNeS0xRSxk0/oCHVMZuT3Ln304Zc6U/fa0eBnkACRokmR+kRLPmZDS TLnbKIitQ9/CHr6NaL9KnFO3v+sCA56A0Ge4+Kg4lHMp7aZoAaulWFdQCpTE0icnx1lT UkDK0N8h1iE5JwhH7PC458A2sRvO9+cGT6IMv3LQDX7+fZj3dZh3dcaYmWd+m8UaB2Ln 3tZA== X-Gm-Message-State: AD7BkJI8WzrSRAp0aTV70o88UxffgvdDIBnXpOAHbxqEIO6GCRV4g8leLoKahPAnLQ61UA== X-Received: by 10.194.121.34 with SMTP id lh2mr25795495wjb.145.1457982478403; Mon, 14 Mar 2016 12:07:58 -0700 (PDT) Received: from myarchbang.localdomain (217-162-180-230.dynamic.hispeed.ch. [217.162.180.230]) by smtp.gmail.com with ESMTPSA id 3sm17512996wmp.14.2016.03.14.12.07.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Mar 2016 12:07:57 -0700 (PDT) From: Silvan Jegen To: Dmitry Torokhov , Pavel Rojtberg , linux-input@vger.kernel.org, Greg Kroah-Hartman , "Pierre-Loup A. Griffais" Cc: Silvan Jegen , linux-kernel@vger.kernel.org Subject: [PATCH] Input: xpad - Add Mad Catz FightStick TE 2 VID/PID Date: Mon, 14 Mar 2016 20:07:08 +0100 Message-Id: <1457982428-9849-1-git-send-email-s.jegen@gmail.com> X-Mailer: git-send-email 2.7.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds the VID/PID combination for the Xbox One version of the Mad Catz FightStick TE 2. The functionality that this provides is about on par with what the Windows drivers for the stick manage to deliver. What works: - Digital stick - 6 main buttons - Xbox button - The two buttons on the back - The locking buttons (preventing accidental Xbox button press) What doesn't work: - Two of the main buttons (don't work on Windows either) - The "Haptic" button setting does not have an effect (not sure if it works on Windows) I added the MAP_TRIGGERS_TO_BUTTONS option but in my (limited) testing there was no practical difference with or without. The FightStick does not have triggers though so adding it makes sense. Signed-off-by: Silvan Jegen --- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index e8a84d1..d3d7f7c 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -149,6 +149,7 @@ static const struct xpad_device { { 0x0738, 0x4556, "Mad Catz Lynx Wireless Controller", 0, XTYPE_XBOX }, { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", 0, XTYPE_XBOX360 }, { 0x0738, 0x4718, "Mad Catz Street Fighter IV FightStick SE", 0, XTYPE_XBOX360 }, + { 0x0738, 0x4a01, "Mad Catz FightStick TE 2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, { 0x0738, 0x4726, "Mad Catz Xbox 360 Controller", 0, XTYPE_XBOX360 }, { 0x0738, 0x4728, "Mad Catz Street Fighter IV FightPad", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, @@ -304,6 +305,7 @@ static struct usb_device_id xpad_table[] = { 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_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */ 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 */