HID: nintendo: fix gencon button events map
Subsystems (2)
PATCH 1/1 HID: nintendo: fix gencon button events map
This fixes the button event map to match the 3-button recommendation as well as the redundant 'z' in the button map events for the Sega MD/Gen 6 Button.
--- drivers/hid/hid-nintendo.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/hid/hid-nintendo.c +7 -7
@@ -457,13 +457,13 @@ static const struct joycon_ctlr_button_mapping snescon_button_mappings[] = { };static const struct joycon_ctlr_button_mapping gencon_button_mappings[] = { - {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_WEST ,JC_BTN_A , },/* A */ + {BTN_SOUTH ,JC_BTN_B , },/* B */ + {BTN_EAST ,JC_BTN_R , },/* C */ + {BTN_TL ,JC_BTN_X , },/* X MD/GEN 6B Only */ + {BTN_NORTH ,JC_BTN_Y , },/* Y MD/GEN 6B Only */ + {BTN_TR ,JC_BTN_L , },/* Z MD/GEN 6B Only */ + {BTN_SELECT ,JC_BTN_ZR , },/* Mode */ {BTN_START ,JC_BTN_PLUS , }, {BTN_MODE ,JC_BTN_HOME , }, {BTN_Z ,JC_BTN_CAP , },
Signature · 1 line
2.34.1
Jiri Kosina
maintainerQuoted 5 lines · Ryan McClelland
This fixes the button event map to match the 3-button recommendation as well as the redundant 'z' in the button map events for the Sega MD/Gen 6 Button.
Signed-off-by Ryan McClelland <[email protected]>
Daniel, could you please provide your Ack for this patch?
Thanks,
Quoted 32 lines
--- drivers/hid/hid-nintendo.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/hid/hid-nintendo.c +7
-7@@ -457,13 +457,13 @@ static const struct joycon_ctlr_button_mapping snescon_button_mappings[] = { };static const struct joycon_ctlr_button_mapping gencon_button_mappings[] = { - {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_WEST ,JC_BTN_A , },/* A */ + {BTN_SOUTH ,JC_BTN_B , },/* B */ + {BTN_EAST ,JC_BTN_R , },/* C */ + {BTN_TL ,JC_BTN_X , },/* X MD/GEN 6B Only */ + {BTN_NORTH ,JC_BTN_Y , },/* Y MD/GEN 6B Only */ + {BTN_TR ,JC_BTN_L , },/* Z MD/GEN 6B Only */ + {BTN_SELECT ,JC_BTN_ZR , },/* Mode */ {BTN_START ,JC_BTN_PLUS , }, {BTN_MODE ,JC_BTN_HOME , }, {BTN_Z ,JC_BTN_CAP , },Signature · 1 line
2.34.1
Signature · 2 lines
Jiri Kosina SUSE Labs
Hi Ryan,
Quoted 41 lines · Jiri Kosina
Quoted 5 lines · Ryan McClelland
This fixes the button event map to match the 3-button recommendation as well as the redundant 'z' in the button map events for the Sega MD/Gen 6 Button.
Signed-off-by Ryan McClelland <[email protected]>Daniel, could you please provide your Ack for this patch?
Thanks,
Quoted 28 lines
--- drivers/hid/hid-nintendo.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/hid/hid-nintendo.c +7
-7@@ -457,13 +457,13 @@ static const struct joycon_ctlr_button_mapping snescon_button_mappings[] = { };static const struct joycon_ctlr_button_mapping gencon_button_mappings[] = { - {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_WEST ,JC_BTN_A , },/* A */ + {BTN_SOUTH ,JC_BTN_B , },/* B */ + {BTN_EAST ,JC_BTN_R , },/* C */ + {BTN_TL ,JC_BTN_X , },/* X MD/GEN 6B Only */ + {BTN_NORTH ,JC_BTN_Y , },/* Y MD/GEN 6B Only */ + {BTN_TR ,JC_BTN_L , },/* Z MD/GEN 6B Only */ + {BTN_SELECT ,JC_BTN_ZR , },/* Mode */ {BTN_START ,JC_BTN_PLUS , }, {BTN_MODE ,JC_BTN_HOME , },
Quoted 9 lines
Quoted 4 lines
drivers/hid/hid-nintendo.c +0
-1{ BTN_Z, JC_BTN_CAP, }, --2.34.1
--
Jiri Kosina
SUSE Labs
Thanks for the fix. This looks correct to me.
-Daniel
Quoted 24 lines · Ryan McClelland
This fixes the button event map to match the 3-button recommendation as well as the redundant 'z' in the button map events for the Sega MD/Gen 6 Button.
Signed-off-by Ryan McClelland <[email protected]>--- drivers/hid/hid-nintendo.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/hid/hid-nintendo.c +0
-7@@ -457,13 +457,13 @@ static const struct joycon_ctlr_button_mapping snescon_button_mappings[] = { };static const struct joycon_ctlr_button_mapping gencon_button_mappings[] = { - {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 , },
drivers/hid/hid-nintendo.c static const struct joycon_ctlr_button_mapping snescon_button_mappings[] = { · line 469
Quoted 10 lines
drivers/hid/hid-nintendo.c +7
-0+ { BTN_WEST, JC_BTN_A, }, /* A */ + { BTN_SOUTH, JC_BTN_B, }, /* B */ + { BTN_EAST, JC_BTN_R, }, /* C */ + { BTN_TL, JC_BTN_X, }, /* X MD/GEN 6B Only */ + { BTN_NORTH, JC_BTN_Y, }, /* Y MD/GEN 6B Only */ + { BTN_TR, JC_BTN_L, }, /* Z MD/GEN 6B Only */ + { BTN_SELECT, JC_BTN_ZR, }, /* Mode */ { BTN_START, JC_BTN_PLUS, }, { BTN_MODE, JC_BTN_HOME, }, { BTN_Z, JC_BTN_CAP, },
Applied, thank you.
Signature · 2 lines
Jiri Kosina SUSE Labs