HID: nintendo: add support for md/gen 6B controller

The NSO MD/GEN 6B was a Japan-only controller released which has
6 buttons on the face of the controller. This adds support for this
controller. It still enumerates just like the 3B controller, but
will use extra bits in it's report for the 3 extra controllers. This
also changes the events reported to match the letter on the controller
for the NSO MD/GEN controller. The VID/PID it reports is the same as
the 3B controller.

This also removes a comment on the N64 Controllers which didn't
mean anything.

Signed-off-by: Ryan McClelland <rymcclel@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 4d2a89d65b6584d4da575e4c86449ddd484056c8..d297c8e2b4c33acdfb217bc420618c23d408f488 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -787,7 +787,7 @@ config HID_NINTENDO
        Adds support for the Nintendo Switch Joy-Cons, NSO, Pro Controller.
        All controllers support bluetooth, and the Pro Controller also supports
        its USB mode. This also includes support for the Nintendo Switch Online
-       Controllers which include the Genesis, SNES, and N64 controllers.
+       Controllers which include the NES, Genesis, SNES, and N64 controllers.
 
        To compile this driver as a module, choose M here: the
        module will be called hid-nintendo.

diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
index 55153a2f79886b6b9bf8094f7d69d756ecf53185..11ac246176ae118aef77fb8b68f4b57286a6225d 100644 (file)
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -456,14 +456,13 @@ static const struct joycon_ctlr_button_mapping snescon_button_mappings[] = {
        { /* sentinel */ },
 };
 
-/*
- * "A", "B", and "C" are mapped positionally, rather than by label (e.g., "A"
- * gets assigned to BTN_EAST instead of BTN_A).
- */
 static const struct joycon_ctlr_button_mapping gencon_button_mappings[] = {
-       { BTN_SOUTH,    JC_BTN_A,       },
-       { BTN_EAST,     JC_BTN_B,       },
-       { BTN_WEST,     JC_BTN_R,       },
+       { BTN_A,        JC_BTN_A,       },
+       { BTN_B,        JC_BTN_B,       },
+       { BTN_C,        JC_BTN_R,       },
+       { BTN_X,        JC_BTN_X,       }, /* MD/GEN 6B Only */
+       { BTN_Y,        JC_BTN_Y,       }, /* MD/GEN 6B Only */
+       { BTN_Z,        JC_BTN_L,       }, /* MD/GEN 6B Only */
        { BTN_SELECT,   JC_BTN_ZR,      },
        { BTN_START,    JC_BTN_PLUS,    },
        { BTN_MODE,     JC_BTN_HOME,    },
@@ -471,9 +470,6 @@ static const struct joycon_ctlr_button_mapping gencon_button_mappings[] = {
        { /* sentinel */ },
 };
 
-/*
- * N64's C buttons get assigned to d-pad directions and registered as buttons.
- */
 static const struct joycon_ctlr_button_mapping n64con_button_mappings[] = {
        { BTN_A,                JC_BTN_A,       },
        { BTN_B,                JC_BTN_B,       },