diff options
author | Jarod Wilson <jarod@redhat.com> | 2011-04-05 17:42:30 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 08:27:32 -0400 |
commit | 56c0893c4f66a5d249b8981101755bec5890500d (patch) | |
tree | a9b62ce8d48a36bae9ecf6d308f1c7ecc2a0231a /drivers/media/rc/keymaps | |
parent | d8ee99e79994f916bc5b81990f861ea923e7f332 (diff) |
[media] rc: further key name standardization
Use the newly introduced KEY_IMAGES where appropriate, and standardize
on KEY_MEDIA for media center/application launcher button (such as the
Windows logo key on the Windows Media Center Ed. remotes).
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc/keymaps')
-rw-r--r-- | drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-imon-mce.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-imon-pad.c | 6 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-rc6-mce.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/rc/keymaps/rc-avermedia-cardbus.c b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c index bdf97b74cf9..22f54d413a3 100644 --- a/drivers/media/rc/keymaps/rc-avermedia-cardbus.c +++ b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c | |||
@@ -52,7 +52,7 @@ static struct rc_map_table avermedia_cardbus[] = { | |||
52 | { 0x28, KEY_SELECT }, /* Select */ | 52 | { 0x28, KEY_SELECT }, /* Select */ |
53 | { 0x29, KEY_BLUE }, /* Blue/Picture */ | 53 | { 0x29, KEY_BLUE }, /* Blue/Picture */ |
54 | { 0x2a, KEY_BACKSPACE }, /* Back */ | 54 | { 0x2a, KEY_BACKSPACE }, /* Back */ |
55 | { 0x2b, KEY_MEDIA }, /* PIP (Picture-in-picture) */ | 55 | { 0x2b, KEY_VIDEO }, /* PIP (Picture-in-picture) */ |
56 | { 0x2c, KEY_DOWN }, | 56 | { 0x2c, KEY_DOWN }, |
57 | { 0x2e, KEY_DOT }, | 57 | { 0x2e, KEY_DOT }, |
58 | { 0x2f, KEY_TV }, /* Live TV */ | 58 | { 0x2f, KEY_TV }, /* Live TV */ |
diff --git a/drivers/media/rc/keymaps/rc-imon-mce.c b/drivers/media/rc/keymaps/rc-imon-mce.c index 937a81989f0..0ea2aa190d8 100644 --- a/drivers/media/rc/keymaps/rc-imon-mce.c +++ b/drivers/media/rc/keymaps/rc-imon-mce.c | |||
@@ -111,7 +111,7 @@ static struct rc_map_table imon_mce[] = { | |||
111 | { 0x800ff44d, KEY_TITLE }, | 111 | { 0x800ff44d, KEY_TITLE }, |
112 | 112 | ||
113 | { 0x800ff40c, KEY_POWER }, | 113 | { 0x800ff40c, KEY_POWER }, |
114 | { 0x800ff40d, KEY_LEFTMETA }, /* Windows MCE button */ | 114 | { 0x800ff40d, KEY_MEDIA }, /* Windows MCE button */ |
115 | 115 | ||
116 | }; | 116 | }; |
117 | 117 | ||
diff --git a/drivers/media/rc/keymaps/rc-imon-pad.c b/drivers/media/rc/keymaps/rc-imon-pad.c index 63d42bd24c9..75d3843fdc3 100644 --- a/drivers/media/rc/keymaps/rc-imon-pad.c +++ b/drivers/media/rc/keymaps/rc-imon-pad.c | |||
@@ -87,7 +87,7 @@ static struct rc_map_table imon_pad[] = { | |||
87 | 87 | ||
88 | { 0x2b8515b7, KEY_VIDEO }, | 88 | { 0x2b8515b7, KEY_VIDEO }, |
89 | { 0x299195b7, KEY_AUDIO }, | 89 | { 0x299195b7, KEY_AUDIO }, |
90 | { 0x2ba115b7, KEY_CAMERA }, | 90 | { 0x2ba115b7, KEY_IMAGES }, |
91 | { 0x28a515b7, KEY_TV }, | 91 | { 0x28a515b7, KEY_TV }, |
92 | { 0x29a395b7, KEY_DVD }, | 92 | { 0x29a395b7, KEY_DVD }, |
93 | { 0x29a295b7, KEY_DVD }, | 93 | { 0x29a295b7, KEY_DVD }, |
@@ -97,7 +97,7 @@ static struct rc_map_table imon_pad[] = { | |||
97 | { 0x2ba395b7, KEY_MENU }, | 97 | { 0x2ba395b7, KEY_MENU }, |
98 | 98 | ||
99 | { 0x288515b7, KEY_BOOKMARKS }, | 99 | { 0x288515b7, KEY_BOOKMARKS }, |
100 | { 0x2ab715b7, KEY_MEDIA }, /* Thumbnail */ | 100 | { 0x2ab715b7, KEY_CAMERA }, /* Thumbnail */ |
101 | { 0x298595b7, KEY_SUBTITLE }, | 101 | { 0x298595b7, KEY_SUBTITLE }, |
102 | { 0x2b8595b7, KEY_LANGUAGE }, | 102 | { 0x2b8595b7, KEY_LANGUAGE }, |
103 | 103 | ||
@@ -125,7 +125,7 @@ static struct rc_map_table imon_pad[] = { | |||
125 | { 0x2b8195b7, KEY_CONTEXT_MENU }, /* Left Menu*/ | 125 | { 0x2b8195b7, KEY_CONTEXT_MENU }, /* Left Menu*/ |
126 | { 0x02000065, KEY_COMPOSE }, /* RightMenu */ | 126 | { 0x02000065, KEY_COMPOSE }, /* RightMenu */ |
127 | { 0x28b715b7, KEY_COMPOSE }, /* RightMenu */ | 127 | { 0x28b715b7, KEY_COMPOSE }, /* RightMenu */ |
128 | { 0x2ab195b7, KEY_LEFTMETA }, /* Go or MultiMon */ | 128 | { 0x2ab195b7, KEY_MEDIA }, /* Go or MultiMon */ |
129 | { 0x29b715b7, KEY_DASHBOARD }, /* AppLauncher */ | 129 | { 0x29b715b7, KEY_DASHBOARD }, /* AppLauncher */ |
130 | }; | 130 | }; |
131 | 131 | ||
diff --git a/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c b/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c index 08d183120e4..7fa17a369f2 100644 --- a/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c +++ b/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c | |||
@@ -17,7 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | static struct rc_map_table kworld_plus_tv_analog[] = { | 19 | static struct rc_map_table kworld_plus_tv_analog[] = { |
20 | { 0x0c, KEY_LEFTMETA }, /* Kworld key */ | 20 | { 0x0c, KEY_MEDIA }, /* Kworld key */ |
21 | { 0x16, KEY_CLOSECD }, /* -> ) */ | 21 | { 0x16, KEY_CLOSECD }, /* -> ) */ |
22 | { 0x1d, KEY_POWER2 }, | 22 | { 0x1d, KEY_POWER2 }, |
23 | 23 | ||
diff --git a/drivers/media/rc/keymaps/rc-rc6-mce.c b/drivers/media/rc/keymaps/rc-rc6-mce.c index 8dd519ecc58..01b69bcc866 100644 --- a/drivers/media/rc/keymaps/rc-rc6-mce.c +++ b/drivers/media/rc/keymaps/rc-rc6-mce.c | |||
@@ -30,7 +30,7 @@ static struct rc_map_table rc6_mce[] = { | |||
30 | { 0x800f040a, KEY_DELETE }, | 30 | { 0x800f040a, KEY_DELETE }, |
31 | { 0x800f040b, KEY_ENTER }, | 31 | { 0x800f040b, KEY_ENTER }, |
32 | { 0x800f040c, KEY_POWER }, /* PC Power */ | 32 | { 0x800f040c, KEY_POWER }, /* PC Power */ |
33 | { 0x800f040d, KEY_LEFTMETA }, /* Windows MCE button */ | 33 | { 0x800f040d, KEY_MEDIA }, /* Windows MCE button */ |
34 | { 0x800f040e, KEY_MUTE }, | 34 | { 0x800f040e, KEY_MUTE }, |
35 | { 0x800f040f, KEY_INFO }, | 35 | { 0x800f040f, KEY_INFO }, |
36 | 36 | ||
@@ -87,7 +87,7 @@ static struct rc_map_table rc6_mce[] = { | |||
87 | 87 | ||
88 | { 0x800f0465, KEY_POWER2 }, /* TV Power */ | 88 | { 0x800f0465, KEY_POWER2 }, /* TV Power */ |
89 | { 0x800f046e, KEY_PLAYPAUSE }, | 89 | { 0x800f046e, KEY_PLAYPAUSE }, |
90 | { 0x800f046f, KEY_MEDIA }, /* Start media application (NEW) */ | 90 | { 0x800f046f, KEY_PLAYER }, /* Start media application (NEW) */ |
91 | 91 | ||
92 | { 0x800f0480, KEY_BRIGHTNESSDOWN }, | 92 | { 0x800f0480, KEY_BRIGHTNESSDOWN }, |
93 | { 0x800f0481, KEY_PLAYPAUSE }, | 93 | { 0x800f0481, KEY_PLAYPAUSE }, |