From patchwork Thu May 4 22:47:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Valentin X-Patchwork-Id: 9712839 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BC1BF60387 for ; Thu, 4 May 2017 22:47:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B02C428639 for ; Thu, 4 May 2017 22:47:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4CE6286A9; Thu, 4 May 2017 22:47:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EB2E28639 for ; Thu, 4 May 2017 22:47:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752356AbdEDWry (ORCPT ); Thu, 4 May 2017 18:47:54 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33740 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbdEDWrx (ORCPT ); Thu, 4 May 2017 18:47:53 -0400 Received: by mail-wm0-f66.google.com with SMTP id y10so6365910wmh.0 for ; Thu, 04 May 2017 15:47:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=shLl2opWJXbBFD8YFdHXO33dIcUuYmoMkujE6NfFmr0=; b=Od7ou17EHCREJt6Uqp5+UHgt92C+Eb1fS/fEu5cVicxxjvPMrsbcAWVbgj3MqBLx/6 n2vDhYjGx0m4BkrNqGkM0xHYz2fSWUJ//JQgfKikx9r8Irm/HfWNgtQjZn+vwW1csVqp 8oWKUTaJtGkR+NIWPDVLhb03oiwI6CiTgyH3g4bMYIAxWQfPIgnSyHOa7rd+qZJglos0 DljzWTe2QFbxUi0OMbFccdyBUkWIaVCBXNyMSC8cyfpkXVZM+GE0FdKQ/anUJuEBbRsN vcIFJJZcWeZAczkGE03vXSKTLpNgAEi0U7yo+Vh8YiOqUma/9LOxefqBVVO3elkjIhJX gmBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=shLl2opWJXbBFD8YFdHXO33dIcUuYmoMkujE6NfFmr0=; b=r+BiJIkLfjPUVKebDgGj4wwGx5lJ7D7aT2//somBcub84Bmhj4StzgCqclrYxubdC1 YWgr4GJWdVdcdMQkrfr/luwMzqk3422zmOoZ0PU9nsYDxivfg8YpR9Q/DC52W1RFVek9 GhVg+MMWBMI+doKKQ50BJaQEzvXQ9P+BjMN0fvKo2+y10Z2F5KRbclefHn/P3GIBWW/2 WP6iucHkwv5JcnP8P5g9778URVkrlUJEoTdXAnj25kWRQXrJNhW8xEfM3yIef8gUDTk0 bj7FAhYI5rRGshvPHZj40D+eW8imKUiSs2xNvj4Li/W/LVKHGLjPg2bLInOSycv4gQ64 Djbw== X-Gm-Message-State: AODbwcAvAJDKAFx5k/v+nYHAHJvuW0eBhU7TL39DdNePK28Y2Rd8Hclp 5JlWdHAcTsAZ7Q== X-Received: by 10.28.218.67 with SMTP id r64mr3410605wmg.9.1493938072568; Thu, 04 May 2017 15:47:52 -0700 (PDT) Received: from nashorn (p200300455D1553002C1FD3CDB9889D22.dip0.t-ipconnect.de. [2003:45:5d15:5300:2c1f:d3cd:b988:9d22]) by smtp.googlemail.com with ESMTPSA id g21sm4370508wrg.22.2017.05.04.15.47.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 May 2017 15:47:52 -0700 (PDT) Date: Fri, 5 May 2017 00:47:47 +0200 From: Benjamin Valentin To: Dmitry Torokhov , linux-input@vger.kernel.org Cc: Cameron Gutman , Pavel Rojtberg Subject: Input: xpad - add USB IDs for Mad Catz Brawlstick and Razer Sabertooth Message-ID: <20170505004747.05c466ac@nashorn> In-Reply-To: <20170504231714.16ea40d2@nashorn> References: <20170504231544.335e8f42@nashorn> <20170504231714.16ea40d2@nashorn> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add USB IDs for two more Xbox 360 controllers. I found them in the pull requests for the xboxdrv userspace driver, which seems abandoned. Thanks to psychogony and mkaito for reporting the IDs there! Signed-off-by: Benjamin Valentin Reviewed-by: Cameron Gutman --- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index a1a0c03fb0f2..8636b2abd103 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -212,10 +212,12 @@ static const struct xpad_device { { 0x162e, 0xbeef, "Joytech Neo-Se Take2", 0, XTYPE_XBOX360 }, { 0x1689, 0xfd00, "Razer Onza Tournament Edition", 0, XTYPE_XBOX360 }, { 0x1689, 0xfd01, "Razer Onza Classic Edition", 0, XTYPE_XBOX360 }, + { 0x1689, 0xfe00, "Razer Sabertooth", 0, XTYPE_XBOX360 }, { 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 }, { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, { 0x1bad, 0xf016, "Mad Catz Xbox 360 Controller", 0, XTYPE_XBOX360 }, { 0x1bad, 0xf018, "Mad Catz Street Fighter IV SE Fighting Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, + { 0x1bad, 0xf019, "Mad Catz Brawlstick for Xbox 360", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x1bad, 0xf021, "Mad Cats Ghost Recon FS GamePad", 0, XTYPE_XBOX360 }, { 0x1bad, 0xf023, "MLG Pro Circuit Controller (Xbox)", 0, XTYPE_XBOX360 }, { 0x1bad, 0xf028, "Street Fighter IV FightPad", 0, XTYPE_XBOX360 },