mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00
Code Issues Releases Wiki Activity

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

Browse 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>
This commit is contained in:
Mauro Carvalho Chehab 2011-01-24 12:18:37 -03:00
parent 444cc20b3d
commit 6f9e46b447
17 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/rc/keymaps/rc-avermedia-dvbt.c
View file

@ -26,12 +26,12 @@ static struct rc_map_table avermedia_dvbt[] = {
{ 0x16, KEY_8 }, /* '8' / 'down arrow' */
{ 0x36, KEY_9 }, /* '9' */
{ 0x20, KEY_LIST }, /* 'source' */
{ 0x20, KEY_VIDEO }, /* 'source' */
{ 0x10, KEY_TEXT }, /* 'teletext' */
{ 0x00, KEY_POWER }, /* 'power' */
{ 0x04, KEY_AUDIO }, /* 'audio' */
{ 0x06, KEY_ZOOM }, /* 'full screen' */
{ 0x18, KEY_VIDEO }, /* 'display' */
{ 0x18, KEY_SWITCHVIDEOMODE }, /* 'display' */
{ 0x38, KEY_SEARCH }, /* 'loop' */
{ 0x08, KEY_INFO }, /* 'preview' */
{ 0x2a, KEY_REWIND }, /* 'backward <<' */

2
drivers/media/rc/keymaps/rc-behold-columbus.c
View file

@ -28,7 +28,7 @@ static struct rc_map_table behold_columbus[] = {
* */
{ 0x13, KEY_MUTE },
{ 0x11, KEY_PROPS },
{ 0x11, KEY_VIDEO },
{ 0x1C, KEY_TUNER }, /* KEY_TV/KEY_RADIO */
{ 0x12, KEY_POWER },

2
drivers/media/rc/keymaps/rc-behold.c
View file

@ -97,7 +97,7 @@ static struct rc_map_table behold[] = {
{ 0x6b861a, KEY_STOP },
{ 0x6b860e, KEY_TEXT },
{ 0x6b861f, KEY_RED }, /*XXX KEY_AUDIO */
{ 0x6b861e, KEY_YELLOW }, /*XXX KEY_SOURCE */
{ 0x6b861e, KEY_VIDEO },
/* 0x1d 0x13 0x19 *
* SLEEP PREVIEW DVB *

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

@ -32,7 +32,7 @@ static struct rc_map_table dntv_live_dvb_t[] = {
{ 0x0c, KEY_SEARCH }, /* scan */
{ 0x0d, KEY_STOP },
{ 0x0e, KEY_PAUSE },
{ 0x0f, KEY_LIST }, /* source */
{ 0x0f, KEY_VIDEO }, /* source */
{ 0x10, KEY_MUTE },
{ 0x11, KEY_REWIND }, /* backward << */

2
drivers/media/rc/keymaps/rc-encore-enltv2.c
View file

@ -32,7 +32,7 @@ static struct rc_map_table encore_enltv2[] = {
{ 0x64, KEY_LAST }, /* +100 */
{ 0x4e, KEY_AGAIN }, /* Recall */
{ 0x6c, KEY_SWITCHVIDEOMODE }, /* Video Source */
{ 0x6c, KEY_VIDEO }, /* Video Source */
{ 0x5e, KEY_MENU },
{ 0x56, KEY_SCREEN },
{ 0x7a, KEY_SETUP },

4
drivers/media/rc/keymaps/rc-flydvb.c
View file

@ -37,8 +37,8 @@ static struct rc_map_table flydvb[] = {
{ 0x13, KEY_CHANNELDOWN }, /* CH- */
{ 0x1d, KEY_ENTER }, /* Enter */
{ 0x1a, KEY_MODE }, /* PIP */
{ 0x18, KEY_TUNER }, /* Source */
{ 0x1a, KEY_TV2 }, /* PIP */
{ 0x18, KEY_VIDEO }, /* Source */
{ 0x1e, KEY_RECORD }, /* Record/Pause */
{ 0x15, KEY_ANGLE }, /* Swap (no label on key) */

4
drivers/media/rc/keymaps/rc-hauppauge-new.c
View file

@ -42,7 +42,7 @@ static struct rc_map_table hauppauge_new[] = {
{ 0x15, KEY_DOWN },
{ 0x16, KEY_LEFT },
{ 0x17, KEY_RIGHT },
{ 0x18, KEY_VIDEO }, /* Videos */
{ 0x18, KEY_VCR }, /* Videos */
{ 0x19, KEY_AUDIO }, /* Music */
/* 0x1a: Pictures - presume this means
"Multimedia Home Platform" -
@ -56,7 +56,7 @@ static struct rc_map_table hauppauge_new[] = {
{ 0x1f, KEY_EXIT }, /* back/exit */
{ 0x20, KEY_CHANNELUP }, /* channel / program + */
{ 0x21, KEY_CHANNELDOWN }, /* channel / program - */
{ 0x22, KEY_CHANNEL }, /* source (old black remote) */
{ 0x22, KEY_VIDEO }, /* source (old black remote) */
{ 0x24, KEY_PREVIOUSSONG }, /* replay |< */
{ 0x25, KEY_ENTER }, /* OK */
{ 0x26, KEY_SLEEP }, /* minimize (old black remote) */

2
drivers/media/rc/keymaps/rc-kworld-315u.c
View file

@ -17,7 +17,7 @@
static struct rc_map_table kworld_315u[] = {
{ 0x6143, KEY_POWER },
{ 0x6101, KEY_TUNER }, /* source */
{ 0x6101, KEY_VIDEO }, /* source */
{ 0x610b, KEY_ZOOM },
{ 0x6103, KEY_POWER2 }, /* shutdown */

2
drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
View file

@ -62,7 +62,7 @@ static struct rc_map_table msi_tvanywhere_plus[] = {
{ 0x13, KEY_AGAIN }, /* Recall */
{ 0x1e, KEY_POWER }, /* Power */
{ 0x07, KEY_TUNER }, /* Source */
{ 0x07, KEY_VIDEO }, /* Source */
{ 0x1c, KEY_SEARCH }, /* Scan */
{ 0x18, KEY_MUTE }, /* Mute */

2
drivers/media/rc/keymaps/rc-norwood.c
View file

@ -29,7 +29,7 @@ static struct rc_map_table norwood[] = {
{ 0x28, KEY_8 },
{ 0x29, KEY_9 },
{ 0x78, KEY_TUNER }, /* Video Source */
{ 0x78, KEY_VIDEO }, /* Video Source */
{ 0x2c, KEY_EXIT }, /* Open/Close software */
{ 0x2a, KEY_SELECT }, /* 2 Digit Select */
{ 0x69, KEY_AGAIN }, /* Recall */

2
drivers/media/rc/keymaps/rc-pctv-sedna.c
View file

@ -36,7 +36,7 @@ static struct rc_map_table pctv_sedna[] = {
{ 0x0e, KEY_STOP },
{ 0x0f, KEY_PREVIOUSSONG },
{ 0x10, KEY_ZOOM },
{ 0x11, KEY_TUNER }, /* Source */
{ 0x11, KEY_VIDEO }, /* Source */
{ 0x12, KEY_POWER },
{ 0x13, KEY_MUTE },
{ 0x15, KEY_CHANNELDOWN },

2
drivers/media/rc/keymaps/rc-pixelview-mk12.c
View file

@ -34,7 +34,7 @@ static struct rc_map_table pixelview_mk12[] = {
{ 0x866b13, KEY_AGAIN }, /* loop */
{ 0x866b10, KEY_DIGITS }, /* +100 */
{ 0x866b00, KEY_MEDIA }, /* source */
{ 0x866b00, KEY_VIDEO }, /* source */
{ 0x866b18, KEY_MUTE }, /* mute */
{ 0x866b19, KEY_CAMERA }, /* snapshot */
{ 0x866b1a, KEY_SEARCH }, /* scan */

2
drivers/media/rc/keymaps/rc-pixelview-new.c
View file

@ -33,7 +33,7 @@ static struct rc_map_table pixelview_new[] = {
{ 0x3e, KEY_0 },
{ 0x1c, KEY_AGAIN }, /* LOOP */
{ 0x3f, KEY_MEDIA }, /* Source */
{ 0x3f, KEY_VIDEO }, /* Source */
{ 0x1f, KEY_LAST }, /* +100 */
{ 0x1b, KEY_MUTE },

2
drivers/media/rc/keymaps/rc-pixelview.c
View file

@ -15,7 +15,7 @@
static struct rc_map_table pixelview[] = {
{ 0x1e, KEY_POWER }, /* power */
{ 0x07, KEY_MEDIA }, /* source */
{ 0x07, KEY_VIDEO }, /* source */
{ 0x1c, KEY_SEARCH }, /* scan */

4
drivers/media/rc/keymaps/rc-pv951.c
View file

@ -46,10 +46,10 @@ static struct rc_map_table pv951[] = {
{ 0x0c, KEY_SEARCH }, /* AUTOSCAN */
/* Not sure what to do with these ones! */
{ 0x0f, KEY_SELECT }, /* SOURCE */
{ 0x0f, KEY_VIDEO }, /* SOURCE */
{ 0x0a, KEY_KPPLUS }, /* +100 */
{ 0x14, KEY_EQUAL }, /* SYNC */
{ 0x1c, KEY_MEDIA }, /* PC/TV */
{ 0x1c, KEY_TV }, /* PC/TV */
};
static struct rc_map_list pv951_map = {

4
drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
View file

@ -45,7 +45,7 @@ static struct rc_map_table rc5_hauppauge_new[] = {
{ 0x1e15, KEY_DOWN },
{ 0x1e16, KEY_LEFT },
{ 0x1e17, KEY_RIGHT },
{ 0x1e18, KEY_VIDEO }, /* Videos */
{ 0x1e18, KEY_VCR }, /* Videos */
{ 0x1e19, KEY_AUDIO }, /* Music */
/* 0x1e1a: Pictures - presume this means
"Multimedia Home Platform" -
@ -59,7 +59,7 @@ static struct rc_map_table rc5_hauppauge_new[] = {
{ 0x1e1f, KEY_EXIT }, /* back/exit */
{ 0x1e20, KEY_CHANNELUP }, /* channel / program + */
{ 0x1e21, KEY_CHANNELDOWN }, /* channel / program - */
{ 0x1e22, KEY_CHANNEL }, /* source (old black remote) */
{ 0x1e22, KEY_VIDEO }, /* source (old black remote) */
{ 0x1e24, KEY_PREVIOUSSONG }, /* replay |< */
{ 0x1e25, KEY_ENTER }, /* OK */
{ 0x1e26, KEY_SLEEP }, /* minimize (old black remote) */

2
drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c
View file

@ -35,7 +35,7 @@ static struct rc_map_table real_audio_220_32_keys[] = {
{ 0x15, KEY_CHANNELDOWN},
{ 0x16, KEY_ENTER},
{ 0x11, KEY_LIST}, /* Source */
{ 0x11, KEY_VIDEO}, /* Source */
{ 0x0d, KEY_AUDIO}, /* stereo */
{ 0x0f, KEY_PREVIOUS}, /* Prev */