[media] rc/keymaps: Fix most KEY_PROG[n] keycodes

Those KEY_PROG[n] keys were used on places where the developer
didn't know for sure what key should be used. On several cases,
using KEY_RED, KEY_GREEN, KEY_YELLOW would be enough. On others,
there are specific keys for that already.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>

diff --git a/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
index 136d3952dedc3bbf3d1173481bdd6150c2eae776..9a8752fdcca1f0b3f22398b04887206defc07ed6 100644 (file)
--- a/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
+++ b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
@@ -50,9 +50,9 @@ static struct rc_map_table adstech_dvb_t_pci[] = {
        { 0x13, KEY_TUNER },            /* Live */
        { 0x0a, KEY_A },
        { 0x12, KEY_B },
-       { 0x03, KEY_PROG1 },            /* 1 */
-       { 0x01, KEY_PROG2 },            /* 2 */
-       { 0x00, KEY_PROG3 },            /* 3 */
+       { 0x03, KEY_RED },              /* 1 */
+       { 0x01, KEY_GREEN },            /* 2 */
+       { 0x00, KEY_YELLOW },           /* 3 */
        { 0x06, KEY_DVD },
        { 0x48, KEY_AUX },              /* Photo */
        { 0x40, KEY_VIDEO },

diff --git a/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c b/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
index f4ca1fff455dceb34f73252fa8f25bfa685cf711..9d68af217d8b0d92f0fee0dd8a123f4fa930c9dd 100644 (file)
--- a/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
@@ -31,7 +31,7 @@ static struct rc_map_table avermedia_rm_ks[] = {
        { 0x0505, KEY_VOLUMEDOWN },
        { 0x0506, KEY_MUTE },
        { 0x0507, KEY_RIGHT },
-       { 0x0508, KEY_PROG1 },
+       { 0x0508, KEY_RED },
        { 0x0509, KEY_1 },
        { 0x050a, KEY_2 },
        { 0x050b, KEY_3 },

diff --git a/drivers/media/rc/keymaps/rc-cinergy.c b/drivers/media/rc/keymaps/rc-cinergy.c
index 99520ff65b6157768fc96b1137a25ab703c66168..cf3a6bfb190c33cc1a4c33a08855ec7fe4ebd68a 100644 (file)
--- a/drivers/media/rc/keymaps/rc-cinergy.c
+++ b/drivers/media/rc/keymaps/rc-cinergy.c
@@ -25,7 +25,7 @@ static struct rc_map_table cinergy[] = {
        { 0x09, KEY_9 },
 
        { 0x0a, KEY_POWER },
-       { 0x0b, KEY_PROG1 },            /* app */
+       { 0x0b, KEY_MEDIA },            /* app */
        { 0x0c, KEY_ZOOM },             /* zoom/fullscreen */
        { 0x0d, KEY_CHANNELUP },        /* channel */
        { 0x0e, KEY_CHANNELDOWN },      /* channel- */

diff --git a/drivers/media/rc/keymaps/rc-encore-enltv.c b/drivers/media/rc/keymaps/rc-encore-enltv.c
index 1a0e590b5d216cdeb60c0d603d9d755c7e49b16a..e56ac6e9670ad299a31f87b25cc8d9f3882d134b 100644 (file)
--- a/drivers/media/rc/keymaps/rc-encore-enltv.c
+++ b/drivers/media/rc/keymaps/rc-encore-enltv.c
@@ -77,7 +77,7 @@ static struct rc_map_table encore_enltv[] = {
        { 0x50, KEY_SLEEP },            /* shutdown */
        { 0x51, KEY_MODE },             /* stereo > main */
        { 0x52, KEY_SELECT },           /* stereo > sap */
-       { 0x53, KEY_PROG1 },            /* teletext */
+       { 0x53, KEY_TEXT },             /* teletext */
 
 
        { 0x59, KEY_RED },              /* AP1 */