From patchwork Sat Aug 13 18:53:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nate Yocom X-Patchwork-Id: 12942798 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2248C3F6B0 for ; Sat, 13 Aug 2022 18:53:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239636AbiHMSx5 (ORCPT ); Sat, 13 Aug 2022 14:53:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237374AbiHMSx4 (ORCPT ); Sat, 13 Aug 2022 14:53:56 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9AB613F0C for ; Sat, 13 Aug 2022 11:53:55 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id 24so3386714pgr.7 for ; Sat, 13 Aug 2022 11:53:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yocom-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=xBc1OKt9I3SLTG+JSnIOohJmCNuxJDzx5yrVOi1WQ5g=; b=gFkfVq3heDZv6+NCYcbU95EvMqKh7JgRkMH2EOqhQxU5qOscEjNd5Y6zU/0eDH2qXF y/j0Mhyxtj8mCZ0ykvtW4qrISl83PA8rLepoxJquISxO+t0Wdslq8GPjZQkRUAmWF3rK ZshvkHKmcF3qAv1vKLhAYSUEGt/v0MDp58PmTnQJJadhHQd+ab796Tm3tczZXdxW+Rb+ qjuNNMwlOeiLiDKkPhdX2lyKUG6O/1tdMnOxRcSzeNI5dlXLtifEoEuWSJCH5M+7KGrr 5J441B35deMrjAoW6Dm8a4ra3h5Jj4yEOX7gYLczJg7BOCC9cJdihu7OU1VeRK8m2hKt z0Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=xBc1OKt9I3SLTG+JSnIOohJmCNuxJDzx5yrVOi1WQ5g=; b=GCcr4aBGMqk20/BeyIojvg+giO/hDNVMcQuN8fR2pMXSAN9hYv4jtXpq1+Z9mXjvp1 s9TMMMbeCW0yakUVxiWg6qnRuqDdtikwcGDLOxodfpTlxdqraZqsV4+9kGpL1NS+JU8h osIK81ejvh1Dw5MgIZ8N1dVzHDL1ky3/fzvclHBhlPPuJ4j1Z8Y5ybqd+xA1ArPeSJN7 p9IJwGfIZn0Ga7FpQfqMY3RZ0XMksEZ1CosvmGow2E2iaFvhMh0+V97klJ74ZWYg71mM 25jvvZWL1tI6ZEBsjeHp5m97O7cx42O6eWvvqW/A1GZEZWRBqxnNJ1Gpfcz7tUGuQ8jc 8dmA== X-Gm-Message-State: ACgBeo3ZOnCyPOjAWuMaI4t6nsIcCe3zg25i9kKKIqlvIeCDQjppYcc2 2rPRlm74z7nLJi2wGl19+KgxZQ== X-Google-Smtp-Source: AA6agR5MrdT1tVRhOp1Smd4NzHHWvrKLPQO6HtTAYRd7SKSQ0UDuXcBfq7fbLbcd9SGYPpzF0XBXjg== X-Received: by 2002:a05:6a00:b41:b0:52f:59dc:75 with SMTP id p1-20020a056a000b4100b0052f59dc0075mr9404888pfo.33.1660416835330; Sat, 13 Aug 2022 11:53:55 -0700 (PDT) Received: from localhost.localdomain ([2601:600:a07f:e6ac::1c]) by smtp.gmail.com with ESMTPSA id fs1-20020a17090af28100b001f246f2a423sm1972183pjb.17.2022.08.13.11.53.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 11:53:55 -0700 (PDT) From: Nate Yocom To: dmitry.torokhov@gmail.com Cc: nate@yocom.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, hadess@hadess.net Subject: [PATCH v3 1/3] Input: joystick: xpad: Add X-Box Adaptive Controller support Date: Sat, 13 Aug 2022 11:53:41 -0700 Message-Id: <20220813185343.2306-2-nate@yocom.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220813185343.2306-1-nate@yocom.org> References: <20220813185343.2306-1-nate@yocom.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Adds correct VID/PID for this XTYPE_XBOXONE compatible controller to xpad_device[] table. Signed-off-by: Nate Yocom Tested-by: Bastien Nocera --- drivers/input/joystick/xpad.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 18190b529bca..c8b38bb73d34 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -131,6 +131,7 @@ static const struct xpad_device { { 0x045e, 0x02e3, "Microsoft X-Box One Elite pad", 0, XTYPE_XBOXONE }, { 0x045e, 0x02ea, "Microsoft X-Box One S pad", 0, XTYPE_XBOXONE }, { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W }, + { 0x045e, 0x0b0a, "Microsoft X-Box Adaptive Controller", 0, XTYPE_XBOXONE }, { 0x045e, 0x0b12, "Microsoft Xbox Series S|X Controller", MAP_SELECT_BUTTON, XTYPE_XBOXONE }, { 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 }, { 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 }, From patchwork Sat Aug 13 18:53:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nate Yocom X-Patchwork-Id: 12942800 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE4AFC25B08 for ; Sat, 13 Aug 2022 18:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239664AbiHMSx6 (ORCPT ); Sat, 13 Aug 2022 14:53:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239591AbiHMSx5 (ORCPT ); Sat, 13 Aug 2022 14:53:57 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEDC613F09 for ; Sat, 13 Aug 2022 11:53:56 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id d71so3364106pgc.13 for ; Sat, 13 Aug 2022 11:53:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yocom-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=r6cCM41kUJ/CHseUbJisNQXJTPGeGzFDlY7IBpxgiEs=; b=sUT7DOv3XdI9kJ5ET6LVLlmv0D33aXoFvOYIeVTs++Mh/4J/ua7ypuGEGmWuhp6vvZ qwRJJQn9ZiKHMhmKg4CpFr0+3Y/3vz2sXx9AQz8Ikk71UvQ8hkKKtKqGT9FFygbtLytL PHMiaA8iuBniy5eiRemkN2Z50xofDapNwohsy25M1AVCxm+RAexT33cbudp5C6c6LcKL 36fEnw1bifwFuF9pH07J4kFlL50G7neX1pMgGC1jZmedZoJeWJkTkXMgRXw4BG461mlX bvfPagQy6A0R7pr60z1MMKeqO3+eBferYhcmyGboyCZoRvhPl444obt7PDs56J9OShhF epGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=r6cCM41kUJ/CHseUbJisNQXJTPGeGzFDlY7IBpxgiEs=; b=QwttsPmXcgQpHPETc7lOIv2t18uwEj6ABvDNJbF3OgCzhuVxBrn1KZKtvRiIZG5I1y NEwI4aC4vyA0vvvuN7iOjrWgVEzjyOqVDvCLyUg+JNSccla5aQBQdkS4ab64JiIky4P9 priBrW2hhHNxGwNOuKWs7oc5SPKRTBckIw6anPu/6lb1D6kKV+cmbe1hKE2AznkMml/K WpwSidvxS8rIIjlCs9Ok0Ys+sW/esjnh4doyLY+cdoafGCztuU4yrvs7arcok+z2T1mS nqqyiDYve2mMhiTjaoiWyeGw//nurPem8w98nmXvXeKvpl1zttcRnhCCmGjiLDmJ3Sj6 vzxg== X-Gm-Message-State: ACgBeo019Z8nhg9aOb5tMfUDNPQTHSqhsQ1YxX/j43N1ayiGvSNwC3M+ razadhu2igZyCmt7/BuNZFJikA== X-Google-Smtp-Source: AA6agR5jZoogtcA8KmI2CHSBGbkOz6Zq77ZcdPtMdmo5J4QauJ7QbHmqH2EnHVeOBlc7f9FXtOTOXQ== X-Received: by 2002:a05:6a00:1996:b0:52e:b0f7:8c67 with SMTP id d22-20020a056a00199600b0052eb0f78c67mr9433021pfl.20.1660416836406; Sat, 13 Aug 2022 11:53:56 -0700 (PDT) Received: from localhost.localdomain ([2601:600:a07f:e6ac::1c]) by smtp.gmail.com with ESMTPSA id fs1-20020a17090af28100b001f246f2a423sm1972183pjb.17.2022.08.13.11.53.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 11:53:55 -0700 (PDT) From: Nate Yocom To: dmitry.torokhov@gmail.com Cc: nate@yocom.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, hadess@hadess.net Subject: [PATCH v3 2/3] Input: joystick: xpad: Add X-Box Adaptive Controller Layer button Date: Sat, 13 Aug 2022 11:53:42 -0700 Message-Id: <20220813185343.2306-3-nate@yocom.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220813185343.2306-1-nate@yocom.org> References: <20220813185343.2306-1-nate@yocom.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Adds a new quirk for controllers that have a Layer button which has 4 states, reflected as an ABS_MISC axis with 4 values. Signed-off-by: Nate Yocom Tested-by: Bastien Nocera --- drivers/input/joystick/xpad.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index c8b38bb73d34..83a4f4d07af5 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -80,6 +80,7 @@ #define MAP_TRIGGERS_TO_BUTTONS (1 << 1) #define MAP_STICKS_TO_NULL (1 << 2) #define MAP_SELECT_BUTTON (1 << 3) +#define MAP_LAYER_BUTTON (1 << 4) #define DANCEPAD_MAP_CONFIG (MAP_DPAD_TO_BUTTONS | \ MAP_TRIGGERS_TO_BUTTONS | MAP_STICKS_TO_NULL) @@ -131,7 +132,7 @@ static const struct xpad_device { { 0x045e, 0x02e3, "Microsoft X-Box One Elite pad", 0, XTYPE_XBOXONE }, { 0x045e, 0x02ea, "Microsoft X-Box One S pad", 0, XTYPE_XBOXONE }, { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W }, - { 0x045e, 0x0b0a, "Microsoft X-Box Adaptive Controller", 0, XTYPE_XBOXONE }, + { 0x045e, 0x0b0a, "Microsoft X-Box Adaptive Controller", MAP_LAYER_BUTTON, XTYPE_XBOXONE }, { 0x045e, 0x0b12, "Microsoft Xbox Series S|X Controller", MAP_SELECT_BUTTON, XTYPE_XBOXONE }, { 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 }, { 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 }, @@ -927,6 +928,10 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char (__u16) le16_to_cpup((__le16 *)(data + 8))); } + /* Layer button has a value of 0-4, so it is reported as an axis */ + if (xpad->mapping & MAP_LAYER_BUTTON) + input_report_abs(dev, ABS_MISC, data[34]); + input_sync(dev); } @@ -1623,6 +1628,9 @@ static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs) case ABS_HAT0Y: /* the d-pad (only if dpad is mapped to axes */ input_set_abs_params(input_dev, abs, -1, 1, 0, 0); break; + case ABS_MISC: /* 4 value layer button (such as on XAC) */ + input_set_abs_params(input_dev, abs, 0, 4, 0, 0); + break; default: input_set_abs_params(input_dev, abs, 0, 0, 0, 0); break; @@ -1715,6 +1723,10 @@ static int xpad_init_input(struct usb_xpad *xpad) xpad_set_up_abs(input_dev, xpad_abs_triggers[i]); } + /* setup layer button as an axis with 4 possible values */ + if (xpad->mapping & MAP_LAYER_BUTTON) + xpad_set_up_abs(input_dev, ABS_MISC); + error = xpad_init_ff(xpad); if (error) goto err_free_input; From patchwork Sat Aug 13 18:53:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nate Yocom X-Patchwork-Id: 12942801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4E4CC25B0F for ; Sat, 13 Aug 2022 18:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231308AbiHMSx7 (ORCPT ); Sat, 13 Aug 2022 14:53:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239646AbiHMSx6 (ORCPT ); Sat, 13 Aug 2022 14:53:58 -0400 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A331113F0C for ; Sat, 13 Aug 2022 11:53:57 -0700 (PDT) Received: by mail-pg1-x533.google.com with SMTP id d71so3364115pgc.13 for ; Sat, 13 Aug 2022 11:53:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yocom-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=mvPdMDyNKTfqz6k1c2rtPVKLvaBKcrbPWc8BVxjdedY=; b=4gkEsyZN39qjg2vrgm0H2K6qZ5jK623yHCU69SSOXOhHjIRl+xvIhLQVZSOoFNNSRx EopSx1pg28MtkHxwb0VAcDXN7kVBwsUdOgtrYuUhZoTy9Y4E6s5SeNrADtF/S7XOri/X Brn0zk+x4+1XbSEMX5cAj1U+/cpJHc+YR3FGB9N4rdOgD2ai6UnB3PgCq6RFNIP0nf+M lm1RiCTJTz+9D3xtg2lesy3yXMyZg8s7P4Fg1+oWGm5D9fQPjBuiEFKxpECJJhDIHlP3 nU+uZ9Uk8yp/vUDdIWgfwDnFw3PEaxrTprN3B1gTSxd5Ua66SkC9RAgQOsmYHPNrbo7e LDXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=mvPdMDyNKTfqz6k1c2rtPVKLvaBKcrbPWc8BVxjdedY=; b=0oOqB2Kw7YR0pjriMgELhshaXjKtBG1fi46XDp396HpcJKgb61K9ITf2lAE6NRyJC9 fk4iBCuUcvBHM9rep2+qNacB5bIsQX9EJsvHn6otxui4u3F7oJqwNo+gUdTe7VpP0WnF PZSexhVAyU1AHPlxriaZFdZpv2sm+mdoEcbMZk3AKelVgrW980oLlNrHMsqKtpLTx/+h Y+jqdmo7PUeJOj2NJ0b9RsRIqwKy/vobVwrv3SE1DuiG8XNPm6Tglj9xuJFH56i7LmAq D4IeR5cRdheVnCdsEVBBh1wf9PNLieC8jz6j1Pyms7ZrLpY2Pbd1H8tb80j7+mi6Yci1 cLmg== X-Gm-Message-State: ACgBeo2jB4OZENh2ucVMTaxItR96R35aXsmnD1PzNz8bCDmygJwpfnlw HPICC44gkzK8FEzgJ4A8tS23eA== X-Google-Smtp-Source: AA6agR5FesUCLXoh+wZtTxjFXqThlCxwVdvfpdB8EAAIMN2BxaofqW0OwwQD2aRAvbgsQeN4kpV1IQ== X-Received: by 2002:a05:6a00:2352:b0:52e:f0bd:981e with SMTP id j18-20020a056a00235200b0052ef0bd981emr8937778pfj.28.1660416837082; Sat, 13 Aug 2022 11:53:57 -0700 (PDT) Received: from localhost.localdomain ([2601:600:a07f:e6ac::1c]) by smtp.gmail.com with ESMTPSA id fs1-20020a17090af28100b001f246f2a423sm1972183pjb.17.2022.08.13.11.53.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 11:53:56 -0700 (PDT) From: Nate Yocom To: dmitry.torokhov@gmail.com Cc: nate@yocom.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, hadess@hadess.net Subject: [PATCH v3 3/3] Input: joystick: xpad: Add X-Box Adaptive Controller XBox button Date: Sat, 13 Aug 2022 11:53:43 -0700 Message-Id: <20220813185343.2306-4-nate@yocom.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220813185343.2306-1-nate@yocom.org> References: <20220813185343.2306-1-nate@yocom.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Adaptive controller sets 0x02 bit for this button, all others set 0x01 so presence of either is used for BTN_MODE. Signed-off-by: Nate Yocom Tested-by: Bastien Nocera --- drivers/input/joystick/xpad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 83a4f4d07af5..bea71721b6cd 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -859,7 +859,7 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char if (data[1] == 0x30) xpadone_ack_mode_report(xpad, data[2]); - input_report_key(dev, BTN_MODE, data[4] & 0x01); + input_report_key(dev, BTN_MODE, data[4] & 0x03); input_sync(dev); return; }