Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
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 2/2] HID: nintendo: add parameter to swap face buttons
Date:   Wed, 11 May 2022 17:15:00 -0700
Message-Id: <20220512001500.16739-2-fletcher0max@gmail.com>
In-Reply-To: <20220512001500.16739-1-fletcher0max@gmail.com>
References: <20220512001500.16739-1-fletcher0max@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Add the module parameter "faceswap" that swaps the face (ABXY) buttons to match the printed layout. This will be helpful for people who prefer to use the Nintendo layout over the Xbox layout.

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

diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
index 7735971ede3f..925cdcd0ac77 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -32,6 +32,7 @@
 #include <linux/jiffies.h>
 #include <linux/leds.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/power_supply.h>
 #include <linux/spinlock.h>
 
@@ -320,6 +321,8 @@ struct joycon_imu_cal {
 	s16 scale[3];
 };
 
+bool faceswap;
+
 /*
  * All the controller's button values are stored in a u32.
  * They can be accessed with bitwise ANDs.
@@ -1351,10 +1354,17 @@ 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_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);
+		if (!faceswap) {
+			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);
+		} else {
+			input_report_key(dev, BTN_Y, btns & JC_BTN_Y);
+			input_report_key(dev, BTN_X, btns & JC_BTN_X);
+			input_report_key(dev, BTN_A, btns & JC_BTN_A);
+			input_report_key(dev, BTN_B, btns & JC_BTN_B);
+		}
 	}
 
 	input_sync(dev);
@@ -2313,6 +2323,10 @@ static const struct hid_device_id nintendo_hid_devices[] = {
 };
 MODULE_DEVICE_TABLE(hid, nintendo_hid_devices);
 
+module_param(faceswap, bool, 0440);
+MODULE_PARM_DESC(faceswap,
+		 "Swaps the face buttons to match the printed layout");
+
 static struct hid_driver nintendo_hid_driver = {
 	.name		= "nintendo",
 	.id_table	= nintendo_hid_devices,
-- 
2.35.3