Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1910ea42 authored by Bastien Nocera's avatar Bastien Nocera Committed by Mauro Carvalho Chehab
Browse files

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: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 15a98fb2

Documentation/media/uapi/rc/rc-tables.rst

+10 −10
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ the remote via /dev/input/event devices. 


    -  .. row 3



       -  ``KEY_0``

       -  ``KEY_NUMERIC_0``



       -  Keyboard digit 0
@@ -62,7 +62,7 @@ the remote via /dev/input/event devices. 


    -  .. row 4



       -  ``KEY_1``

       -  ``KEY_NUMERIC_1``



       -  Keyboard digit 1
@@ -70,7 +70,7 @@ the remote via /dev/input/event devices. 


    -  .. row 5



       -  ``KEY_2``

       -  ``KEY_NUMERIC_2``



       -  Keyboard digit 2
@@ -78,7 +78,7 @@ the remote via /dev/input/event devices. 


    -  .. row 6



       -  ``KEY_3``

       -  ``KEY_NUMERIC_3``



       -  Keyboard digit 3
@@ -86,7 +86,7 @@ the remote via /dev/input/event devices. 


    -  .. row 7



       -  ``KEY_4``

       -  ``KEY_NUMERIC_4``



       -  Keyboard digit 4
@@ -94,7 +94,7 @@ the remote via /dev/input/event devices. 


    -  .. row 8



       -  ``KEY_5``

       -  ``KEY_NUMERIC_5``



       -  Keyboard digit 5
@@ -102,7 +102,7 @@ the remote via /dev/input/event devices. 


    -  .. row 9



       -  ``KEY_6``

       -  ``KEY_NUMERIC_6``



       -  Keyboard digit 6
@@ -110,7 +110,7 @@ the remote via /dev/input/event devices. 


    -  .. row 10



       -  ``KEY_7``

       -  ``KEY_NUMERIC_7``



       -  Keyboard digit 7
@@ -118,7 +118,7 @@ the remote via /dev/input/event devices. 


    -  .. row 11



       -  ``KEY_8``

       -  ``KEY_NUMERIC_8``



       -  Keyboard digit 8
@@ -126,7 +126,7 @@ the remote via /dev/input/event devices. 


    -  .. row 12



       -  ``KEY_9``

       -  ``KEY_NUMERIC_9``



       -  Keyboard digit 9

drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c

+10 −10
Original line number Diff line number Diff line
@@ -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 },

drivers/media/rc/keymaps/rc-alink-dtu-m.c

+10 −10
Original line number Diff line number Diff line
@@ -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 },

};

drivers/media/rc/keymaps/rc-anysee.c

+10 −10
Original line number Diff line number Diff line
@@ -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] */

drivers/media/rc/keymaps/rc-apac-viewcomp.c

+10 −10
Original line number Diff line number Diff line
@@ -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 */