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

Commit 6f9e46b4 authored Jan 24, 2011 by Mauro Carvalho Chehab

[media] rc/keymaps: Use KEY_VIDEO for Video Source



Each keyboard map were using a different definition for
the Source/Video Source key.
Behold Columbus were the only one using KEY_PROPS.

As we want to standardize those keys at X11 and at
userspace applications, we need to use just one code
for it.

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

parent 444cc20b

drivers/media/rc/keymaps/rc-avermedia-dvbt.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,12 +26,12 @@ static struct rc_map_table avermedia_dvbt[] = {
	{ 0x16, KEY_8 }, /* '8' / 'down arrow' */		{ 0x16, KEY_8 }, /* '8' / 'down arrow' */
	{ 0x36, KEY_9 }, /* '9' */		{ 0x36, KEY_9 }, /* '9' */

	{ 0x20, KEY_LIST }, /* 'source' */		{ 0x20, KEY_VIDEO }, /* 'source' */
	{ 0x10, KEY_TEXT }, /* 'teletext' */		{ 0x10, KEY_TEXT }, /* 'teletext' */
	{ 0x00, KEY_POWER }, /* 'power' */		{ 0x00, KEY_POWER }, /* 'power' */
	{ 0x04, KEY_AUDIO }, /* 'audio' */		{ 0x04, KEY_AUDIO }, /* 'audio' */
	{ 0x06, KEY_ZOOM }, /* 'full screen' */		{ 0x06, KEY_ZOOM }, /* 'full screen' */
	{ 0x18, KEY_VIDEO }, /* 'display' */		{ 0x18, KEY_SWITCHVIDEOMODE }, /* 'display' */
	{ 0x38, KEY_SEARCH }, /* 'loop' */		{ 0x38, KEY_SEARCH }, /* 'loop' */
	{ 0x08, KEY_INFO }, /* 'preview' */		{ 0x08, KEY_INFO }, /* 'preview' */
	{ 0x2a, KEY_REWIND }, /* 'backward <<' */		{ 0x2a, KEY_REWIND }, /* 'backward <<' */

drivers/media/rc/keymaps/rc-behold-columbus.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@ static struct rc_map_table behold_columbus[] = {
	* */		* */

	{ 0x13, KEY_MUTE },		{ 0x13, KEY_MUTE },
	{ 0x11, KEY_PROPS },		{ 0x11, KEY_VIDEO },
	{ 0x1C, KEY_TUNER }, /* KEY_TV/KEY_RADIO */		{ 0x1C, KEY_TUNER }, /* KEY_TV/KEY_RADIO */
	{ 0x12, KEY_POWER },		{ 0x12, KEY_POWER },

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -97,7 +97,7 @@ static struct rc_map_table behold[] = {
	{ 0x6b861a, KEY_STOP },		{ 0x6b861a, KEY_STOP },
	{ 0x6b860e, KEY_TEXT },		{ 0x6b860e, KEY_TEXT },
	{ 0x6b861f, KEY_RED }, /XXX KEY_AUDIO /		{ 0x6b861f, KEY_RED }, /XXX KEY_AUDIO /
	{ 0x6b861e, KEY_YELLOW }, /XXX KEY_SOURCE /		{ 0x6b861e, KEY_VIDEO },

	/* 0x1d 0x13 0x19 *		/* 0x1d 0x13 0x19 *
	* SLEEP PREVIEW DVB *		* SLEEP PREVIEW DVB *

drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ static struct rc_map_table dntv_live_dvb_t[] = {
	{ 0x0c, KEY_SEARCH }, /* scan */		{ 0x0c, KEY_SEARCH }, /* scan */
	{ 0x0d, KEY_STOP },		{ 0x0d, KEY_STOP },
	{ 0x0e, KEY_PAUSE },		{ 0x0e, KEY_PAUSE },
	{ 0x0f, KEY_LIST }, /* source */		{ 0x0f, KEY_VIDEO }, /* source */

	{ 0x10, KEY_MUTE },		{ 0x10, KEY_MUTE },
	{ 0x11, KEY_REWIND }, /* backward << */		{ 0x11, KEY_REWIND }, /* backward << */

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ static struct rc_map_table encore_enltv2[] = {
	{ 0x64, KEY_LAST }, /* +100 */		{ 0x64, KEY_LAST }, /* +100 */
	{ 0x4e, KEY_AGAIN }, /* Recall */		{ 0x4e, KEY_AGAIN }, /* Recall */

	{ 0x6c, KEY_SWITCHVIDEOMODE }, /* Video Source */		{ 0x6c, KEY_VIDEO }, /* Video Source */
	{ 0x5e, KEY_MENU },		{ 0x5e, KEY_MENU },
	{ 0x56, KEY_SCREEN },		{ 0x56, KEY_SCREEN },
	{ 0x7a, KEY_SETUP },		{ 0x7a, KEY_SETUP },