summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/keymaps
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2011-07-13 17:57:42 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 17:55:56 -0300
commit9b67693ccf23eb9cc57dd364f515057860a1f339 (patch)
tree4e97e1be8b5086917d9e15881e1ba85edb420195 /drivers/media/rc/keymaps
parentef60e8f5d58752879cc69d9746133f2416ac206a (diff)
downloadop-kernel-dev-9b67693ccf23eb9cc57dd364f515057860a1f339.zip
op-kernel-dev-9b67693ccf23eb9cc57dd364f515057860a1f339.tar.gz
[media] rc-rc6-mce: minor keymap updates
Microsoft's Windows Media Center specification and requirements doc from 2011.03.18 now refers to the former Power Toggle button as the Sleep Toggle, and recommends using a new moon sleep icon for it. Its the same key, but its apparently always been meant to put the system to sleep, not power it off. Adjust accordingly. While we're here, lets also remove the duplicate KEY_PLAYPAUSE entry. 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-rc6-mce.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/rc/keymaps/rc-rc6-mce.c b/drivers/media/rc/keymaps/rc-rc6-mce.c
index 01b69bc..c3907e2 100644
--- a/drivers/media/rc/keymaps/rc-rc6-mce.c
+++ b/drivers/media/rc/keymaps/rc-rc6-mce.c
@@ -29,7 +29,7 @@ static struct rc_map_table rc6_mce[] = {
{ 0x800f040a, KEY_DELETE },
{ 0x800f040b, KEY_ENTER },
- { 0x800f040c, KEY_POWER }, /* PC Power */
+ { 0x800f040c, KEY_SLEEP }, /* Formerly PC Power */
{ 0x800f040d, KEY_MEDIA }, /* Windows MCE button */
{ 0x800f040e, KEY_MUTE },
{ 0x800f040f, KEY_INFO },
@@ -44,7 +44,6 @@ static struct rc_map_table rc6_mce[] = {
{ 0x800f0416, KEY_PLAY },
{ 0x800f0417, KEY_RECORD },
{ 0x800f0418, KEY_PAUSE },
- { 0x800f046e, KEY_PLAYPAUSE },
{ 0x800f0419, KEY_STOP },
{ 0x800f041a, KEY_NEXT },
{ 0x800f041b, KEY_PREVIOUS },
OpenPOWER on IntegriCloud