rc_keymaps: Sync with 2.6.39-rc1 + media patches

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

diff --git a/utils/keytable/parse.h b/utils/keytable/parse.h
index ff6df12..b7ceb97 100644 (file)
--- a/utils/keytable/parse.h
+++ b/utils/keytable/parse.h
@@ -454,6 +454,12 @@ struct parse_key {
        {"KEY_TOUCHPAD_TOGGLE", 0x212},
        {"KEY_TOUCHPAD_ON", 0x213},
        {"KEY_TOUCHPAD_OFF", 0x214},
+       {"KEY_CAMERA_ZOOMIN", 0x215},
+       {"KEY_CAMERA_ZOOMOUT", 0x216},
+       {"KEY_CAMERA_UP", 0x217},
+       {"KEY_CAMERA_DOWN", 0x218},
+       {"KEY_CAMERA_LEFT", 0x219},
+       {"KEY_CAMERA_RIGHT", 0x21a},
        {"BTN_TRIGGER_HAPPY", 0x2c0},
        {"BTN_TRIGGER_HAPPY1", 0x2c0},
        {"BTN_TRIGGER_HAPPY2", 0x2c1},

diff --git a/utils/keytable/rc_keymaps/lme2510 b/utils/keytable/rc_keymaps/lme2510
index cc26026..c54d5ac 100644 (file)
--- a/utils/keytable/rc_keymaps/lme2510
+++ b/utils/keytable/rc_keymaps/lme2510
@@ -1,27 +1,67 @@
 # table lme2510, type: UNKNOWN
-0xba45 KEY_0
-0xa05f KEY_1
-0xaf50 KEY_2
-0xa25d KEY_3
-0xbe41 KEY_4
-0xf50a KEY_5
-0xbd42 KEY_6
-0xb847 KEY_7
-0xb649 KEY_8
-0xfa05 KEY_9
-0xbc43 KEY_POWER
-0xb946 KEY_SUBTITLE
-0xf906 KEY_PAUSE
-0xfc03 KEY_MEDIA_REPEAT
-0xfd02 KEY_PAUSE
-0xa15e KEY_VOLUMEUP
-0xa35c KEY_VOLUMEDOWN
-0xf609 KEY_CHANNELUP
-0xe51a KEY_CHANNELDOWN
-0xe11e KEY_PLAY
-0xe41b KEY_ZOOM
-0xa659 KEY_MUTE
-0xa55a KEY_TV
-0xe718 KEY_RECORD
-0xf807 KEY_EPG
-0xfe01 KEY_STOP
+0xef12ba45 KEY_0
+0xef12a05f KEY_1
+0xef12af50 KEY_2
+0xef12a25d KEY_3
+0xef12be41 KEY_4
+0xef12f50a KEY_5
+0xef12bd42 KEY_6
+0xef12b847 KEY_7
+0xef12b649 KEY_8
+0xef12fa05 KEY_9
+0xef12bc43 KEY_POWER
+0xef12b946 KEY_SUBTITLE
+0xef12f906 KEY_PAUSE
+0xef12fc03 KEY_MEDIA_REPEAT
+0xef12fd02 KEY_PAUSE
+0xef12a15e KEY_VOLUMEUP
+0xef12a35c KEY_VOLUMEDOWN
+0xef12f609 KEY_CHANNELUP
+0xef12e51a KEY_CHANNELDOWN
+0xef12e11e KEY_PLAY
+0xef12e41b KEY_ZOOM
+0xef12a659 KEY_MUTE
+0xef12a55a KEY_TV
+0xef12e718 KEY_RECORD
+0xef12f807 KEY_EPG
+0xef12fe01 KEY_STOP
+0xff40ea15 KEY_0
+0xff40f708 KEY_1
+0xff40f609 KEY_2
+0xff40f50a KEY_3
+0xff40f30c KEY_4
+0xff40f20d KEY_5
+0xff40f10e KEY_6
+0xff40ef10 KEY_7
+0xff40ee11 KEY_8
+0xff40ed12 KEY_9
+0xff40ff00 KEY_POWER
+0xff40fb04 KEY_MEDIA_REPEAT
+0xff40e51a KEY_PAUSE
+0xff40fd02 KEY_VOLUMEUP
+0xff40f906 KEY_VOLUMEDOWN
+0xff40fe01 KEY_CHANNELUP
+0xff40fa05 KEY_CHANNELDOWN
+0xff40eb14 KEY_ZOOM
+0xff40e718 KEY_RECORD
+0xff40e916 KEY_STOP
+0xff00e31c KEY_0
+0xff00f807 KEY_1
+0xff00ea15 KEY_2
+0xff00f609 KEY_3
+0xff00e916 KEY_4
+0xff00e619 KEY_5
+0xff00f20d KEY_6
+0xff00f30c KEY_7
+0xff00e718 KEY_8
+0xff00a15e KEY_9
+0xff00ba45 KEY_POWER
+0xff00bb44 KEY_MEDIA_REPEAT
+0xff00b54a KEY_PAUSE
+0xff00b847 KEY_VOLUMEUP
+0xff00bc43 KEY_VOLUMEDOWN
+0xff00b946 KEY_CHANNELUP
+0xff00bf40 KEY_CHANNELDOWN
+0xff00f708 KEY_ZOOM
+0xff00bd42 KEY_RECORD
+0xff00a55a KEY_STOP

diff --git a/utils/keytable/rc_keymaps/rc6_mce b/utils/keytable/rc_keymaps/rc6_mce
index ec811dc..3451798 100644 (file)
--- a/utils/keytable/rc_keymaps/rc6_mce
+++ b/utils/keytable/rc_keymaps/rc6_mce
@@ -40,6 +40,9 @@
 0x800f0425 KEY_TUNER
 0x800f0426 KEY_EPG
 0x800f0427 KEY_ZOOM
+0x800f0432 KEY_MODE
+0x800f0433 KEY_PRESENTATION
+0x800f0434 KEY_EJECTCD
 0x800f043a KEY_BRIGHTNESSUP
 0x800f0446 KEY_TV
 0x800f0447 KEY_AUDIO

diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg
index 6043349..6ac6fb0 100644 (file)
--- a/utils/keytable/rc_maps.cfg
+++ b/utils/keytable/rc_maps.cfg
@@ -91,6 +91,7 @@
 *      rc-pinnacle-grey         pinnacle_grey
 *      rc-pctv-sedna            pctv_sedna
 *      rc-ati-tv-wonder-hd-600  ati_tv_wonder_hd_600
+*      rc-terratec-slim-2       terratec_slim_2
 *      rc-videomate-m1f         videomate_m1f
 *      rc-cinergy-1400          cinergy_1400
 *      rc-adstech-dvb-t-pci     adstech_dvb_t_pci
@@ -110,7 +111,7 @@
 *      rc-evga-indtube          evga_indtube
 *      rc-avermedia-dvbt        avermedia_dvbt
 *      rc-avermedia-rm-ks       avermedia_rm_ks
-*      rc-rc5-hauppauge         hauppauge
+*      rc-hauppauge             hauppauge
 *      rc-winfast               winfast
 *      rc-avermedia-m135a       avermedia_m135a
 *      rc-npgtech               npgtech
@@ -128,6 +129,7 @@
 # *    *                        dw210x               # found in dw2102.c
 # *    *                        tevii                # found in dw2102.c
 # *    *                        tbs                  # found in dw2102.c
+# *    *                        su3000               # found in dw2102.c
 # *    *                        megasky              # found in m920x.c
 # *    *                        tvwalkertwin         # found in m920x.c
 # *    *                        pinnacle310e         # found in m920x.c