Update keymaps to sync with latest development tree

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

diff --git a/utils/keytable/parse.h b/utils/keytable/parse.h
index b7ceb978e13be2712930be1a7f310f61a37ce788..ecb2b6b136ad6d1d6d849e3796dc2da9ac03f88d 100644 (file)
--- a/utils/keytable/parse.h
+++ b/utils/keytable/parse.h
@@ -402,6 +402,7 @@ struct parse_key {
        {"KEY_MEDIA_REPEAT", 0x1b7},
        {"KEY_10CHANNELSUP", 0x1b8},
        {"KEY_10CHANNELSDOWN", 0x1b9},
+       {"KEY_IMAGES", 0x1ba},
        {"KEY_DEL_EOL", 0x1c0},
        {"KEY_DEL_EOS", 0x1c1},
        {"KEY_INS_LINE", 0x1c2},

diff --git a/utils/keytable/rc_keymaps/avermedia_cardbus b/utils/keytable/rc_keymaps/avermedia_cardbus
index a382dde9434a557667c06455e82ba3ecba162d95..c4e4d36929e286c48ca1bdc72767c2fc92018e60 100644 (file)
--- a/utils/keytable/rc_keymaps/avermedia_cardbus
+++ b/utils/keytable/rc_keymaps/avermedia_cardbus
@@ -36,7 +36,7 @@
 0x28 KEY_SELECT
 0x29 KEY_BLUE
 0x2a KEY_BACKSPACE
-0x2b KEY_MEDIA
+0x2b KEY_VIDEO
 0x2c KEY_DOWN
 0x2e KEY_DOT
 0x2f KEY_TV

diff --git a/utils/keytable/rc_keymaps/dibusb b/utils/keytable/rc_keymaps/dibusb
index 941d9d9fc778e0eccc41708012eb4f935ff42513..b00b96d03ea940935b40b97863c780a46613ab94 100644 (file)
--- a/utils/keytable/rc_keymaps/dibusb
+++ b/utils/keytable/rc_keymaps/dibusb
@@ -72,7 +72,7 @@
 0x8007 KEY_BLUE
 0x8008 KEY_DVD
 0x8009 KEY_AUDIO
-0x800a KEY_MEDIA
+0x800a KEY_IMAGES
 0x800b KEY_VIDEO
 0x800c KEY_BACK
 0x800d KEY_UP

diff --git a/utils/keytable/rc_keymaps/haupp b/utils/keytable/rc_keymaps/haupp
index 54bb31c44abe681774a21d2a3e9a40d07ef818c5..cb89c798f363e078a822f59cd35ecf9cfc3f69fc 100644 (file)
--- a/utils/keytable/rc_keymaps/haupp
+++ b/utils/keytable/rc_keymaps/haupp
@@ -24,7 +24,7 @@
 0x1e17 KEY_RIGHT
 0x1e18 KEY_VIDEO
 0x1e19 KEY_AUDIO
-0x1e1a KEY_MEDIA
+0x1e1a KEY_IMAGES
 0x1e1b KEY_EPG
 0x1e1c KEY_TV
 0x1e1e KEY_NEXT

diff --git a/utils/keytable/rc_keymaps/hauppauge b/utils/keytable/rc_keymaps/hauppauge
new file mode 100644 (file)
index 0000000..87be3a5
--- /dev/null
+++ b/utils/keytable/rc_keymaps/hauppauge
@@ -0,0 +1,137 @@
+# table hauppauge, type: RC5
+0x1e3b KEY_SELECT
+0x1e3d KEY_POWER2
+0x1e1c KEY_TV
+0x1e18 KEY_VIDEO
+0x1e19 KEY_AUDIO
+0x1e1a KEY_CAMERA
+0x1e1b KEY_EPG
+0x1e0c KEY_RADIO
+0x1e14 KEY_UP
+0x1e15 KEY_DOWN
+0x1e16 KEY_LEFT
+0x1e17 KEY_RIGHT
+0x1e25 KEY_OK
+0x1e1f KEY_EXIT
+0x1e0d KEY_MENU
+0x1e10 KEY_VOLUMEUP
+0x1e11 KEY_VOLUMEDOWN
+0x1e12 KEY_PREVIOUS
+0x1e0f KEY_MUTE
+0x1e20 KEY_CHANNELUP
+0x1e21 KEY_CHANNELDOWN
+0x1e37 KEY_RECORD
+0x1e36 KEY_STOP
+0x1e32 KEY_REWIND
+0x1e35 KEY_PLAY
+0x1e34 KEY_FASTFORWARD
+0x1e24 KEY_PREVIOUSSONG
+0x1e30 KEY_PAUSE
+0x1e1e KEY_NEXTSONG
+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
+0x1e00 KEY_0
+0x1e0e KEY_SUBTITLE
+0x1e0b KEY_RED
+0x1e2e KEY_GREEN
+0x1e38 KEY_YELLOW
+0x1e29 KEY_BLUE
+0x1f3d KEY_POWER2
+0x1f3b KEY_SELECT
+0x1f00 KEY_0
+0x1f01 KEY_1
+0x1f02 KEY_2
+0x1f03 KEY_3
+0x1f04 KEY_4
+0x1f05 KEY_5
+0x1f06 KEY_6
+0x1f07 KEY_7
+0x1f08 KEY_8
+0x1f09 KEY_9
+0x1f1f KEY_EXIT
+0x1f0d KEY_MENU
+0x1f10 KEY_VOLUMEUP
+0x1f11 KEY_VOLUMEDOWN
+0x1f20 KEY_CHANNELUP
+0x1f21 KEY_CHANNELDOWN
+0x1f25 KEY_ENTER
+0x1f0b KEY_RED
+0x1f2e KEY_GREEN
+0x1f38 KEY_YELLOW
+0x1f29 KEY_BLUE
+0x1f0f KEY_MUTE
+0x1f0c KEY_RADIO
+0x1f3c KEY_ZOOM
+0x1f32 KEY_REWIND
+0x1f35 KEY_PLAY
+0x1f34 KEY_FASTFORWARD
+0x1f37 KEY_RECORD
+0x1f36 KEY_STOP
+0x1f30 KEY_PAUSE
+0x1f24 KEY_PREVIOUSSONG
+0x1f1e KEY_NEXTSONG
+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
+0x001f KEY_TV
+0x0020 KEY_CHANNELUP
+0x000c KEY_RADIO
+0x0011 KEY_VOLUMEDOWN
+0x002e KEY_ZOOM
+0x0010 KEY_VOLUMEUP
+0x000d KEY_MUTE
+0x0021 KEY_CHANNELDOWN
+0x0022 KEY_VIDEO
+0x0001 KEY_1
+0x0002 KEY_2
+0x0003 KEY_3
+0x0004 KEY_4
+0x0005 KEY_5
+0x0006 KEY_6
+0x0007 KEY_7
+0x0008 KEY_8
+0x0009 KEY_9
+0x001e KEY_RED
+0x0000 KEY_0
+0x0026 KEY_SLEEP

diff --git a/utils/keytable/rc_keymaps/imon_mce b/utils/keytable/rc_keymaps/imon_mce
index 328b36cd1b129ece2a6e567c103771d08ff3349a..00dbde01ec6dd11204161baff75d5b79815e1239 100644 (file)
--- 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_LEFTMETA
+0x800ff40d KEY_MEDIA

diff --git a/utils/keytable/rc_keymaps/imon_pad b/utils/keytable/rc_keymaps/imon_pad
index cd7c9e54a4a26ce8433e382f333ec542d5fa8e65..929bdc4c7df17edee72ec46ecb5d077946b9c152 100644 (file)
--- a/utils/keytable/rc_keymaps/imon_pad
+++ b/utils/keytable/rc_keymaps/imon_pad
@@ -58,14 +58,14 @@
 0x29a115b7 KEY_NUMERIC_POUND
 0x2b8515b7 KEY_VIDEO
 0x299195b7 KEY_AUDIO
-0x2ba115b7 KEY_CAMERA
+0x2ba115b7 KEY_IMAGES
 0x28a515b7 KEY_TV
 0x29a395b7 KEY_DVD
 0x29a295b7 KEY_DVD
 0x2ba385b7 KEY_MENU
 0x2ba395b7 KEY_MENU
 0x288515b7 KEY_BOOKMARKS
-0x2ab715b7 KEY_MEDIA
+0x2ab715b7 KEY_CAMERA
 0x298595b7 KEY_SUBTITLE
 0x2b8595b7 KEY_LANGUAGE
 0x29a595b7 KEY_ZOOM

diff --git a/utils/keytable/rc_keymaps/kworld_plus_tv_analog b/utils/keytable/rc_keymaps/kworld_plus_tv_analog
index cacc041a7664fd55f9bdfcdcba7a6a2d428c73cc..3e62a2490e607ef67cc9ea44797036956001e6a0 100644 (file)
--- 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_LEFTMETA
+0x0c KEY_MEDIA
 0x16 KEY_CLOSECD
 0x1d KEY_POWER2
 0x00 KEY_1

diff --git a/utils/keytable/rc_keymaps/pinnacle310e b/utils/keytable/rc_keymaps/pinnacle310e
index b93e05c60eac753114889281583bddd4ac9dab13..16de3579bfd515c0befcc8185f255e4ad010859a 100644 (file)
--- a/utils/keytable/rc_keymaps/pinnacle310e
+++ b/utils/keytable/rc_keymaps/pinnacle310e
@@ -2,7 +2,7 @@
 0x16 KEY_POWER
 0x17 KEY_FAVORITES
 0x0f KEY_TEXT
-0x48 KEY_MEDIA
+0x48 KEY_PROGRAM
 0x1c KEY_EPG
 0x04 KEY_LIST
 0x03 KEY_1
@@ -44,11 +44,11 @@
 0x0e KEY_MUTE
 0x49 KEY_LR
 0x07 KEY_SLEEP
-0x08 KEY_MEDIA
+0x08 KEY_VIDEO
 0x0e KEY_MENU
 0x45 KEY_ZOOMIN
 0x46 KEY_ZOOMOUT
-0x18 KEY_TV
-0x53 KEY_VCR
-0x5e KEY_SAT
-0x5f KEY_PLAYER
+0x18 KEY_RED
+0x53 KEY_GREEN
+0x5e KEY_YELLOW
+0x5f KEY_BLUE

diff --git a/utils/keytable/rc_keymaps/rc6_mce b/utils/keytable/rc_keymaps/rc6_mce
index 3451798a4fb7d5fb05c91217f9bb9f64bc2ed438..9340511d38c92d5eb4aba1ccb8d8c7c66b1ce3cc 100644 (file)
--- 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_LEFTMETA
+0x800f040d KEY_MEDIA
 0x800f040e KEY_MUTE
 0x800f040f KEY_INFO
 0x800f0410 KEY_VOLUMEUP
@@ -60,6 +60,6 @@
 0x800f045e KEY_BLUE
 0x800f0465 KEY_POWER2
 0x800f046e KEY_PLAYPAUSE
-0x800f046f KEY_MEDIA
+0x800f046f KEY_PLAYER
 0x800f0480 KEY_BRIGHTNESSDOWN
 0x800f0481 KEY_PLAYPAUSE

diff --git a/utils/keytable/rc_keymaps/su3000 b/utils/keytable/rc_keymaps/su3000
new file mode 100644 (file)
index 0000000..b53aaed
--- /dev/null
+++ b/utils/keytable/rc_keymaps/su3000
@@ -0,0 +1,36 @@
+# table su3000, type: UNKNOWN
+0x25 KEY_POWER
+0x0a KEY_MUTE
+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
+0x00 KEY_0
+0x20 KEY_UP
+0x21 KEY_DOWN
+0x12 KEY_VOLUMEUP
+0x13 KEY_VOLUMEDOWN
+0x1f KEY_RECORD
+0x17 KEY_PLAY
+0x16 KEY_PAUSE
+0x0b KEY_STOP
+0x27 KEY_FASTFORWARD
+0x26 KEY_REWIND
+0x0d KEY_OK
+0x11 KEY_LEFT
+0x10 KEY_RIGHT
+0x29 KEY_BACK
+0x2c KEY_MENU
+0x2b KEY_EPG
+0x1e KEY_RED
+0x0e KEY_GREEN
+0x2d KEY_YELLOW
+0x0f KEY_BLUE
+0x14 KEY_AUDIO
+0x38 KEY_TV
+0x0c KEY_ESC

diff --git a/utils/keytable/rc_keymaps/terratec_slim_2 b/utils/keytable/rc_keymaps/terratec_slim_2
new file mode 100644 (file)
index 0000000..ad89ef7
--- /dev/null
+++ b/utils/keytable/rc_keymaps/terratec_slim_2
@@ -0,0 +1,19 @@
+# table terratec_slim_2, type: NEC
+0x8001 KEY_MUTE
+0x8002 KEY_VOLUMEDOWN
+0x8003 KEY_CHANNELDOWN
+0x8004 KEY_1
+0x8005 KEY_2
+0x8006 KEY_3
+0x8007 KEY_4
+0x8008 KEY_5
+0x8009 KEY_6
+0x800a KEY_7
+0x800c KEY_ZOOM
+0x800d KEY_0
+0x800e KEY_AGAIN
+0x8012 KEY_POWER2
+0x801a KEY_VOLUMEUP
+0x801b KEY_8
+0x801e KEY_CHANNELUP
+0x801f KEY_9

diff --git a/utils/keytable/rc_keymaps/tivo b/utils/keytable/rc_keymaps/tivo
new file mode 100644 (file)
index 0000000..53d4e72
--- /dev/null
+++ b/utils/keytable/rc_keymaps/tivo
@@ -0,0 +1,46 @@
+# table tivo, type: NEC
+0xa10c900f KEY_MEDIA
+0xa10c0807 KEY_POWER2
+0xa10c8807 KEY_TV
+0xa10c2c03 KEY_VIDEO_NEXT
+0xa10cc807 KEY_INFO
+0xa10cfa05 KEY_CYCLEWINDOWS
+0x0085305f KEY_CYCLEWINDOWS
+0xa10c6c03 KEY_EPG
+0xa10c2807 KEY_UP
+0xa10c6807 KEY_DOWN
+0xa10ce807 KEY_LEFT
+0xa10ca807 KEY_RIGHT
+0xa10c1807 KEY_SCROLLDOWN
+0xa10c9807 KEY_SELECT
+0xa10c5807 KEY_SCROLLUP
+0xa10c3807 KEY_VOLUMEUP
+0xa10cb807 KEY_VOLUMEDOWN
+0xa10cd807 KEY_MUTE
+0xa10c040b KEY_RECORD
+0xa10c7807 KEY_CHANNELUP
+0xa10cf807 KEY_CHANNELDOWN
+0x0085301f KEY_CHANNELDOWN
+0xa10c840b KEY_PLAY
+0xa10cc40b KEY_PAUSE
+0xa10ca40b KEY_SLOW
+0xa10c440b KEY_REWIND
+0xa10c240b KEY_FASTFORWARD
+0xa10c640b KEY_PREVIOUS
+0xa10ce40b KEY_NEXT
+0xa10c220d KEY_ZOOM
+0xa10c120d KEY_STOP
+0xa10c520d KEY_DVD
+0xa10c140b KEY_NUMERIC_1
+0xa10c940b KEY_NUMERIC_2
+0xa10c540b KEY_NUMERIC_3
+0xa10cd40b KEY_NUMERIC_4
+0xa10c340b KEY_NUMERIC_5
+0xa10cb40b KEY_NUMERIC_6
+0xa10c740b KEY_NUMERIC_7
+0xa10cf40b KEY_NUMERIC_8
+0x0085302f KEY_NUMERIC_8
+0xa10c0c03 KEY_NUMERIC_9
+0xa10c8c03 KEY_NUMERIC_0
+0xa10ccc03 KEY_ENTER
+0xa10c4c03 KEY_CLEAR

diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg
index 6ac6fb06becfdf83a61b557e18e8d43c4c6e0778..277f90698b6826a3d04d143902d86a60b35c2c1e 100644 (file)
--- a/utils/keytable/rc_maps.cfg
+++ b/utils/keytable/rc_maps.cfg
@@ -69,6 +69,7 @@
 *      rc-pixelview             pixelview
 *      rc-streamzap             streamzap
 *      rc-kworld-plus-tv-analog kworld_plus_tv_analog
+*      rc-tivo                  tivo
 *      rc-apac-viewcomp         apac_viewcomp
 *      rc-avermedia-a16d        avermedia_a16d
 *      rc-digitalnow-tinytwin   digitalnow_tinytwin