diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-24 10:18:37 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 18:24:04 -0400 |
commit | 6f9e46b44785eb9cc59e638970e7aa443ff6fe5e (patch) | |
tree | 1021127d808670ac8b02321f3bc2fb3c870498eb /drivers/media | |
parent | 444cc20b3d6141a5fa9a9774a6b710e16af6110d (diff) |
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 4 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-behold-columbus.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-behold.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-encore-enltv2.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-flydvb.c | 4 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-hauppauge-new.c | 4 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-kworld-315u.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-norwood.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-pctv-sedna.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-pixelview-mk12.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-pixelview-new.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-pixelview.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-pv951.c | 4 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c | 4 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c | 2 |
17 files changed, 22 insertions, 22 deletions
diff --git a/drivers/media/rc/keymaps/rc-avermedia-dvbt.c b/drivers/media/rc/keymaps/rc-avermedia-dvbt.c index 3ddb41bc075e..c25809d4c813 100644 --- a/drivers/media/rc/keymaps/rc-avermedia-dvbt.c +++ b/drivers/media/rc/keymaps/rc-avermedia-dvbt.c | |||
@@ -26,12 +26,12 @@ static struct rc_map_table avermedia_dvbt[] = { | |||
26 | { 0x16, KEY_8 }, /* '8' / 'down arrow' */ | 26 | { 0x16, KEY_8 }, /* '8' / 'down arrow' */ |
27 | { 0x36, KEY_9 }, /* '9' */ | 27 | { 0x36, KEY_9 }, /* '9' */ |
28 | 28 | ||
29 | { 0x20, KEY_LIST }, /* 'source' */ | 29 | { 0x20, KEY_VIDEO }, /* 'source' */ |
30 | { 0x10, KEY_TEXT }, /* 'teletext' */ | 30 | { 0x10, KEY_TEXT }, /* 'teletext' */ |
31 | { 0x00, KEY_POWER }, /* 'power' */ | 31 | { 0x00, KEY_POWER }, /* 'power' */ |
32 | { 0x04, KEY_AUDIO }, /* 'audio' */ | 32 | { 0x04, KEY_AUDIO }, /* 'audio' */ |
33 | { 0x06, KEY_ZOOM }, /* 'full screen' */ | 33 | { 0x06, KEY_ZOOM }, /* 'full screen' */ |
34 | { 0x18, KEY_VIDEO }, /* 'display' */ | 34 | { 0x18, KEY_SWITCHVIDEOMODE }, /* 'display' */ |
35 | { 0x38, KEY_SEARCH }, /* 'loop' */ | 35 | { 0x38, KEY_SEARCH }, /* 'loop' */ |
36 | { 0x08, KEY_INFO }, /* 'preview' */ | 36 | { 0x08, KEY_INFO }, /* 'preview' */ |
37 | { 0x2a, KEY_REWIND }, /* 'backward <<' */ | 37 | { 0x2a, KEY_REWIND }, /* 'backward <<' */ |
diff --git a/drivers/media/rc/keymaps/rc-behold-columbus.c b/drivers/media/rc/keymaps/rc-behold-columbus.c index 4b787fa94f08..8bf058f67f0c 100644 --- a/drivers/media/rc/keymaps/rc-behold-columbus.c +++ b/drivers/media/rc/keymaps/rc-behold-columbus.c | |||
@@ -28,7 +28,7 @@ static struct rc_map_table behold_columbus[] = { | |||
28 | * */ | 28 | * */ |
29 | 29 | ||
30 | { 0x13, KEY_MUTE }, | 30 | { 0x13, KEY_MUTE }, |
31 | { 0x11, KEY_PROPS }, | 31 | { 0x11, KEY_VIDEO }, |
32 | { 0x1C, KEY_TUNER }, /* KEY_TV/KEY_RADIO */ | 32 | { 0x1C, KEY_TUNER }, /* KEY_TV/KEY_RADIO */ |
33 | { 0x12, KEY_POWER }, | 33 | { 0x12, KEY_POWER }, |
34 | 34 | ||
diff --git a/drivers/media/rc/keymaps/rc-behold.c b/drivers/media/rc/keymaps/rc-behold.c index 0ee1f149364c..c909a234c776 100644 --- a/drivers/media/rc/keymaps/rc-behold.c +++ b/drivers/media/rc/keymaps/rc-behold.c | |||
@@ -97,7 +97,7 @@ static struct rc_map_table behold[] = { | |||
97 | { 0x6b861a, KEY_STOP }, | 97 | { 0x6b861a, KEY_STOP }, |
98 | { 0x6b860e, KEY_TEXT }, | 98 | { 0x6b860e, KEY_TEXT }, |
99 | { 0x6b861f, KEY_RED }, /*XXX KEY_AUDIO */ | 99 | { 0x6b861f, KEY_RED }, /*XXX KEY_AUDIO */ |
100 | { 0x6b861e, KEY_YELLOW }, /*XXX KEY_SOURCE */ | 100 | { 0x6b861e, KEY_VIDEO }, |
101 | 101 | ||
102 | /* 0x1d 0x13 0x19 * | 102 | /* 0x1d 0x13 0x19 * |
103 | * SLEEP PREVIEW DVB * | 103 | * SLEEP PREVIEW DVB * |
diff --git a/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c index 43912bd02a9e..82c0200029af 100644 --- a/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c +++ b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | |||
@@ -32,7 +32,7 @@ static struct rc_map_table dntv_live_dvb_t[] = { | |||
32 | { 0x0c, KEY_SEARCH }, /* scan */ | 32 | { 0x0c, KEY_SEARCH }, /* scan */ |
33 | { 0x0d, KEY_STOP }, | 33 | { 0x0d, KEY_STOP }, |
34 | { 0x0e, KEY_PAUSE }, | 34 | { 0x0e, KEY_PAUSE }, |
35 | { 0x0f, KEY_LIST }, /* source */ | 35 | { 0x0f, KEY_VIDEO }, /* source */ |
36 | 36 | ||
37 | { 0x10, KEY_MUTE }, | 37 | { 0x10, KEY_MUTE }, |
38 | { 0x11, KEY_REWIND }, /* backward << */ | 38 | { 0x11, KEY_REWIND }, /* backward << */ |
diff --git a/drivers/media/rc/keymaps/rc-encore-enltv2.c b/drivers/media/rc/keymaps/rc-encore-enltv2.c index 7d5b00ed4ff2..b6264f1bc4c1 100644 --- a/drivers/media/rc/keymaps/rc-encore-enltv2.c +++ b/drivers/media/rc/keymaps/rc-encore-enltv2.c | |||
@@ -32,7 +32,7 @@ static struct rc_map_table encore_enltv2[] = { | |||
32 | { 0x64, KEY_LAST }, /* +100 */ | 32 | { 0x64, KEY_LAST }, /* +100 */ |
33 | { 0x4e, KEY_AGAIN }, /* Recall */ | 33 | { 0x4e, KEY_AGAIN }, /* Recall */ |
34 | 34 | ||
35 | { 0x6c, KEY_SWITCHVIDEOMODE }, /* Video Source */ | 35 | { 0x6c, KEY_VIDEO }, /* Video Source */ |
36 | { 0x5e, KEY_MENU }, | 36 | { 0x5e, KEY_MENU }, |
37 | { 0x56, KEY_SCREEN }, | 37 | { 0x56, KEY_SCREEN }, |
38 | { 0x7a, KEY_SETUP }, | 38 | { 0x7a, KEY_SETUP }, |
diff --git a/drivers/media/rc/keymaps/rc-flydvb.c b/drivers/media/rc/keymaps/rc-flydvb.c index aea2f4acf7d8..a8b0f66edaa9 100644 --- a/drivers/media/rc/keymaps/rc-flydvb.c +++ b/drivers/media/rc/keymaps/rc-flydvb.c | |||
@@ -37,8 +37,8 @@ static struct rc_map_table flydvb[] = { | |||
37 | { 0x13, KEY_CHANNELDOWN }, /* CH- */ | 37 | { 0x13, KEY_CHANNELDOWN }, /* CH- */ |
38 | { 0x1d, KEY_ENTER }, /* Enter */ | 38 | { 0x1d, KEY_ENTER }, /* Enter */ |
39 | 39 | ||
40 | { 0x1a, KEY_MODE }, /* PIP */ | 40 | { 0x1a, KEY_TV2 }, /* PIP */ |
41 | { 0x18, KEY_TUNER }, /* Source */ | 41 | { 0x18, KEY_VIDEO }, /* Source */ |
42 | 42 | ||
43 | { 0x1e, KEY_RECORD }, /* Record/Pause */ | 43 | { 0x1e, KEY_RECORD }, /* Record/Pause */ |
44 | { 0x15, KEY_ANGLE }, /* Swap (no label on key) */ | 44 | { 0x15, KEY_ANGLE }, /* Swap (no label on key) */ |
diff --git a/drivers/media/rc/keymaps/rc-hauppauge-new.c b/drivers/media/rc/keymaps/rc-hauppauge-new.c index b6a12feb0127..44f3283e15b5 100644 --- a/drivers/media/rc/keymaps/rc-hauppauge-new.c +++ b/drivers/media/rc/keymaps/rc-hauppauge-new.c | |||
@@ -42,7 +42,7 @@ static struct rc_map_table hauppauge_new[] = { | |||
42 | { 0x15, KEY_DOWN }, | 42 | { 0x15, KEY_DOWN }, |
43 | { 0x16, KEY_LEFT }, | 43 | { 0x16, KEY_LEFT }, |
44 | { 0x17, KEY_RIGHT }, | 44 | { 0x17, KEY_RIGHT }, |
45 | { 0x18, KEY_VIDEO }, /* Videos */ | 45 | { 0x18, KEY_VCR }, /* Videos */ |
46 | { 0x19, KEY_AUDIO }, /* Music */ | 46 | { 0x19, KEY_AUDIO }, /* Music */ |
47 | /* 0x1a: Pictures - presume this means | 47 | /* 0x1a: Pictures - presume this means |
48 | "Multimedia Home Platform" - | 48 | "Multimedia Home Platform" - |
@@ -56,7 +56,7 @@ static struct rc_map_table hauppauge_new[] = { | |||
56 | { 0x1f, KEY_EXIT }, /* back/exit */ | 56 | { 0x1f, KEY_EXIT }, /* back/exit */ |
57 | { 0x20, KEY_CHANNELUP }, /* channel / program + */ | 57 | { 0x20, KEY_CHANNELUP }, /* channel / program + */ |
58 | { 0x21, KEY_CHANNELDOWN }, /* channel / program - */ | 58 | { 0x21, KEY_CHANNELDOWN }, /* channel / program - */ |
59 | { 0x22, KEY_CHANNEL }, /* source (old black remote) */ | 59 | { 0x22, KEY_VIDEO }, /* source (old black remote) */ |
60 | { 0x24, KEY_PREVIOUSSONG }, /* replay |< */ | 60 | { 0x24, KEY_PREVIOUSSONG }, /* replay |< */ |
61 | { 0x25, KEY_ENTER }, /* OK */ | 61 | { 0x25, KEY_ENTER }, /* OK */ |
62 | { 0x26, KEY_SLEEP }, /* minimize (old black remote) */ | 62 | { 0x26, KEY_SLEEP }, /* minimize (old black remote) */ |
diff --git a/drivers/media/rc/keymaps/rc-kworld-315u.c b/drivers/media/rc/keymaps/rc-kworld-315u.c index 3ce6ef79fc34..7f33edb47244 100644 --- a/drivers/media/rc/keymaps/rc-kworld-315u.c +++ b/drivers/media/rc/keymaps/rc-kworld-315u.c | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | static struct rc_map_table kworld_315u[] = { | 18 | static struct rc_map_table kworld_315u[] = { |
19 | { 0x6143, KEY_POWER }, | 19 | { 0x6143, KEY_POWER }, |
20 | { 0x6101, KEY_TUNER }, /* source */ | 20 | { 0x6101, KEY_VIDEO }, /* source */ |
21 | { 0x610b, KEY_ZOOM }, | 21 | { 0x610b, KEY_ZOOM }, |
22 | { 0x6103, KEY_POWER2 }, /* shutdown */ | 22 | { 0x6103, KEY_POWER2 }, /* shutdown */ |
23 | 23 | ||
diff --git a/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c index fa8fd0ab94c7..8e9969d1239b 100644 --- a/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c +++ b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | |||
@@ -62,7 +62,7 @@ static struct rc_map_table msi_tvanywhere_plus[] = { | |||
62 | { 0x13, KEY_AGAIN }, /* Recall */ | 62 | { 0x13, KEY_AGAIN }, /* Recall */ |
63 | 63 | ||
64 | { 0x1e, KEY_POWER }, /* Power */ | 64 | { 0x1e, KEY_POWER }, /* Power */ |
65 | { 0x07, KEY_TUNER }, /* Source */ | 65 | { 0x07, KEY_VIDEO }, /* Source */ |
66 | { 0x1c, KEY_SEARCH }, /* Scan */ | 66 | { 0x1c, KEY_SEARCH }, /* Scan */ |
67 | { 0x18, KEY_MUTE }, /* Mute */ | 67 | { 0x18, KEY_MUTE }, /* Mute */ |
68 | 68 | ||
diff --git a/drivers/media/rc/keymaps/rc-norwood.c b/drivers/media/rc/keymaps/rc-norwood.c index 629ee9d84537..f1c1281fbc17 100644 --- a/drivers/media/rc/keymaps/rc-norwood.c +++ b/drivers/media/rc/keymaps/rc-norwood.c | |||
@@ -29,7 +29,7 @@ static struct rc_map_table norwood[] = { | |||
29 | { 0x28, KEY_8 }, | 29 | { 0x28, KEY_8 }, |
30 | { 0x29, KEY_9 }, | 30 | { 0x29, KEY_9 }, |
31 | 31 | ||
32 | { 0x78, KEY_TUNER }, /* Video Source */ | 32 | { 0x78, KEY_VIDEO }, /* Video Source */ |
33 | { 0x2c, KEY_EXIT }, /* Open/Close software */ | 33 | { 0x2c, KEY_EXIT }, /* Open/Close software */ |
34 | { 0x2a, KEY_SELECT }, /* 2 Digit Select */ | 34 | { 0x2a, KEY_SELECT }, /* 2 Digit Select */ |
35 | { 0x69, KEY_AGAIN }, /* Recall */ | 35 | { 0x69, KEY_AGAIN }, /* Recall */ |
diff --git a/drivers/media/rc/keymaps/rc-pctv-sedna.c b/drivers/media/rc/keymaps/rc-pctv-sedna.c index fa5ae5981eb8..7cdef6e6cc0f 100644 --- a/drivers/media/rc/keymaps/rc-pctv-sedna.c +++ b/drivers/media/rc/keymaps/rc-pctv-sedna.c | |||
@@ -36,7 +36,7 @@ static struct rc_map_table pctv_sedna[] = { | |||
36 | { 0x0e, KEY_STOP }, | 36 | { 0x0e, KEY_STOP }, |
37 | { 0x0f, KEY_PREVIOUSSONG }, | 37 | { 0x0f, KEY_PREVIOUSSONG }, |
38 | { 0x10, KEY_ZOOM }, | 38 | { 0x10, KEY_ZOOM }, |
39 | { 0x11, KEY_TUNER }, /* Source */ | 39 | { 0x11, KEY_VIDEO }, /* Source */ |
40 | { 0x12, KEY_POWER }, | 40 | { 0x12, KEY_POWER }, |
41 | { 0x13, KEY_MUTE }, | 41 | { 0x13, KEY_MUTE }, |
42 | { 0x15, KEY_CHANNELDOWN }, | 42 | { 0x15, KEY_CHANNELDOWN }, |
diff --git a/drivers/media/rc/keymaps/rc-pixelview-mk12.c b/drivers/media/rc/keymaps/rc-pixelview-mk12.c index 8d9f664e0a2d..125fc3949c15 100644 --- a/drivers/media/rc/keymaps/rc-pixelview-mk12.c +++ b/drivers/media/rc/keymaps/rc-pixelview-mk12.c | |||
@@ -34,7 +34,7 @@ static struct rc_map_table pixelview_mk12[] = { | |||
34 | { 0x866b13, KEY_AGAIN }, /* loop */ | 34 | { 0x866b13, KEY_AGAIN }, /* loop */ |
35 | { 0x866b10, KEY_DIGITS }, /* +100 */ | 35 | { 0x866b10, KEY_DIGITS }, /* +100 */ |
36 | 36 | ||
37 | { 0x866b00, KEY_MEDIA }, /* source */ | 37 | { 0x866b00, KEY_VIDEO }, /* source */ |
38 | { 0x866b18, KEY_MUTE }, /* mute */ | 38 | { 0x866b18, KEY_MUTE }, /* mute */ |
39 | { 0x866b19, KEY_CAMERA }, /* snapshot */ | 39 | { 0x866b19, KEY_CAMERA }, /* snapshot */ |
40 | { 0x866b1a, KEY_SEARCH }, /* scan */ | 40 | { 0x866b1a, KEY_SEARCH }, /* scan */ |
diff --git a/drivers/media/rc/keymaps/rc-pixelview-new.c b/drivers/media/rc/keymaps/rc-pixelview-new.c index 777a70076be2..bd78d6ac1e16 100644 --- a/drivers/media/rc/keymaps/rc-pixelview-new.c +++ b/drivers/media/rc/keymaps/rc-pixelview-new.c | |||
@@ -33,7 +33,7 @@ static struct rc_map_table pixelview_new[] = { | |||
33 | { 0x3e, KEY_0 }, | 33 | { 0x3e, KEY_0 }, |
34 | 34 | ||
35 | { 0x1c, KEY_AGAIN }, /* LOOP */ | 35 | { 0x1c, KEY_AGAIN }, /* LOOP */ |
36 | { 0x3f, KEY_MEDIA }, /* Source */ | 36 | { 0x3f, KEY_VIDEO }, /* Source */ |
37 | { 0x1f, KEY_LAST }, /* +100 */ | 37 | { 0x1f, KEY_LAST }, /* +100 */ |
38 | { 0x1b, KEY_MUTE }, | 38 | { 0x1b, KEY_MUTE }, |
39 | 39 | ||
diff --git a/drivers/media/rc/keymaps/rc-pixelview.c b/drivers/media/rc/keymaps/rc-pixelview.c index 0ec5988916b9..06187e7db446 100644 --- a/drivers/media/rc/keymaps/rc-pixelview.c +++ b/drivers/media/rc/keymaps/rc-pixelview.c | |||
@@ -15,7 +15,7 @@ | |||
15 | static struct rc_map_table pixelview[] = { | 15 | static struct rc_map_table pixelview[] = { |
16 | 16 | ||
17 | { 0x1e, KEY_POWER }, /* power */ | 17 | { 0x1e, KEY_POWER }, /* power */ |
18 | { 0x07, KEY_MEDIA }, /* source */ | 18 | { 0x07, KEY_VIDEO }, /* source */ |
19 | { 0x1c, KEY_SEARCH }, /* scan */ | 19 | { 0x1c, KEY_SEARCH }, /* scan */ |
20 | 20 | ||
21 | 21 | ||
diff --git a/drivers/media/rc/keymaps/rc-pv951.c b/drivers/media/rc/keymaps/rc-pv951.c index 83a418de12c6..5e8beee94de4 100644 --- a/drivers/media/rc/keymaps/rc-pv951.c +++ b/drivers/media/rc/keymaps/rc-pv951.c | |||
@@ -46,10 +46,10 @@ static struct rc_map_table pv951[] = { | |||
46 | { 0x0c, KEY_SEARCH }, /* AUTOSCAN */ | 46 | { 0x0c, KEY_SEARCH }, /* AUTOSCAN */ |
47 | 47 | ||
48 | /* Not sure what to do with these ones! */ | 48 | /* Not sure what to do with these ones! */ |
49 | { 0x0f, KEY_SELECT }, /* SOURCE */ | 49 | { 0x0f, KEY_VIDEO }, /* SOURCE */ |
50 | { 0x0a, KEY_KPPLUS }, /* +100 */ | 50 | { 0x0a, KEY_KPPLUS }, /* +100 */ |
51 | { 0x14, KEY_EQUAL }, /* SYNC */ | 51 | { 0x14, KEY_EQUAL }, /* SYNC */ |
52 | { 0x1c, KEY_MEDIA }, /* PC/TV */ | 52 | { 0x1c, KEY_TV }, /* PC/TV */ |
53 | }; | 53 | }; |
54 | 54 | ||
55 | static struct rc_map_list pv951_map = { | 55 | static struct rc_map_list pv951_map = { |
diff --git a/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c index 2ca825b4bef2..a581c861c25d 100644 --- a/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c +++ b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c | |||
@@ -45,7 +45,7 @@ static struct rc_map_table rc5_hauppauge_new[] = { | |||
45 | { 0x1e15, KEY_DOWN }, | 45 | { 0x1e15, KEY_DOWN }, |
46 | { 0x1e16, KEY_LEFT }, | 46 | { 0x1e16, KEY_LEFT }, |
47 | { 0x1e17, KEY_RIGHT }, | 47 | { 0x1e17, KEY_RIGHT }, |
48 | { 0x1e18, KEY_VIDEO }, /* Videos */ | 48 | { 0x1e18, KEY_VCR }, /* Videos */ |
49 | { 0x1e19, KEY_AUDIO }, /* Music */ | 49 | { 0x1e19, KEY_AUDIO }, /* Music */ |
50 | /* 0x1e1a: Pictures - presume this means | 50 | /* 0x1e1a: Pictures - presume this means |
51 | "Multimedia Home Platform" - | 51 | "Multimedia Home Platform" - |
@@ -59,7 +59,7 @@ static struct rc_map_table rc5_hauppauge_new[] = { | |||
59 | { 0x1e1f, KEY_EXIT }, /* back/exit */ | 59 | { 0x1e1f, KEY_EXIT }, /* back/exit */ |
60 | { 0x1e20, KEY_CHANNELUP }, /* channel / program + */ | 60 | { 0x1e20, KEY_CHANNELUP }, /* channel / program + */ |
61 | { 0x1e21, KEY_CHANNELDOWN }, /* channel / program - */ | 61 | { 0x1e21, KEY_CHANNELDOWN }, /* channel / program - */ |
62 | { 0x1e22, KEY_CHANNEL }, /* source (old black remote) */ | 62 | { 0x1e22, KEY_VIDEO }, /* source (old black remote) */ |
63 | { 0x1e24, KEY_PREVIOUSSONG }, /* replay |< */ | 63 | { 0x1e24, KEY_PREVIOUSSONG }, /* replay |< */ |
64 | { 0x1e25, KEY_ENTER }, /* OK */ | 64 | { 0x1e25, KEY_ENTER }, /* OK */ |
65 | { 0x1e26, KEY_SLEEP }, /* minimize (old black remote) */ | 65 | { 0x1e26, KEY_SLEEP }, /* minimize (old black remote) */ |
diff --git a/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c b/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c index 2d14598592d8..6813d1102118 100644 --- a/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c +++ b/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c | |||
@@ -35,7 +35,7 @@ static struct rc_map_table real_audio_220_32_keys[] = { | |||
35 | { 0x15, KEY_CHANNELDOWN}, | 35 | { 0x15, KEY_CHANNELDOWN}, |
36 | { 0x16, KEY_ENTER}, | 36 | { 0x16, KEY_ENTER}, |
37 | 37 | ||
38 | { 0x11, KEY_LIST}, /* Source */ | 38 | { 0x11, KEY_VIDEO}, /* Source */ |
39 | { 0x0d, KEY_AUDIO}, /* stereo */ | 39 | { 0x0d, KEY_AUDIO}, /* stereo */ |
40 | 40 | ||
41 | { 0x0f, KEY_PREVIOUS}, /* Prev */ | 41 | { 0x0f, KEY_PREVIOUS}, /* Prev */ |