diff options
| author | Bastien Nocera <hadess@hadess.net> | 2019-06-24 11:42:14 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-06-27 07:30:28 -0400 |
| commit | 1910ea428f28e5731a2cea32b86e71953829f15d (patch) | |
| tree | 3bd67ce89a72777df7fc4a1a22a46d4c0a40bf98 /drivers/media | |
| parent | 15a98fb2fc287bbfe430e854d56dcfc86eae21db (diff) | |
| download | linux-1910ea428f28e5731a2cea32b86e71953829f15d.tar.gz linux-1910ea428f28e5731a2cea32b86e71953829f15d.tar.bz2 linux-1910ea428f28e5731a2cea32b86e71953829f15d.zip | |
media: rc: Prefer KEY_NUMERIC_* for number buttons on remotes
Prefer KEY_NUMERIC_* for number buttons on remotes. Now all the remotes
use KEY_NUMERIC_[0-9] for the number buttons rather than keys that
could be affected by modifiers (Caps-Lock, or Num-Lock) or regional
keymaps.
Created using:
sed -i 's/KEY_\([0-9]\) /KEY_NUMERIC_\1 /' *.c
sed -i 's/KEY_\([0-9]\)}/KEY_NUMERIC_\1}/' *.c
sed -i 's/``KEY_\([0-9]\)/``KEY_NUMERIC_\1/' Documentation/media/uapi/rc/rc-tables.rst
Signed-off-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media')
109 files changed, 1244 insertions, 1240 deletions
diff --git a/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c index 732687ce0637..0a867ca90038 100644 --- a/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c +++ b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c @@ -12,16 +12,16 @@ static struct rc_map_table adstech_dvb_t_pci[] = { /* Keys 0 to 9 */ - { 0x4d, KEY_0 }, - { 0x57, KEY_1 }, - { 0x4f, KEY_2 }, - { 0x53, KEY_3 }, - { 0x56, KEY_4 }, - { 0x4e, KEY_5 }, - { 0x5e, KEY_6 }, - { 0x54, KEY_7 }, - { 0x4c, KEY_8 }, - { 0x5c, KEY_9 }, + { 0x4d, KEY_NUMERIC_0 }, + { 0x57, KEY_NUMERIC_1 }, + { 0x4f, KEY_NUMERIC_2 }, + { 0x53, KEY_NUMERIC_3 }, + { 0x56, KEY_NUMERIC_4 }, + { 0x4e, KEY_NUMERIC_5 }, + { 0x5e, KEY_NUMERIC_6 }, + { 0x54, KEY_NUMERIC_7 }, + { 0x4c, KEY_NUMERIC_8 }, + { 0x5c, KEY_NUMERIC_9 }, { 0x5b, KEY_POWER }, { 0x5f, KEY_MUTE }, diff --git a/drivers/media/rc/keymaps/rc-alink-dtu-m.c b/drivers/media/rc/keymaps/rc-alink-dtu-m.c index 530af333af8e..8a2ccaf3b817 100644 --- a/drivers/media/rc/keymaps/rc-alink-dtu-m.c +++ b/drivers/media/rc/keymaps/rc-alink-dtu-m.c @@ -11,22 +11,22 @@ /* A-Link DTU(m) slim remote, 6 rows, 3 columns. */ static struct rc_map_table alink_dtu_m[] = { { 0x0800, KEY_VOLUMEUP }, - { 0x0801, KEY_1 }, - { 0x0802, KEY_3 }, - { 0x0803, KEY_7 }, - { 0x0804, KEY_9 }, + { 0x0801, KEY_NUMERIC_1 }, + { 0x0802, KEY_NUMERIC_3 }, + { 0x0803, KEY_NUMERIC_7 }, + { 0x0804, KEY_NUMERIC_9 }, { 0x0805, KEY_NEW }, /* symbol: PIP */ - { 0x0806, KEY_0 }, + { 0x0806, KEY_NUMERIC_0 }, { 0x0807, KEY_CHANNEL }, /* JUMP */ - { 0x080d, KEY_5 }, - { 0x080f, KEY_2 }, + { 0x080d, KEY_NUMERIC_5 }, + { 0x080f, KEY_NUMERIC_2 }, { 0x0812, KEY_POWER2 }, { 0x0814, KEY_CHANNELUP }, { 0x0816, KEY_VOLUMEDOWN }, - { 0x0818, KEY_6 }, + { 0x0818, KEY_NUMERIC_6 }, { 0x081a, KEY_MUTE }, - { 0x081b, KEY_8 }, - { 0x081c, KEY_4 }, + { 0x081b, KEY_NUMERIC_8 }, + { 0x081c, KEY_NUMERIC_4 }, { 0x081d, KEY_CHANNELDOWN }, }; diff --git a/drivers/media/rc/keymaps/rc-anysee.c b/drivers/media/rc/keymaps/rc-anysee.c index 9d1eee1f0515..34da03c46104 100644 --- a/drivers/media/rc/keymaps/rc-anysee.c +++ b/drivers/media/rc/keymaps/rc-anysee.c @@ -9,16 +9,16 @@ #include <linux/module.h> static struct rc_map_table anysee[] = { - { 0x0800, KEY_0 }, - { 0x0801, KEY_1 }, - { 0x0802, KEY_2 }, - { 0x0803, KEY_3 }, - { 0x0804, KEY_4 }, - { 0x0805, KEY_5 }, - { 0x0806, KEY_6 }, - { 0x0807, KEY_7 }, - { 0x0808, KEY_8 }, - { 0x0809, KEY_9 }, + { 0x0800, KEY_NUMERIC_0 }, + { 0x0801, KEY_NUMERIC_1 }, + { 0x0802, KEY_NUMERIC_2 }, + { 0x0803, KEY_NUMERIC_3 }, + { 0x0804, KEY_NUMERIC_4 }, + { 0x0805, KEY_NUMERIC_5 }, + { 0x0806, KEY_NUMERIC_6 }, + { 0x0807, KEY_NUMERIC_7 }, + { 0x0808, KEY_NUMERIC_8 }, + { 0x0809, KEY_NUMERIC_9 }, { 0x080a, KEY_POWER2 }, /* [red power button] */ { 0x080b, KEY_VIDEO }, /* [*] MODE */ { 0x080c, KEY_CHANNEL }, /* [symbol counterclockwise arrow] */ diff --git a/drivers/media/rc/keymaps/rc-apac-viewcomp.c b/drivers/media/rc/keymaps/rc-apac-viewcomp.c index af2e7fdc7b85..bdc47e25d46e 100644 --- a/drivers/media/rc/keymaps/rc-apac-viewcomp.c +++ b/drivers/media/rc/keymaps/rc-apac-viewcomp.c @@ -12,16 +12,16 @@ static struct rc_map_table apac_viewcomp[] = { - { 0x01, KEY_1 }, - { 0x02, KEY_2 }, - { 0x03, KEY_3 }, - { 0x04, KEY_4 }, - { 0x05, KEY_5 }, - { 0x06, KEY_6 }, - { 0x07, KEY_7 }, - { 0x08, KEY_8 }, - { 0x09, KEY_9 }, - { 0x00, KEY_0 }, + { 0x01, KEY_NUMERIC_1 }, + { 0x02, KEY_NUMERIC_2 }, + { 0x03, KEY_NUMERIC_3 }, + { 0x04, KEY_NUMERIC_4 }, + { 0x05, KEY_NUMERIC_5 }, + { 0x06, KEY_NUMERIC_6 }, + { 0x07, KEY_NUMERIC_7 }, + { 0x08, KEY_NUMERIC_8 }, + { 0x09, KEY_NUMERIC_9 }, + { 0x00, KEY_NUMERIC_0 }, { 0x17, KEY_LAST }, /* +100 */ { 0x0a, KEY_LIST }, /* recall */ diff --git a/drivers/media/rc/keymaps/rc-astrometa-t2hybrid.c b/drivers/media/rc/keymaps/rc-astrometa-t2hybrid.c index 727e35c31039..1d322137898e 100644 --- a/drivers/media/rc/keymaps/rc-astrometa-t2hybrid.c +++ b/drivers/media/rc/keymaps/rc-astrometa-t2hybrid.c @@ -21,21 +21,21 @@ static struct rc_map_table t2hybrid[] = { { 0x40, KEY_ZOOM }, /* Fullscreen */ { 0x1e, KEY_VOLUMEUP }, - { 0x12, KEY_0 }, + { 0x12, |
