public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Max Fletcher <fletcher0max@gmail.com>
To: djogorchock@gmail.com, jikos@kernel.org,
	benjamin.tissoires@redhat.com, linux-input@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: Max Fletcher <fletcher0max@gmail.com>
Subject: [PATCH 1/2] HID: nintendo: fix face button mappings
Date: Wed, 11 May 2022 17:14:59 -0700	[thread overview]
Message-ID: <20220512001500.16739-1-fletcher0max@gmail.com> (raw)

Previously, A and B would match the Xbox layout, but X and Y were incorrectly swapped. This corrects it so that X and Y match the Xbox layout.

Signed-off-by: Max Fletcher <fletcher0max@gmail.com>
---
 drivers/hid/hid-nintendo.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
index 2204de889739..7735971ede3f 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -1351,10 +1351,10 @@ static void joycon_parse_report(struct joycon_ctlr *ctlr,
 		input_report_key(dev, BTN_START, btns & JC_BTN_PLUS);
 		input_report_key(dev, BTN_THUMBR, btns & JC_BTN_RSTICK);
 		input_report_key(dev, BTN_MODE, btns & JC_BTN_HOME);
-		input_report_key(dev, BTN_WEST, btns & JC_BTN_Y);
-		input_report_key(dev, BTN_NORTH, btns & JC_BTN_X);
-		input_report_key(dev, BTN_EAST, btns & JC_BTN_A);
-		input_report_key(dev, BTN_SOUTH, btns & JC_BTN_B);
+		input_report_key(dev, BTN_X, btns & JC_BTN_Y);
+		input_report_key(dev, BTN_Y, btns & JC_BTN_X);
+		input_report_key(dev, BTN_B, btns & JC_BTN_A);
+		input_report_key(dev, BTN_A, btns & JC_BTN_B);
 	}
 
 	input_sync(dev);
@@ -1578,7 +1578,7 @@ static const unsigned int joycon_button_inputs_l[] = {
 
 static const unsigned int joycon_button_inputs_r[] = {
 	BTN_START, BTN_MODE, BTN_THUMBR,
-	BTN_SOUTH, BTN_EAST, BTN_NORTH, BTN_WEST,
+	BTN_A, BTN_B, BTN_Y, BTN_X,
 	BTN_TR, BTN_TR2,
 	0 /* 0 signals end of array */
 };
-- 
2.35.3


             reply	other threads:[~2022-05-12  0:15 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-12  0:14 Max Fletcher [this message]
2022-05-12  0:15 ` [PATCH 2/2] HID: nintendo: add parameter to swap face buttons Max Fletcher
2022-05-13 19:58 ` [PATCH 1/2] HID: nintendo: fix face button mappings Roderick Colenbrander
     [not found]   ` <CAKcX28WpKoP=HVq3zCvBh9knKFEdR0_+NmATpt9D6rFmprkFDA@mail.gmail.com>
2022-05-15  3:33     ` Roderick Colenbrander
2022-05-26 20:07       ` Maxwell Fletcher
2022-05-31 15:19   ` Martino Fontana
2022-05-31 15:31     ` Roderick Colenbrander
2022-06-04 13:11       ` Martino Fontana

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220512001500.16739-1-fletcher0max@gmail.com \
    --to=fletcher0max@gmail.com \
    --cc=benjamin.tissoires@redhat.com \
    --cc=djogorchock@gmail.com \
    --cc=jikos@kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox