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

Commit d9e9f41c authored Jan 24, 2011 by Mauro Carvalho Chehab

[media] rc/keymaps: Fix most KEY_PROG[n] keycodes



Those KEY_PROG[n] keys were used on places where the developer
didn't know for sure what key should be used. On several cases,
using KEY_RED, KEY_GREEN, KEY_YELLOW would be enough. On others,
there are specific keys for that already.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>

parent 6f9e46b4

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -50,9 +50,9 @@ static struct rc_map_table adstech_dvb_t_pci[] = {
	{ 0x13, KEY_TUNER }, /* Live */		{ 0x13, KEY_TUNER }, /* Live */
	{ 0x0a, KEY_A },		{ 0x0a, KEY_A },
	{ 0x12, KEY_B },		{ 0x12, KEY_B },
	{ 0x03, KEY_PROG1 }, /* 1 */		{ 0x03, KEY_RED }, /* 1 */
	{ 0x01, KEY_PROG2 }, /* 2 */		{ 0x01, KEY_GREEN }, /* 2 */
	{ 0x00, KEY_PROG3 }, /* 3 */		{ 0x00, KEY_YELLOW }, /* 3 */
	{ 0x06, KEY_DVD },		{ 0x06, KEY_DVD },
	{ 0x48, KEY_AUX }, /* Photo */		{ 0x48, KEY_AUX }, /* Photo */
	{ 0x40, KEY_VIDEO },		{ 0x40, KEY_VIDEO },

drivers/media/rc/keymaps/rc-avermedia-rm-ks.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ static struct rc_map_table avermedia_rm_ks[] = {
	{ 0x0505, KEY_VOLUMEDOWN },		{ 0x0505, KEY_VOLUMEDOWN },
	{ 0x0506, KEY_MUTE },		{ 0x0506, KEY_MUTE },
	{ 0x0507, KEY_RIGHT },		{ 0x0507, KEY_RIGHT },
	{ 0x0508, KEY_PROG1 },		{ 0x0508, KEY_RED },
	{ 0x0509, KEY_1 },		{ 0x0509, KEY_1 },
	{ 0x050a, KEY_2 },		{ 0x050a, KEY_2 },
	{ 0x050b, KEY_3 },		{ 0x050b, KEY_3 },

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@ static struct rc_map_table cinergy[] = {
	{ 0x09, KEY_9 },		{ 0x09, KEY_9 },

	{ 0x0a, KEY_POWER },		{ 0x0a, KEY_POWER },
	{ 0x0b, KEY_PROG1 }, /* app */		{ 0x0b, KEY_MEDIA }, /* app */
	{ 0x0c, KEY_ZOOM }, /* zoom/fullscreen */		{ 0x0c, KEY_ZOOM }, /* zoom/fullscreen */
	{ 0x0d, KEY_CHANNELUP }, /* channel */		{ 0x0d, KEY_CHANNELUP }, /* channel */
	{ 0x0e, KEY_CHANNELDOWN }, /* channel- */		{ 0x0e, KEY_CHANNELDOWN }, /* channel- */

drivers/media/rc/keymaps/rc-encore-enltv.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -77,7 +77,7 @@ static struct rc_map_table encore_enltv[] = {
	{ 0x50, KEY_SLEEP }, /* shutdown */		{ 0x50, KEY_SLEEP }, /* shutdown */
	{ 0x51, KEY_MODE }, /* stereo > main */		{ 0x51, KEY_MODE }, /* stereo > main */
	{ 0x52, KEY_SELECT }, /* stereo > sap */		{ 0x52, KEY_SELECT }, /* stereo > sap */
	{ 0x53, KEY_PROG1 }, /* teletext */		{ 0x53, KEY_TEXT }, /* teletext */


	{ 0x59, KEY_RED }, /* AP1 */		{ 0x59, KEY_RED }, /* AP1 */