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

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

authored by

Jarod Wilson and committed by
Mauro Carvalho Chehab
56c0893c d8ee99e7

+18 -18
+1 -1
drivers/media/dvb/dvb-usb/dibusb-common.c
··· 408 408 409 409 { 0x8008, KEY_DVD }, 410 410 { 0x8009, KEY_AUDIO }, 411 - { 0x800a, KEY_MEDIA }, /* Pictures */ 411 + { 0x800a, KEY_IMAGES }, /* Pictures */ 412 412 { 0x800b, KEY_VIDEO }, 413 413 414 414 { 0x800c, KEY_BACK },
+8 -8
drivers/media/dvb/dvb-usb/m920x.c
··· 632 632 { 0x16, KEY_POWER }, 633 633 { 0x17, KEY_FAVORITES }, 634 634 { 0x0f, KEY_TEXT }, 635 - { 0x48, KEY_MEDIA }, /* preview */ 635 + { 0x48, KEY_PROGRAM }, /* preview */ 636 636 { 0x1c, KEY_EPG }, 637 - { 0x04, KEY_LIST }, /* record list */ 637 + { 0x04, KEY_LIST }, /* record list */ 638 638 { 0x03, KEY_1 }, 639 639 { 0x01, KEY_2 }, 640 640 { 0x06, KEY_3 }, ··· 674 674 { 0x0e, KEY_MUTE }, 675 675 /* { 0x49, KEY_LR }, */ /* L/R */ 676 676 { 0x07, KEY_SLEEP }, /* Hibernate */ 677 - { 0x08, KEY_MEDIA }, /* A/V */ 678 - { 0x0e, KEY_MENU }, /* Recall */ 677 + { 0x08, KEY_VIDEO }, /* A/V */ 678 + { 0x0e, KEY_MENU }, /* Recall */ 679 679 { 0x45, KEY_ZOOMIN }, 680 680 { 0x46, KEY_ZOOMOUT }, 681 - { 0x18, KEY_TV }, /* Red */ 682 - { 0x53, KEY_VCR }, /* Green */ 683 - { 0x5e, KEY_SAT }, /* Yellow */ 684 - { 0x5f, KEY_PLAYER }, /* Blue */ 681 + { 0x18, KEY_RED }, /* Red */ 682 + { 0x53, KEY_GREEN }, /* Green */ 683 + { 0x5e, KEY_YELLOW }, /* Yellow */ 684 + { 0x5f, KEY_BLUE }, /* Blue */ 685 685 }; 686 686 687 687 /* DVB USB Driver stuff */
+1 -1
drivers/media/dvb/dvb-usb/nova-t-usb2.c
··· 47 47 { 0x1e17, KEY_RIGHT }, 48 48 { 0x1e18, KEY_VIDEO }, 49 49 { 0x1e19, KEY_AUDIO }, 50 - { 0x1e1a, KEY_MEDIA }, 50 + { 0x1e1a, KEY_IMAGES }, 51 51 { 0x1e1b, KEY_EPG }, 52 52 { 0x1e1c, KEY_TV }, 53 53 { 0x1e1e, KEY_NEXT },
+1 -1
drivers/media/rc/keymaps/rc-avermedia-cardbus.c
··· 52 52 { 0x28, KEY_SELECT }, /* Select */ 53 53 { 0x29, KEY_BLUE }, /* Blue/Picture */ 54 54 { 0x2a, KEY_BACKSPACE }, /* Back */ 55 - { 0x2b, KEY_MEDIA }, /* PIP (Picture-in-picture) */ 55 + { 0x2b, KEY_VIDEO }, /* PIP (Picture-in-picture) */ 56 56 { 0x2c, KEY_DOWN }, 57 57 { 0x2e, KEY_DOT }, 58 58 { 0x2f, KEY_TV }, /* Live TV */
+1 -1
drivers/media/rc/keymaps/rc-imon-mce.c
··· 111 111 { 0x800ff44d, KEY_TITLE }, 112 112 113 113 { 0x800ff40c, KEY_POWER }, 114 - { 0x800ff40d, KEY_LEFTMETA }, /* Windows MCE button */ 114 + { 0x800ff40d, KEY_MEDIA }, /* Windows MCE button */ 115 115 116 116 }; 117 117
+3 -3
drivers/media/rc/keymaps/rc-imon-pad.c
··· 87 87 88 88 { 0x2b8515b7, KEY_VIDEO }, 89 89 { 0x299195b7, KEY_AUDIO }, 90 - { 0x2ba115b7, KEY_CAMERA }, 90 + { 0x2ba115b7, KEY_IMAGES }, 91 91 { 0x28a515b7, KEY_TV }, 92 92 { 0x29a395b7, KEY_DVD }, 93 93 { 0x29a295b7, KEY_DVD }, ··· 97 97 { 0x2ba395b7, KEY_MENU }, 98 98 99 99 { 0x288515b7, KEY_BOOKMARKS }, 100 - { 0x2ab715b7, KEY_MEDIA }, /* Thumbnail */ 100 + { 0x2ab715b7, KEY_CAMERA }, /* Thumbnail */ 101 101 { 0x298595b7, KEY_SUBTITLE }, 102 102 { 0x2b8595b7, KEY_LANGUAGE }, 103 103 ··· 125 125 { 0x2b8195b7, KEY_CONTEXT_MENU }, /* Left Menu*/ 126 126 { 0x02000065, KEY_COMPOSE }, /* RightMenu */ 127 127 { 0x28b715b7, KEY_COMPOSE }, /* RightMenu */ 128 - { 0x2ab195b7, KEY_LEFTMETA }, /* Go or MultiMon */ 128 + { 0x2ab195b7, KEY_MEDIA }, /* Go or MultiMon */ 129 129 { 0x29b715b7, KEY_DASHBOARD }, /* AppLauncher */ 130 130 }; 131 131
+1 -1
drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
··· 17 17 */ 18 18 19 19 static struct rc_map_table kworld_plus_tv_analog[] = { 20 - { 0x0c, KEY_LEFTMETA }, /* Kworld key */ 20 + { 0x0c, KEY_MEDIA }, /* Kworld key */ 21 21 { 0x16, KEY_CLOSECD }, /* -> ) */ 22 22 { 0x1d, KEY_POWER2 }, 23 23
+2 -2
drivers/media/rc/keymaps/rc-rc6-mce.c
··· 30 30 { 0x800f040a, KEY_DELETE }, 31 31 { 0x800f040b, KEY_ENTER }, 32 32 { 0x800f040c, KEY_POWER }, /* PC Power */ 33 - { 0x800f040d, KEY_LEFTMETA }, /* Windows MCE button */ 33 + { 0x800f040d, KEY_MEDIA }, /* Windows MCE button */ 34 34 { 0x800f040e, KEY_MUTE }, 35 35 { 0x800f040f, KEY_INFO }, 36 36 ··· 87 87 88 88 { 0x800f0465, KEY_POWER2 }, /* TV Power */ 89 89 { 0x800f046e, KEY_PLAYPAUSE }, 90 - { 0x800f046f, KEY_MEDIA }, /* Start media application (NEW) */ 90 + { 0x800f046f, KEY_PLAYER }, /* Start media application (NEW) */ 91 91 92 92 { 0x800f0480, KEY_BRIGHTNESSDOWN }, 93 93 { 0x800f0481, KEY_PLAYPAUSE },