This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/v4l-utils.git tree:

Subject: Sync keytables with the latest patches for IR
Author:  Mauro Carvalho Chehab <[email protected]>
Date:    Mon Jan 24 13:46:03 2011 -0200

Those changes fix several issues found when double checking
several keytables.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 utils/keytable/rc_keymaps/a800                   |    8 +-
 utils/keytable/rc_keymaps/adstech_dvb_t_pci      |    6 +-
 utils/keytable/rc_keymaps/avermedia_dvbt         |    4 +-
 utils/keytable/rc_keymaps/avermedia_m135a        |    2 +-
 utils/keytable/rc_keymaps/avermedia_m733a_rm_k6  |    2 +-
 utils/keytable/rc_keymaps/avermedia_rm_ks        |    2 +-
 utils/keytable/rc_keymaps/behold                 |    2 +-
 utils/keytable/rc_keymaps/behold_columbus        |    2 +-
 utils/keytable/rc_keymaps/cinergy                |    2 +-
 utils/keytable/rc_keymaps/digitv                 |    2 +-
 utils/keytable/rc_keymaps/dntv_live_dvb_t        |    2 +-
 utils/keytable/rc_keymaps/dw210x                 |   36 +++++-----
 utils/keytable/rc_keymaps/encore_enltv           |    4 +-
 utils/keytable/rc_keymaps/encore_enltv2          |    2 +-
 utils/keytable/rc_keymaps/flydvb                 |    4 +-
 utils/keytable/rc_keymaps/hauppauge_new          |   49 -------------
 utils/keytable/rc_keymaps/imon_mce               |    2 +-
 utils/keytable/rc_keymaps/kworld_315u            |    2 +-
 utils/keytable/rc_keymaps/kworld_plus_tv_analog  |    2 +-
 utils/keytable/rc_keymaps/msi_tvanywhere_plus    |    2 +-
 utils/keytable/rc_keymaps/nebula                 |    2 +-
 utils/keytable/rc_keymaps/norwood                |    2 +-
 utils/keytable/rc_keymaps/opera1                 |   30 ++++----
 utils/keytable/rc_keymaps/pctv_sedna             |    2 +-
 utils/keytable/rc_keymaps/pixelview              |    2 +-
 utils/keytable/rc_keymaps/pixelview_mk12         |    2 +-
 utils/keytable/rc_keymaps/pixelview_new          |    2 +-
 utils/keytable/rc_keymaps/pv951                  |    4 +-
 utils/keytable/rc_keymaps/rc5_hauppauge_new      |   85 ----------------------
 utils/keytable/rc_keymaps/rc5_tv                 |   34 ---------
 utils/keytable/rc_keymaps/rc6_mce                |    2 +-
 utils/keytable/rc_keymaps/real_audio_220_32_keys |    2 +-
 utils/keytable/rc_keymaps/winfast                |   22 +++---
 utils/keytable/rc_maps.cfg                       |    4 +-
 34 files changed, 81 insertions(+), 251 deletions(-)

---

http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=72690c1bbef32943f21b7b73bd5e3ebb6589832e

diff --git a/utils/keytable/rc_keymaps/a800 b/utils/keytable/rc_keymaps/a800
index a4a20ba..f65197d 100644
--- a/utils/keytable/rc_keymaps/a800
+++ b/utils/keytable/rc_keymaps/a800
@@ -1,6 +1,6 @@
 # table a800, type: UNKNOWN
-0x0201 KEY_PROG1
-0x0200 KEY_POWER
+0x0201 KEY_MODE
+0x0200 KEY_POWER2
 0x0205 KEY_1
 0x0206 KEY_2
 0x0207 KEY_3
@@ -13,8 +13,8 @@
 0x0212 KEY_LEFT
 0x0211 KEY_0
 0x0213 KEY_RIGHT
-0x0217 KEY_PROG2
-0x0210 KEY_PROG3
+0x0217 KEY_CAMERA
+0x0210 KEY_LAST
 0x021e KEY_VOLUMEDOWN
 0x020c KEY_ZOOM
 0x021f KEY_VOLUMEUP
diff --git a/utils/keytable/rc_keymaps/adstech_dvb_t_pci 
b/utils/keytable/rc_keymaps/adstech_dvb_t_pci
index 3c988f4..df317cd 100644
--- a/utils/keytable/rc_keymaps/adstech_dvb_t_pci
+++ b/utils/keytable/rc_keymaps/adstech_dvb_t_pci
@@ -32,9 +32,9 @@
 0x13 KEY_TUNER
 0x0a KEY_A
 0x12 KEY_B
-0x03 KEY_PROG1
-0x01 KEY_PROG2
-0x00 KEY_PROG3
+0x03 KEY_RED
+0x01 KEY_GREEN
+0x00 KEY_YELLOW
 0x06 KEY_DVD
 0x48 KEY_AUX
 0x40 KEY_VIDEO
diff --git a/utils/keytable/rc_keymaps/avermedia_dvbt 
b/utils/keytable/rc_keymaps/avermedia_dvbt
index 4fbadc4..f939f39 100644
--- a/utils/keytable/rc_keymaps/avermedia_dvbt
+++ b/utils/keytable/rc_keymaps/avermedia_dvbt
@@ -9,12 +9,12 @@
 0x26 KEY_7
 0x16 KEY_8
 0x36 KEY_9
-0x20 KEY_LIST
+0x20 KEY_VIDEO
 0x10 KEY_TEXT
 0x00 KEY_POWER
 0x04 KEY_AUDIO
 0x06 KEY_ZOOM
-0x18 KEY_VIDEO
+0x18 KEY_SWITCHVIDEOMODE
 0x38 KEY_SEARCH
 0x08 KEY_INFO
 0x2a KEY_REWIND
diff --git a/utils/keytable/rc_keymaps/avermedia_m135a 
b/utils/keytable/rc_keymaps/avermedia_m135a
index 1c56bd1..71c6109 100644
--- a/utils/keytable/rc_keymaps/avermedia_m135a
+++ b/utils/keytable/rc_keymaps/avermedia_m135a
@@ -69,7 +69,7 @@
 0x0414 KEY_TEXT
 0x0415 KEY_EPG
 0x041a KEY_TV2
-0x041b KEY_MHP
+0x041b KEY_CAMERA
 0x0417 KEY_RECORD
 0x0416 KEY_PLAYPAUSE
 0x0418 KEY_STOP
diff --git a/utils/keytable/rc_keymaps/avermedia_m733a_rm_k6 
b/utils/keytable/rc_keymaps/avermedia_m733a_rm_k6
index b2cf3dc..94d9a35 100644
--- a/utils/keytable/rc_keymaps/avermedia_m733a_rm_k6
+++ b/utils/keytable/rc_keymaps/avermedia_m733a_rm_k6
@@ -34,7 +34,7 @@
 0x0414 KEY_TEXT
 0x0415 KEY_EPG
 0x041a KEY_TV2
-0x041b KEY_MHP
+0x041b KEY_CAMERA
 0x0417 KEY_RECORD
 0x0416 KEY_PLAYPAUSE
 0x0418 KEY_STOP
diff --git a/utils/keytable/rc_keymaps/avermedia_rm_ks 
b/utils/keytable/rc_keymaps/avermedia_rm_ks
index a8c3df0..eb5eefa 100644
--- a/utils/keytable/rc_keymaps/avermedia_rm_ks
+++ b/utils/keytable/rc_keymaps/avermedia_rm_ks
@@ -6,7 +6,7 @@
 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/utils/keytable/rc_keymaps/behold b/utils/keytable/rc_keymaps/behold
index 23d349d..c100f3a 100644
--- a/utils/keytable/rc_keymaps/behold
+++ b/utils/keytable/rc_keymaps/behold
@@ -27,7 +27,7 @@
 0x6b861a KEY_STOP
 0x6b860e KEY_TEXT
 0x6b861f KEY_RED
-0x6b861e KEY_YELLOW
+0x6b861e KEY_VIDEO
 0x6b861d KEY_SLEEP
 0x6b8613 KEY_GREEN
 0x6b8619 KEY_BLUE
diff --git a/utils/keytable/rc_keymaps/behold_columbus 
b/utils/keytable/rc_keymaps/behold_columbus
index c8bf92b..bf0a54a 100644
--- a/utils/keytable/rc_keymaps/behold_columbus
+++ b/utils/keytable/rc_keymaps/behold_columbus
@@ -1,6 +1,6 @@
 # table behold_columbus, type: UNKNOWN
 0x13 KEY_MUTE
-0x11 KEY_PROPS
+0x11 KEY_VIDEO
 0x1C KEY_TUNER
 0x12 KEY_POWER
 0x01 KEY_1
diff --git a/utils/keytable/rc_keymaps/cinergy 
b/utils/keytable/rc_keymaps/cinergy
index 10bfb67..e983d76 100644
--- a/utils/keytable/rc_keymaps/cinergy
+++ b/utils/keytable/rc_keymaps/cinergy
@@ -10,7 +10,7 @@
 0x08 KEY_8
 0x09 KEY_9
 0x0a KEY_POWER
-0x0b KEY_PROG1
+0x0b KEY_MEDIA
 0x0c KEY_ZOOM
 0x0d KEY_CHANNELUP
 0x0e KEY_CHANNELDOWN
diff --git a/utils/keytable/rc_keymaps/digitv b/utils/keytable/rc_keymaps/digitv
index 46ab8a8..1ad8dda 100644
--- a/utils/keytable/rc_keymaps/digitv
+++ b/utils/keytable/rc_keymaps/digitv
@@ -13,7 +13,7 @@
 0xaf59 KEY_AUX
 0x5f5a KEY_DVD
 0x6f5a KEY_POWER
-0x9f5a KEY_MHP
+0x9f5a KEY_CAMERA
 0xaf5a KEY_AUDIO
 0x5f65 KEY_INFO
 0x6f65 KEY_F13
diff --git a/utils/keytable/rc_keymaps/dntv_live_dvb_t 
b/utils/keytable/rc_keymaps/dntv_live_dvb_t
index dec4a2d..7020acb 100644
--- a/utils/keytable/rc_keymaps/dntv_live_dvb_t
+++ b/utils/keytable/rc_keymaps/dntv_live_dvb_t
@@ -14,7 +14,7 @@
 0x0c KEY_SEARCH
 0x0d KEY_STOP
 0x0e KEY_PAUSE
-0x0f KEY_LIST
+0x0f KEY_VIDEO
 0x10 KEY_MUTE
 0x11 KEY_REWIND
 0x12 KEY_POWER
diff --git a/utils/keytable/rc_keymaps/dw210x b/utils/keytable/rc_keymaps/dw210x
index 9f77664..01bb877 100644
--- a/utils/keytable/rc_keymaps/dw210x
+++ b/utils/keytable/rc_keymaps/dw210x
@@ -1,6 +1,6 @@
 # table dw210x, type: UNKNOWN
-0xf80a KEY_Q
-0xf80c KEY_M
+0xf80a KEY_POWER2
+0xf80c KEY_MUTE
 0xf811 KEY_1
 0xf812 KEY_2
 0xf813 KEY_3
@@ -11,22 +11,22 @@
 0xf818 KEY_8
 0xf819 KEY_9
 0xf810 KEY_0
-0xf81c KEY_PAGEUP
-0xf80f KEY_PAGEDOWN
-0xf81a KEY_O
-0xf80e KEY_Z
-0xf804 KEY_R
-0xf809 KEY_D
-0xf808 KEY_BACKSPACE
-0xf807 KEY_A
-0xf80b KEY_P
+0xf81c KEY_CHANNELUP
+0xf80f KEY_CHANNELDOWN
+0xf81a KEY_VOLUMEUP
+0xf80e KEY_VOLUMEDOWN
+0xf804 KEY_RECORD
+0xf809 KEY_FAVORITES
+0xf808 KEY_REWIND
+0xf807 KEY_FASTFORWARD
+0xf80b KEY_PAUSE
 0xf802 KEY_ESC
-0xf803 KEY_G
+0xf803 KEY_TAB
 0xf800 KEY_UP
-0xf81f KEY_ENTER
+0xf81f KEY_OK
 0xf801 KEY_DOWN
-0xf805 KEY_C
-0xf806 KEY_S
-0xf840 KEY_F
-0xf81e KEY_W
-0xf81b KEY_B
+0xf805 KEY_CAMERA
+0xf806 KEY_STOP
+0xf840 KEY_ZOOM
+0xf81e KEY_TV
+0xf81b KEY_LAST
diff --git a/utils/keytable/rc_keymaps/encore_enltv 
b/utils/keytable/rc_keymaps/encore_enltv
index c51a93d..eff3649 100644
--- a/utils/keytable/rc_keymaps/encore_enltv
+++ b/utils/keytable/rc_keymaps/encore_enltv
@@ -3,7 +3,7 @@
 0x1e KEY_TV
 0x00 KEY_VIDEO
 0x01 KEY_AUDIO
-0x02 KEY_MHP
+0x02 KEY_CAMERA
 0x1f KEY_1
 0x03 KEY_2
 0x04 KEY_3
@@ -46,7 +46,7 @@
 0x50 KEY_SLEEP
 0x51 KEY_MODE
 0x52 KEY_SELECT
-0x53 KEY_PROG1
+0x53 KEY_TEXT
 0x59 KEY_RED
 0x41 KEY_GREEN
 0x47 KEY_YELLOW
diff --git a/utils/keytable/rc_keymaps/encore_enltv2 
b/utils/keytable/rc_keymaps/encore_enltv2
index 1d0d160..645a9ce 100644
--- a/utils/keytable/rc_keymaps/encore_enltv2
+++ b/utils/keytable/rc_keymaps/encore_enltv2
@@ -13,7 +13,7 @@
 0x54 KEY_0
 0x64 KEY_LAST
 0x4e KEY_AGAIN
-0x6c KEY_SWITCHVIDEOMODE
+0x6c KEY_VIDEO
 0x5e KEY_MENU
 0x56 KEY_SCREEN
 0x7a KEY_SETUP
diff --git a/utils/keytable/rc_keymaps/flydvb b/utils/keytable/rc_keymaps/flydvb
index d142fdd..fe1a7e9 100644
--- a/utils/keytable/rc_keymaps/flydvb
+++ b/utils/keytable/rc_keymaps/flydvb
@@ -20,8 +20,8 @@
 0x12 KEY_CHANNELUP
 0x13 KEY_CHANNELDOWN
 0x1d KEY_ENTER
-0x1a KEY_MODE
-0x18 KEY_TUNER
+0x1a KEY_TV2
+0x18 KEY_VIDEO
 0x1e KEY_RECORD
 0x15 KEY_ANGLE
 0x1c KEY_PAUSE
diff --git a/utils/keytable/rc_keymaps/hauppauge_new 
b/utils/keytable/rc_keymaps/hauppauge_new
deleted file mode 100644
index 0dde95d..0000000
--- a/utils/keytable/rc_keymaps/hauppauge_new
+++ /dev/null
@@ -1,49 +0,0 @@
-# table hauppauge_new, type: UNKNOWN
-0x00 KEY_0
-0x01 KEY_1
-0x02 KEY_2
-0x03 KEY_3
-0x04 KEY_4
-0x05 KEY_5
-0x06 KEY_6
-0x07 KEY_7
-0x08 KEY_8
-0x09 KEY_9
-0x0a KEY_TEXT
-0x0b KEY_RED
-0x0c KEY_RADIO
-0x0d KEY_MENU
-0x0e KEY_SUBTITLE
-0x0f KEY_MUTE
-0x10 KEY_VOLUMEUP
-0x11 KEY_VOLUMEDOWN
-0x12 KEY_PREVIOUS
-0x14 KEY_UP
-0x15 KEY_DOWN
-0x16 KEY_LEFT
-0x17 KEY_RIGHT
-0x18 KEY_VIDEO
-0x19 KEY_AUDIO
-0x1a KEY_MHP
-0x1b KEY_EPG
-0x1c KEY_TV
-0x1e KEY_NEXTSONG
-0x1f KEY_EXIT
-0x20 KEY_CHANNELUP
-0x21 KEY_CHANNELDOWN
-0x22 KEY_CHANNEL
-0x24 KEY_PREVIOUSSONG
-0x25 KEY_ENTER
-0x26 KEY_SLEEP
-0x29 KEY_BLUE
-0x2e KEY_GREEN
-0x30 KEY_PAUSE
-0x32 KEY_REWIND
-0x34 KEY_FASTFORWARD
-0x35 KEY_PLAY
-0x36 KEY_STOP
-0x37 KEY_RECORD
-0x38 KEY_YELLOW
-0x3b KEY_SELECT
-0x3c KEY_ZOOM
-0x3d KEY_POWER
diff --git a/utils/keytable/rc_keymaps/imon_mce 
b/utils/keytable/rc_keymaps/imon_mce
index a1cc979..328b36c 100644
--- a/utils/keytable/rc_keymaps/imon_mce
+++ b/utils/keytable/rc_keymaps/imon_mce
@@ -75,4 +75,4 @@
 0x800ff45a KEY_SUBTITLE
 0x800ff44d KEY_TITLE
 0x800ff40c KEY_POWER
-0x800ff40d KEY_PROG1
+0x800ff40d KEY_LEFTMETA
diff --git a/utils/keytable/rc_keymaps/kworld_315u 
b/utils/keytable/rc_keymaps/kworld_315u
index 4d50945..6985bb3 100644
--- a/utils/keytable/rc_keymaps/kworld_315u
+++ b/utils/keytable/rc_keymaps/kworld_315u
@@ -1,6 +1,6 @@
 # table kworld_315u, type: NEC
 0x6143 KEY_POWER
-0x6101 KEY_TUNER
+0x6101 KEY_VIDEO
 0x610b KEY_ZOOM
 0x6103 KEY_POWER2
 0x6104 KEY_1
diff --git a/utils/keytable/rc_keymaps/kworld_plus_tv_analog 
b/utils/keytable/rc_keymaps/kworld_plus_tv_analog
index 8f0c405..cacc041 100644
--- a/utils/keytable/rc_keymaps/kworld_plus_tv_analog
+++ b/utils/keytable/rc_keymaps/kworld_plus_tv_analog
@@ -1,5 +1,5 @@
 # table kworld_plus_tv_analog, type: UNKNOWN
-0x0c KEY_PROG1
+0x0c KEY_LEFTMETA
 0x16 KEY_CLOSECD
 0x1d KEY_POWER2
 0x00 KEY_1
diff --git a/utils/keytable/rc_keymaps/msi_tvanywhere_plus 
b/utils/keytable/rc_keymaps/msi_tvanywhere_plus
index 2980895..860e39b 100644
--- a/utils/keytable/rc_keymaps/msi_tvanywhere_plus
+++ b/utils/keytable/rc_keymaps/msi_tvanywhere_plus
@@ -12,7 +12,7 @@
 0x10 KEY_KPPLUS
 0x13 KEY_AGAIN
 0x1e KEY_POWER
-0x07 KEY_TUNER
+0x07 KEY_VIDEO
 0x1c KEY_SEARCH
 0x18 KEY_MUTE
 0x03 KEY_RADIO
diff --git a/utils/keytable/rc_keymaps/nebula b/utils/keytable/rc_keymaps/nebula
index 1eae4db..ce00927 100644
--- a/utils/keytable/rc_keymaps/nebula
+++ b/utils/keytable/rc_keymaps/nebula
@@ -13,7 +13,7 @@
 0x0b KEY_AUX
 0x0c KEY_DVD
 0x0d KEY_POWER
-0x0e KEY_MHP
+0x0e KEY_CAMERA
 0x0f KEY_AUDIO
 0x10 KEY_INFO
 0x11 KEY_F13
diff --git a/utils/keytable/rc_keymaps/norwood 
b/utils/keytable/rc_keymaps/norwood
index 4b0f46f..079c35a 100644
--- a/utils/keytable/rc_keymaps/norwood
+++ b/utils/keytable/rc_keymaps/norwood
@@ -9,7 +9,7 @@
 0x27 KEY_7
 0x28 KEY_8
 0x29 KEY_9
-0x78 KEY_TUNER
+0x78 KEY_VIDEO
 0x2c KEY_EXIT
 0x2a KEY_SELECT
 0x69 KEY_AGAIN
diff --git a/utils/keytable/rc_keymaps/opera1 b/utils/keytable/rc_keymaps/opera1
index 3b758fc..af78559 100644
--- a/utils/keytable/rc_keymaps/opera1
+++ b/utils/keytable/rc_keymaps/opera1
@@ -9,19 +9,19 @@
 0x49b6 KEY_8
 0x05fa KEY_9
 0x45ba KEY_0
-0x09f6 KEY_UP
-0x1be5 KEY_DOWN
-0x5da3 KEY_LEFT
-0x5fa1 KEY_RIGHT
+0x09f6 KEY_CHANNELUP
+0x1be5 KEY_CHANNELDOWN
+0x5da3 KEY_VOLUMEDOWN
+0x5fa1 KEY_VOLUMEUP
 0x07f8 KEY_SPACE
-0x1fe1 KEY_ENTER
-0x1be4 KEY_Z
-0x59a6 KEY_M
-0x5ba5 KEY_F
-0x19e7 KEY_R
-0x01fe KEY_S
-0x03fd KEY_P
-0x03fc KEY_W
-0x07f9 KEY_C
-0x47b9 KEY_Q
-0x43bc KEY_O
+0x1fe1 KEY_OK
+0x1be4 KEY_ZOOM
+0x59a6 KEY_MUTE
+0x5ba5 KEY_RADIO
+0x19e7 KEY_RECORD
+0x01fe KEY_STOP
+0x03fd KEY_PAUSE
+0x03fc KEY_SCREEN
+0x07f9 KEY_CAMERA
+0x47b9 KEY_ESC
+0x43bc KEY_POWER2
diff --git a/utils/keytable/rc_keymaps/pctv_sedna 
b/utils/keytable/rc_keymaps/pctv_sedna
index 5ae6331..5847131 100644
--- a/utils/keytable/rc_keymaps/pctv_sedna
+++ b/utils/keytable/rc_keymaps/pctv_sedna
@@ -16,7 +16,7 @@
 0x0e KEY_STOP
 0x0f KEY_PREVIOUSSONG
 0x10 KEY_ZOOM
-0x11 KEY_TUNER
+0x11 KEY_VIDEO
 0x12 KEY_POWER
 0x13 KEY_MUTE
 0x15 KEY_CHANNELDOWN
diff --git a/utils/keytable/rc_keymaps/pixelview 
b/utils/keytable/rc_keymaps/pixelview
index dc6c664..2299ede 100644
--- a/utils/keytable/rc_keymaps/pixelview
+++ b/utils/keytable/rc_keymaps/pixelview
@@ -1,6 +1,6 @@
 # table pixelview, type: UNKNOWN
 0x1e KEY_POWER
-0x07 KEY_MEDIA
+0x07 KEY_VIDEO
 0x1c KEY_SEARCH
 0x03 KEY_TUNER
 0x00 KEY_RECORD
diff --git a/utils/keytable/rc_keymaps/pixelview_mk12 
b/utils/keytable/rc_keymaps/pixelview_mk12
index edd28d3..9463dfe 100644
--- a/utils/keytable/rc_keymaps/pixelview_mk12
+++ b/utils/keytable/rc_keymaps/pixelview_mk12
@@ -13,7 +13,7 @@
 0x866b02 KEY_0
 0x866b13 KEY_AGAIN
 0x866b10 KEY_DIGITS
-0x866b00 KEY_MEDIA
+0x866b00 KEY_VIDEO
 0x866b18 KEY_MUTE
 0x866b19 KEY_CAMERA
 0x866b1a KEY_SEARCH
diff --git a/utils/keytable/rc_keymaps/pixelview_new 
b/utils/keytable/rc_keymaps/pixelview_new
index 4fab763..8676a2b 100644
--- a/utils/keytable/rc_keymaps/pixelview_new
+++ b/utils/keytable/rc_keymaps/pixelview_new
@@ -12,7 +12,7 @@
 0x1e KEY_9
 0x3e KEY_0
 0x1c KEY_AGAIN
-0x3f KEY_MEDIA
+0x3f KEY_VIDEO
 0x1f KEY_LAST
 0x1b KEY_MUTE
 0x17 KEY_CHANNELDOWN
diff --git a/utils/keytable/rc_keymaps/pv951 b/utils/keytable/rc_keymaps/pv951
index d0a43fc..82f3549 100644
--- a/utils/keytable/rc_keymaps/pv951
+++ b/utils/keytable/rc_keymaps/pv951
@@ -26,7 +26,7 @@
 0x17 KEY_OK
 0x19 KEY_MODE
 0x0c KEY_SEARCH
-0x0f KEY_SELECT
+0x0f KEY_VIDEO
 0x0a KEY_KPPLUS
 0x14 KEY_EQUAL
-0x1c KEY_MEDIA
+0x1c KEY_TV
diff --git a/utils/keytable/rc_keymaps/rc5_hauppauge_new 
b/utils/keytable/rc_keymaps/rc5_hauppauge_new
deleted file mode 100644
index e43940a..0000000
--- a/utils/keytable/rc_keymaps/rc5_hauppauge_new
+++ /dev/null
@@ -1,85 +0,0 @@
-# table rc5_hauppauge_new, type: RC5
-0x1e00 KEY_0
-0x1e01 KEY_1
-0x1e02 KEY_2
-0x1e03 KEY_3
-0x1e04 KEY_4
-0x1e05 KEY_5
-0x1e06 KEY_6
-0x1e07 KEY_7
-0x1e08 KEY_8
-0x1e09 KEY_9
-0x1e0a KEY_TEXT
-0x1e0b KEY_RED
-0x1e0c KEY_RADIO
-0x1e0d KEY_MENU
-0x1e0e KEY_SUBTITLE
-0x1e0f KEY_MUTE
-0x1e10 KEY_VOLUMEUP
-0x1e11 KEY_VOLUMEDOWN
-0x1e12 KEY_PREVIOUS
-0x1e14 KEY_UP
-0x1e15 KEY_DOWN
-0x1e16 KEY_LEFT
-0x1e17 KEY_RIGHT
-0x1e18 KEY_VIDEO
-0x1e19 KEY_AUDIO
-0x1e1a KEY_MHP
-0x1e1b KEY_EPG
-0x1e1c KEY_TV
-0x1e1e KEY_NEXTSONG
-0x1e1f KEY_EXIT
-0x1e20 KEY_CHANNELUP
-0x1e21 KEY_CHANNELDOWN
-0x1e22 KEY_CHANNEL
-0x1e24 KEY_PREVIOUSSONG
-0x1e25 KEY_ENTER
-0x1e26 KEY_SLEEP
-0x1e29 KEY_BLUE
-0x1e2e KEY_GREEN
-0x1e30 KEY_PAUSE
-0x1e32 KEY_REWIND
-0x1e34 KEY_FASTFORWARD
-0x1e35 KEY_PLAY
-0x1e36 KEY_STOP
-0x1e37 KEY_RECORD
-0x1e38 KEY_YELLOW
-0x1e3b KEY_SELECT
-0x1e3c KEY_ZOOM
-0x1e3d KEY_POWER
-0x1d00 KEY_0
-0x1d01 KEY_1
-0x1d02 KEY_2
-0x1d03 KEY_3
-0x1d04 KEY_4
-0x1d05 KEY_5
-0x1d06 KEY_6
-0x1d07 KEY_7
-0x1d08 KEY_8
-0x1d09 KEY_9
-0x1d0a KEY_TEXT
-0x1d0d KEY_MENU
-0x1d0f KEY_MUTE
-0x1d10 KEY_VOLUMEUP
-0x1d11 KEY_VOLUMEDOWN
-0x1d12 KEY_PREVIOUS
-0x1d14 KEY_UP
-0x1d15 KEY_DOWN
-0x1d16 KEY_LEFT
-0x1d17 KEY_RIGHT
-0x1d1c KEY_TV
-0x1d1e KEY_NEXT
-0x1d1f KEY_EXIT
-0x1d20 KEY_CHANNELUP
-0x1d21 KEY_CHANNELDOWN
-0x1d24 KEY_LAST
-0x1d25 KEY_OK
-0x1d30 KEY_PAUSE
-0x1d32 KEY_REWIND
-0x1d34 KEY_FASTFORWARD
-0x1d35 KEY_PLAY
-0x1d36 KEY_STOP
-0x1d37 KEY_RECORD
-0x1d3b KEY_GOTO
-0x1d3d KEY_POWER
-0x1d3f KEY_HOME
diff --git a/utils/keytable/rc_keymaps/rc5_tv b/utils/keytable/rc_keymaps/rc5_tv
deleted file mode 100644
index 40c3fdc..0000000
--- a/utils/keytable/rc_keymaps/rc5_tv
+++ /dev/null
@@ -1,34 +0,0 @@
-# table rc5_tv, type: UNKNOWN
-0x00 KEY_0
-0x01 KEY_1
-0x02 KEY_2
-0x03 KEY_3
-0x04 KEY_4
-0x05 KEY_5
-0x06 KEY_6
-0x07 KEY_7
-0x08 KEY_8
-0x09 KEY_9
-0x0b KEY_CHANNEL
-0x0c KEY_POWER
-0x0d KEY_MUTE
-0x0f KEY_TV
-0x10 KEY_VOLUMEUP
-0x11 KEY_VOLUMEDOWN
-0x12 KEY_BRIGHTNESSUP
-0x13 KEY_BRIGHTNESSDOWN
-0x1e KEY_SEARCH
-0x20 KEY_CHANNELUP
-0x21 KEY_CHANNELDOWN
-0x22 KEY_CHANNEL
-0x23 KEY_LANGUAGE
-0x26 KEY_SLEEP
-0x2e KEY_MENU
-0x30 KEY_PAUSE
-0x32 KEY_REWIND
-0x33 KEY_GOTO
-0x35 KEY_PLAY
-0x36 KEY_STOP
-0x37 KEY_RECORD
-0x3c KEY_TEXT
-0x3d KEY_SUSPEND
diff --git a/utils/keytable/rc_keymaps/rc6_mce 
b/utils/keytable/rc_keymaps/rc6_mce
index b98ee35..ec811dc 100644
--- a/utils/keytable/rc_keymaps/rc6_mce
+++ b/utils/keytable/rc_keymaps/rc6_mce
@@ -12,7 +12,7 @@
 0x800f040a KEY_DELETE
 0x800f040b KEY_ENTER
 0x800f040c KEY_POWER
-0x800f040d KEY_PROG1
+0x800f040d KEY_LEFTMETA
 0x800f040e KEY_MUTE
 0x800f040f KEY_INFO
 0x800f0410 KEY_VOLUMEUP
diff --git a/utils/keytable/rc_keymaps/real_audio_220_32_keys 
b/utils/keytable/rc_keymaps/real_audio_220_32_keys
index 65c5674..c62e7ca 100644
--- a/utils/keytable/rc_keymaps/real_audio_220_32_keys
+++ b/utils/keytable/rc_keymaps/real_audio_220_32_keys
@@ -16,7 +16,7 @@
 0x0b KEY_CHANNELUP
 0x15 KEY_CHANNELDOWN
 0x16 KEY_ENTER
-0x11 KEY_LIST
+0x11 KEY_VIDEO
 0x0d KEY_AUDIO
 0x0f KEY_PREVIOUS
 0x1b KEY_TIME
diff --git a/utils/keytable/rc_keymaps/winfast 
b/utils/keytable/rc_keymaps/winfast
index 97cd50c..48e4922 100644
--- a/utils/keytable/rc_keymaps/winfast
+++ b/utils/keytable/rc_keymaps/winfast
@@ -9,15 +9,15 @@
 0x0d KEY_7
 0x0e KEY_8
 0x0f KEY_9
-0x00 KEY_POWER
+0x00 KEY_POWER2
 0x1b KEY_AUDIO
 0x02 KEY_TUNER
 0x1e KEY_VIDEO
 0x16 KEY_INFO
-0x04 KEY_VOLUMEUP
-0x08 KEY_VOLUMEDOWN
-0x0c KEY_CHANNELUP
-0x10 KEY_CHANNELDOWN
+0x04 KEY_LEFT
+0x08 KEY_RIGHT
+0x0c KEY_UP
+0x10 KEY_DOWN
 0x03 KEY_ZOOM
 0x1f KEY_TEXT
 0x20 KEY_SLEEP
@@ -29,7 +29,7 @@
 0x2e KEY_BLUE
 0x18 KEY_KPPLUS
 0x19 KEY_KPMINUS
-0x2a KEY_MEDIA
+0x2a KEY_TV2
 0x21 KEY_DOT
 0x13 KEY_ENTER
 0x11 KEY_LAST
@@ -39,7 +39,7 @@
 0x25 KEY_TIME
 0x26 KEY_STOP
 0x27 KEY_RECORD
-0x28 KEY_SAVE
+0x28 KEY_CAMERA
 0x2f KEY_MENU
 0x30 KEY_CANCEL
 0x31 KEY_CHANNEL
@@ -51,7 +51,7 @@
 0x37 KEY_RADIO
 0x38 KEY_DVD
 0x1a KEY_MODE
-0x3e KEY_F21
-0x3a KEY_F22
-0x3b KEY_F23
-0x3f KEY_F24
+0x3e KEY_VOLUMEUP
+0x3a KEY_VOLUMEDOWN
+0x3b KEY_CHANNELUP
+0x3f KEY_CHANNELDOWN
diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg
index 014c58e..6043349 100644
--- a/utils/keytable/rc_maps.cfg
+++ b/utils/keytable/rc_maps.cfg
@@ -52,7 +52,6 @@
 *      rc-imon-pad              imon_pad
 *      rc-em-terratec           em_terratec
 *      rc-behold                behold
-*      rc-rc5-tv                rc5_tv
 *      rc-gadmei-rm008z         gadmei_rm008z
 *      rc-behold-columbus       behold_columbus
 *      rc-genius-tvgo-a11mce    genius_tvgo_a11mce
@@ -71,7 +70,6 @@
 *      rc-streamzap             streamzap
 *      rc-kworld-plus-tv-analog kworld_plus_tv_analog
 *      rc-apac-viewcomp         apac_viewcomp
-*      rc-rc5-hauppauge-new     rc5_hauppauge_new
 *      rc-avermedia-a16d        avermedia_a16d
 *      rc-digitalnow-tinytwin   digitalnow_tinytwin
 *      rc-real-audio-220-32-keys real_audio_220_32_keys
@@ -112,7 +110,7 @@
 *      rc-evga-indtube          evga_indtube
 *      rc-avermedia-dvbt        avermedia_dvbt
 *      rc-avermedia-rm-ks       avermedia_rm_ks
-*      rc-hauppauge-new         hauppauge_new
+*      rc-rc5-hauppauge         hauppauge
 *      rc-winfast               winfast
 *      rc-avermedia-m135a       avermedia_m135a
 *      rc-npgtech               npgtech

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to