diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-01-20 12:05:49 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2025-01-20 12:05:49 +0300 |
| commit | 068815efc7b41006363550480f57c5cfeb51004e (patch) | |
| tree | 7654035f9599564e08821c498397224787418859 | |
| parent | cf6473b9470c3398d496d69c817e61abf6700be9 (diff) | |
| parent | 03ece95097007805c5a8d3fcb904556469608563 (diff) | |
| download | linux-068815efc7b41006363550480f57c5cfeb51004e.tar.xz | |
Merge branch 'for-6.14/nintendo' into for-linus
- support for MD/GEN 6B controller (Ryan McClelland)
| -rw-r--r-- | drivers/hid/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-nintendo.c | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index c57927529f8a..b53eb569bd49 100644 --- 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 55153a2f7988..11ac246176ae 100644 --- 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, }, |