From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5F38C433B4 for ; Wed, 14 Apr 2021 04:42:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9D40F611F2 for ; Wed, 14 Apr 2021 04:42:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233157AbhDNEm3 (ORCPT ); Wed, 14 Apr 2021 00:42:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230496AbhDNEm0 (ORCPT ); Wed, 14 Apr 2021 00:42:26 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B60F7C061756 for ; Tue, 13 Apr 2021 21:42:05 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id u20so21837650lja.13 for ; Tue, 13 Apr 2021 21:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=boQU2MMoKZITSUuTZ9u7Ur1dr9594KKlp/l2Ec4ci6g=; b=OXmXimrwWLRnv/c0WHoL4YdTYIo7nh2IXSH3569UBFovI9i3UHB1gn8Bv09ZQOIvOR TM3hENR2aATfXhTh31H7fydNGhBG/MfZUKI9EJgDsMgGg5rU0dGVbQpqxuTV88WlHUPu O9C3CZaQ9vQyXSyNd6iszxBfujvQ6ZKpqwdl4yfwK/F4M1Bh3gokS2HYNRDUljQzny5E mIh7clpvkX4pyQvzhO8P7bhPIGspUuCQjEMOtVL0ucicS5VL1bBkpZ+nnSWVyt4ZASdf kG2GihFDNWzFCpBp5NKREcwiaPZuynJS+IE0H6Y/XM+yJGM8jvuzDF8e39NIawLlZeVf Dp2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=boQU2MMoKZITSUuTZ9u7Ur1dr9594KKlp/l2Ec4ci6g=; b=kiS3yR9IgqyS+JTiN3zewS+KijffSmkpVg6zr+2s53PH5gsE7KdQ1qpie+aZ+X74St uk7y2gavXVeOqgVISlPaet6/7d6TL1Z01MTdGKxgG5iW/+4MJcCWnCAICWFNmCVjoqnU i5QjjcdjFfakBF1tyYLwv3XjW/sXIJClpd/75JMPoaPFiDkqe9VrG7gAtvaP/NvUhPd6 eqPsa/dLu26l/8716s/f4ZV5qiKYlUVgituk+oXc5EqewXG9Qts0zypYpGkEg2xuXLEB rrIknRAwJ8a4bco+cR9LbwcPP+8PO18ZNkr67YE8kjwzqvA6+9zPQ6X/C6WwzaKY7E6u IEhQ== X-Gm-Message-State: AOAM530hzeVR0BT9E7DXTIuLvUwsSfFOipMg+rA6w+r4ZKdzvgE1n5s8 FDgJHv1JbpvxDSqdU2LqcVz2c7fHRXJSROR9TdgF5g== X-Google-Smtp-Source: ABdhPJzhEEU3PFDfyA39HxrKCbGBl2nHujmFShzAsmbHmtnCmz4KKLUO4tLF+jgOq0/kV1THJNmEKCgd4AyFIgQ5ANE= X-Received: by 2002:a2e:b4a5:: with SMTP id q5mr22868080ljm.7.1618375323366; Tue, 13 Apr 2021 21:42:03 -0700 (PDT) MIME-Version: 1.0 References: <20210413010252.2255812-1-lzye@google.com> In-Reply-To: From: Chris Ye Date: Tue, 13 Apr 2021 21:41:52 -0700 Message-ID: Subject: Re: [PATCH] [v4] Input: Add "Select" button to Microsoft Xbox One controller. To: Bastien Nocera Cc: =?UTF-8?Q?=C5=81ukasz_Patron?= , Benjamin Valentin , Lee Jones , =?UTF-8?Q?Olivier_Cr=C3=AAte?= , Sanjay Govind , Andrzej Pietrasiewicz , linux-input , lkml , trivial@kernel.org, kernel-team@android.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org That line was using tab + 4 spaces on the left and was reformatted to use 2 tabs. If you don't like it I've uploaded patch v5 not touching that line. On Tue, Apr 13, 2021 at 5:34 AM Bastien Nocera wrote: > > On Tue, 2021-04-13 at 01:02 +0000, Chris Ye wrote: > > Add "Select" button input capability and input event mapping for > > Microsoft Xbox One controller. From product site this is also > > referred as > > "Share" button. > > Fixed Microsoft Xbox One controller select button not working under > > USB > > connection. > > > > Signed-off-by: Chris Ye > > --- > > drivers/input/joystick/xpad.c | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/input/joystick/xpad.c > > b/drivers/input/joystick/xpad.c > > index 9f0d07dcbf06..99cb8bb78570 100644 > > --- a/drivers/input/joystick/xpad.c > > +++ b/drivers/input/joystick/xpad.c > > @@ -79,6 +79,7 @@ > > #define MAP_DPAD_TO_BUTTONS (1 << 0) > > #define MAP_TRIGGERS_TO_BUTTONS (1 << 1) > > #define MAP_STICKS_TO_NULL (1 << 2) > > +#define MAP_SELECT_BUTTON (1 << 3) > > #define DANCEPAD_MAP_CONFIG (MAP_DPAD_TO_BUTTONS > > | \ > > MAP_TRIGGERS_TO_BUTTONS | > > MAP_STICKS_TO_NULL) > > > > @@ -130,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, 0x0b12, "Microsoft Xbox One X pad", > > MAP_SELECT_BUTTON, XTYPE_XBOXONE }, > > { 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 > > }, > > { 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 > > }, > > { 0x046d, 0xc21f, "Logitech Gamepad F710", 0, XTYPE_XBOX360 > > }, > > @@ -862,6 +864,8 @@ static void xpadone_process_packet(struct > > usb_xpad *xpad, u16 cmd, unsigned char > > /* menu/view buttons */ > > input_report_key(dev, BTN_START, data[4] & 0x04); > > input_report_key(dev, BTN_SELECT, data[4] & 0x08); > > + if (xpad->mapping & MAP_SELECT_BUTTON) > > + input_report_key(dev, KEY_RECORD, data[22] & 0x01); > > > > /* buttons A,B,X,Y */ > > input_report_key(dev, BTN_A, data[4] & 0x10); > > @@ -1669,9 +1673,11 @@ static int xpad_init_input(struct usb_xpad > > *xpad) > > > > /* set up model-specific ones */ > > if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == > > XTYPE_XBOX360W || > > - xpad->xtype == XTYPE_XBOXONE) { > > + xpad->xtype == XTYPE_XBOXONE) { > > Why the indentation change here? > > > for (i = 0; xpad360_btn[i] >= 0; i++) > > input_set_capability(input_dev, EV_KEY, > > xpad360_btn[i]); > > + if (xpad->mapping & MAP_SELECT_BUTTON) > > + input_set_capability(input_dev, EV_KEY, > > KEY_RECORD); > > } else { > > for (i = 0; xpad_btn[i] >= 0; i++) > > input_set_capability(input_dev, EV_KEY, > > xpad_btn[i]); > >