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/dvb/dvb-usb | |
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/dvb/dvb-usb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dibusb-common.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/m920x.c | 16 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/nova-t-usb2.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c index 956f7ae2e510..4c2a689c820e 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/drivers/media/dvb/dvb-usb/dibusb-common.c | |||
@@ -408,7 +408,7 @@ struct rc_map_table rc_map_dibusb_table[] = { | |||
408 | 408 | ||
409 | { 0x8008, KEY_DVD }, | 409 | { 0x8008, KEY_DVD }, |
410 | { 0x8009, KEY_AUDIO }, | 410 | { 0x8009, KEY_AUDIO }, |
411 | { 0x800a, KEY_MEDIA }, /* Pictures */ | 411 | { 0x800a, KEY_IMAGES }, /* Pictures */ |
412 | { 0x800b, KEY_VIDEO }, | 412 | { 0x800b, KEY_VIDEO }, |
413 | 413 | ||
414 | { 0x800c, KEY_BACK }, | 414 | { 0x800c, KEY_BACK }, |
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c index da9dc91ce910..51bfd42387c2 100644 --- a/drivers/media/dvb/dvb-usb/m920x.c +++ b/drivers/media/dvb/dvb-usb/m920x.c | |||
@@ -632,9 +632,9 @@ static struct rc_map_table rc_map_pinnacle310e_table[] = { | |||
632 | { 0x16, KEY_POWER }, | 632 | { 0x16, KEY_POWER }, |
633 | { 0x17, KEY_FAVORITES }, | 633 | { 0x17, KEY_FAVORITES }, |
634 | { 0x0f, KEY_TEXT }, | 634 | { 0x0f, KEY_TEXT }, |
635 | { 0x48, KEY_MEDIA }, /* preview */ | 635 | { 0x48, KEY_PROGRAM }, /* preview */ |
636 | { 0x1c, KEY_EPG }, | 636 | { 0x1c, KEY_EPG }, |
637 | { 0x04, KEY_LIST }, /* record list */ | 637 | { 0x04, KEY_LIST }, /* record list */ |
638 | { 0x03, KEY_1 }, | 638 | { 0x03, KEY_1 }, |
639 | { 0x01, KEY_2 }, | 639 | { 0x01, KEY_2 }, |
640 | { 0x06, KEY_3 }, | 640 | { 0x06, KEY_3 }, |
@@ -674,14 +674,14 @@ static struct rc_map_table rc_map_pinnacle310e_table[] = { | |||
674 | { 0x0e, KEY_MUTE }, | 674 | { 0x0e, KEY_MUTE }, |
675 | /* { 0x49, KEY_LR }, */ /* L/R */ | 675 | /* { 0x49, KEY_LR }, */ /* L/R */ |
676 | { 0x07, KEY_SLEEP }, /* Hibernate */ | 676 | { 0x07, KEY_SLEEP }, /* Hibernate */ |
677 | { 0x08, KEY_MEDIA }, /* A/V */ | 677 | { 0x08, KEY_VIDEO }, /* A/V */ |
678 | { 0x0e, KEY_MENU }, /* Recall */ | 678 | { 0x0e, KEY_MENU }, /* Recall */ |
679 | { 0x45, KEY_ZOOMIN }, | 679 | { 0x45, KEY_ZOOMIN }, |
680 | { 0x46, KEY_ZOOMOUT }, | 680 | { 0x46, KEY_ZOOMOUT }, |
681 | { 0x18, KEY_TV }, /* Red */ | 681 | { 0x18, KEY_RED }, /* Red */ |
682 | { 0x53, KEY_VCR }, /* Green */ | 682 | { 0x53, KEY_GREEN }, /* Green */ |
683 | { 0x5e, KEY_SAT }, /* Yellow */ | 683 | { 0x5e, KEY_YELLOW }, /* Yellow */ |
684 | { 0x5f, KEY_PLAYER }, /* Blue */ | 684 | { 0x5f, KEY_BLUE }, /* Blue */ |
685 | }; | 685 | }; |
686 | 686 | ||
687 | /* DVB USB Driver stuff */ | 687 | /* DVB USB Driver stuff */ |
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c index 9d3cd2de46fc..bc350e982b72 100644 --- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c +++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c | |||
@@ -47,7 +47,7 @@ static struct rc_map_table rc_map_haupp_table[] = { | |||
47 | { 0x1e17, KEY_RIGHT }, | 47 | { 0x1e17, KEY_RIGHT }, |
48 | { 0x1e18, KEY_VIDEO }, | 48 | { 0x1e18, KEY_VIDEO }, |
49 | { 0x1e19, KEY_AUDIO }, | 49 | { 0x1e19, KEY_AUDIO }, |
50 | { 0x1e1a, KEY_MEDIA }, | 50 | { 0x1e1a, KEY_IMAGES }, |
51 | { 0x1e1b, KEY_EPG }, | 51 | { 0x1e1b, KEY_EPG }, |
52 | { 0x1e1c, KEY_TV }, | 52 | { 0x1e1c, KEY_TV }, |
53 | { 0x1e1e, KEY_NEXT }, | 53 | { 0x1e1e, KEY_NEXT }, |