Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

+22 -22
+2 -2
drivers/media/rc/keymaps/rc-avermedia-dvbt.c
··· 26 26 { 0x16, KEY_8 }, /* '8' / 'down arrow' */ 27 27 { 0x36, KEY_9 }, /* '9' */ 28 28 29 - { 0x20, KEY_LIST }, /* 'source' */ 29 + { 0x20, KEY_VIDEO }, /* 'source' */ 30 30 { 0x10, KEY_TEXT }, /* 'teletext' */ 31 31 { 0x00, KEY_POWER }, /* 'power' */ 32 32 { 0x04, KEY_AUDIO }, /* 'audio' */ 33 33 { 0x06, KEY_ZOOM }, /* 'full screen' */ 34 - { 0x18, KEY_VIDEO }, /* 'display' */ 34 + { 0x18, KEY_SWITCHVIDEOMODE }, /* 'display' */ 35 35 { 0x38, KEY_SEARCH }, /* 'loop' */ 36 36 { 0x08, KEY_INFO }, /* 'preview' */ 37 37 { 0x2a, KEY_REWIND }, /* 'backward <<' */
+1 -1
drivers/media/rc/keymaps/rc-behold-columbus.c
··· 28 28 * */ 29 29 30 30 { 0x13, KEY_MUTE }, 31 - { 0x11, KEY_PROPS }, 31 + { 0x11, KEY_VIDEO }, 32 32 { 0x1C, KEY_TUNER }, /* KEY_TV/KEY_RADIO */ 33 33 { 0x12, KEY_POWER }, 34 34
+1 -1
drivers/media/rc/keymaps/rc-behold.c
··· 97 97 { 0x6b861a, KEY_STOP }, 98 98 { 0x6b860e, KEY_TEXT }, 99 99 { 0x6b861f, KEY_RED }, /*XXX KEY_AUDIO */ 100 - { 0x6b861e, KEY_YELLOW }, /*XXX KEY_SOURCE */ 100 + { 0x6b861e, KEY_VIDEO }, 101 101 102 102 /* 0x1d 0x13 0x19 * 103 103 * SLEEP PREVIEW DVB *
+1 -1
drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
··· 32 32 { 0x0c, KEY_SEARCH }, /* scan */ 33 33 { 0x0d, KEY_STOP }, 34 34 { 0x0e, KEY_PAUSE }, 35 - { 0x0f, KEY_LIST }, /* source */ 35 + { 0x0f, KEY_VIDEO }, /* source */ 36 36 37 37 { 0x10, KEY_MUTE }, 38 38 { 0x11, KEY_REWIND }, /* backward << */
+1 -1
drivers/media/rc/keymaps/rc-encore-enltv2.c
··· 32 32 { 0x64, KEY_LAST }, /* +100 */ 33 33 { 0x4e, KEY_AGAIN }, /* Recall */ 34 34 35 - { 0x6c, KEY_SWITCHVIDEOMODE }, /* Video Source */ 35 + { 0x6c, KEY_VIDEO }, /* Video Source */ 36 36 { 0x5e, KEY_MENU }, 37 37 { 0x56, KEY_SCREEN }, 38 38 { 0x7a, KEY_SETUP },
+2 -2
drivers/media/rc/keymaps/rc-flydvb.c
··· 37 37 { 0x13, KEY_CHANNELDOWN }, /* CH- */ 38 38 { 0x1d, KEY_ENTER }, /* Enter */ 39 39 40 - { 0x1a, KEY_MODE }, /* PIP */ 41 - { 0x18, KEY_TUNER }, /* Source */ 40 + { 0x1a, KEY_TV2 }, /* PIP */ 41 + { 0x18, KEY_VIDEO }, /* Source */ 42 42 43 43 { 0x1e, KEY_RECORD }, /* Record/Pause */ 44 44 { 0x15, KEY_ANGLE }, /* Swap (no label on key) */
+2 -2
drivers/media/rc/keymaps/rc-hauppauge-new.c
··· 42 42 { 0x15, KEY_DOWN }, 43 43 { 0x16, KEY_LEFT }, 44 44 { 0x17, KEY_RIGHT }, 45 - { 0x18, KEY_VIDEO }, /* Videos */ 45 + { 0x18, KEY_VCR }, /* Videos */ 46 46 { 0x19, KEY_AUDIO }, /* Music */ 47 47 /* 0x1a: Pictures - presume this means 48 48 "Multimedia Home Platform" - ··· 56 56 { 0x1f, KEY_EXIT }, /* back/exit */ 57 57 { 0x20, KEY_CHANNELUP }, /* channel / program + */ 58 58 { 0x21, KEY_CHANNELDOWN }, /* channel / program - */ 59 - { 0x22, KEY_CHANNEL }, /* source (old black remote) */ 59 + { 0x22, KEY_VIDEO }, /* source (old black remote) */ 60 60 { 0x24, KEY_PREVIOUSSONG }, /* replay |< */ 61 61 { 0x25, KEY_ENTER }, /* OK */ 62 62 { 0x26, KEY_SLEEP }, /* minimize (old black remote) */
+1 -1
drivers/media/rc/keymaps/rc-kworld-315u.c
··· 17 17 18 18 static struct rc_map_table kworld_315u[] = { 19 19 { 0x6143, KEY_POWER }, 20 - { 0x6101, KEY_TUNER }, /* source */ 20 + { 0x6101, KEY_VIDEO }, /* source */ 21 21 { 0x610b, KEY_ZOOM }, 22 22 { 0x6103, KEY_POWER2 }, /* shutdown */ 23 23
+1 -1
drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
··· 62 62 { 0x13, KEY_AGAIN }, /* Recall */ 63 63 64 64 { 0x1e, KEY_POWER }, /* Power */ 65 - { 0x07, KEY_TUNER }, /* Source */ 65 + { 0x07, KEY_VIDEO }, /* Source */ 66 66 { 0x1c, KEY_SEARCH }, /* Scan */ 67 67 { 0x18, KEY_MUTE }, /* Mute */ 68 68
+1 -1
drivers/media/rc/keymaps/rc-norwood.c
··· 29 29 { 0x28, KEY_8 }, 30 30 { 0x29, KEY_9 }, 31 31 32 - { 0x78, KEY_TUNER }, /* Video Source */ 32 + { 0x78, KEY_VIDEO }, /* Video Source */ 33 33 { 0x2c, KEY_EXIT }, /* Open/Close software */ 34 34 { 0x2a, KEY_SELECT }, /* 2 Digit Select */ 35 35 { 0x69, KEY_AGAIN }, /* Recall */
+1 -1
drivers/media/rc/keymaps/rc-pctv-sedna.c
··· 36 36 { 0x0e, KEY_STOP }, 37 37 { 0x0f, KEY_PREVIOUSSONG }, 38 38 { 0x10, KEY_ZOOM }, 39 - { 0x11, KEY_TUNER }, /* Source */ 39 + { 0x11, KEY_VIDEO }, /* Source */ 40 40 { 0x12, KEY_POWER }, 41 41 { 0x13, KEY_MUTE }, 42 42 { 0x15, KEY_CHANNELDOWN },
+1 -1
drivers/media/rc/keymaps/rc-pixelview-mk12.c
··· 34 34 { 0x866b13, KEY_AGAIN }, /* loop */ 35 35 { 0x866b10, KEY_DIGITS }, /* +100 */ 36 36 37 - { 0x866b00, KEY_MEDIA }, /* source */ 37 + { 0x866b00, KEY_VIDEO }, /* source */ 38 38 { 0x866b18, KEY_MUTE }, /* mute */ 39 39 { 0x866b19, KEY_CAMERA }, /* snapshot */ 40 40 { 0x866b1a, KEY_SEARCH }, /* scan */
+1 -1
drivers/media/rc/keymaps/rc-pixelview-new.c
··· 33 33 { 0x3e, KEY_0 }, 34 34 35 35 { 0x1c, KEY_AGAIN }, /* LOOP */ 36 - { 0x3f, KEY_MEDIA }, /* Source */ 36 + { 0x3f, KEY_VIDEO }, /* Source */ 37 37 { 0x1f, KEY_LAST }, /* +100 */ 38 38 { 0x1b, KEY_MUTE }, 39 39
+1 -1
drivers/media/rc/keymaps/rc-pixelview.c
··· 15 15 static struct rc_map_table pixelview[] = { 16 16 17 17 { 0x1e, KEY_POWER }, /* power */ 18 - { 0x07, KEY_MEDIA }, /* source */ 18 + { 0x07, KEY_VIDEO }, /* source */ 19 19 { 0x1c, KEY_SEARCH }, /* scan */ 20 20 21 21
+2 -2
drivers/media/rc/keymaps/rc-pv951.c
··· 46 46 { 0x0c, KEY_SEARCH }, /* AUTOSCAN */ 47 47 48 48 /* Not sure what to do with these ones! */ 49 - { 0x0f, KEY_SELECT }, /* SOURCE */ 49 + { 0x0f, KEY_VIDEO }, /* SOURCE */ 50 50 { 0x0a, KEY_KPPLUS }, /* +100 */ 51 51 { 0x14, KEY_EQUAL }, /* SYNC */ 52 - { 0x1c, KEY_MEDIA }, /* PC/TV */ 52 + { 0x1c, KEY_TV }, /* PC/TV */ 53 53 }; 54 54 55 55 static struct rc_map_list pv951_map = {
+2 -2
drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
··· 45 45 { 0x1e15, KEY_DOWN }, 46 46 { 0x1e16, KEY_LEFT }, 47 47 { 0x1e17, KEY_RIGHT }, 48 - { 0x1e18, KEY_VIDEO }, /* Videos */ 48 + { 0x1e18, KEY_VCR }, /* Videos */ 49 49 { 0x1e19, KEY_AUDIO }, /* Music */ 50 50 /* 0x1e1a: Pictures - presume this means 51 51 "Multimedia Home Platform" - ··· 59 59 { 0x1e1f, KEY_EXIT }, /* back/exit */ 60 60 { 0x1e20, KEY_CHANNELUP }, /* channel / program + */ 61 61 { 0x1e21, KEY_CHANNELDOWN }, /* channel / program - */ 62 - { 0x1e22, KEY_CHANNEL }, /* source (old black remote) */ 62 + { 0x1e22, KEY_VIDEO }, /* source (old black remote) */ 63 63 { 0x1e24, KEY_PREVIOUSSONG }, /* replay |< */ 64 64 { 0x1e25, KEY_ENTER }, /* OK */ 65 65 { 0x1e26, KEY_SLEEP }, /* minimize (old black remote) */
+1 -1
drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c
··· 35 35 { 0x15, KEY_CHANNELDOWN}, 36 36 { 0x16, KEY_ENTER}, 37 37 38 - { 0x11, KEY_LIST}, /* Source */ 38 + { 0x11, KEY_VIDEO}, /* Source */ 39 39 { 0x0d, KEY_AUDIO}, /* stereo */ 40 40 41 41 { 0x0f, KEY_PREVIOUS}, /* Prev */