| Message ID | 20250117064923.3811-1-rymcclel@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | HID: nintendo: fix gencon button events map | expand |
On Thu, 16 Jan 2025, Ryan McClelland wrote: > 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 <rymcclel@gmail.com> Daniel, could you please provide your Ack for this patch? Thanks, > --- > drivers/hid/hid-nintendo.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c > index 11ac246176ae..839d5bcd72b1 100644 > --- a/drivers/hid/hid-nintendo.c > +++ b/drivers/hid/hid-nintendo.c > @@ -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, }, > -- > 2.34.1 >
Hi Ryan, On Mon, Feb 3, 2025 at 4:57 PM Jiri Kosina <jikos@kernel.org> wrote: > > On Thu, 16 Jan 2025, Ryan McClelland wrote: > > > 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 <rymcclel@gmail.com> > > Daniel, could you please provide your Ack for this patch? > > Thanks, > > > --- > > drivers/hid/hid-nintendo.c | 14 +++++++------- > > 1 file changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c > > index 11ac246176ae..839d5bcd72b1 100644 > > --- a/drivers/hid/hid-nintendo.c > > +++ b/drivers/hid/hid-nintendo.c > > @@ -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, }, > > -- > > 2.34.1 > > > > -- > Jiri Kosina > SUSE Labs > Thanks for the fix. This looks correct to me. Reviewed-by: Daniel J. Ogorchock <djogorchock@gmail.com> -Daniel
On Thu, 16 Jan 2025, Ryan McClelland wrote: > 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 <rymcclel@gmail.com> > --- > drivers/hid/hid-nintendo.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c > index 11ac246176ae..839d5bcd72b1 100644 > --- a/drivers/hid/hid-nintendo.c > +++ b/drivers/hid/hid-nintendo.c > @@ -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, }, Applied, thank you.
diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c index 11ac246176ae..839d5bcd72b1 100644 --- a/drivers/hid/hid-nintendo.c +++ b/drivers/hid/hid-nintendo.c @@ -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, },
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 <rymcclel@gmail.com> --- drivers/hid/hid-nintendo.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)