summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common/ir-common.c
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <devnull@localhost>2005-05-22 19:23:39 +0000
committerNickolay V. Shmyrev <devnull@localhost>2005-05-22 19:23:39 +0000
commitc3aa185f55fdc149f5491cd71c1e76b49f56ecd4 (patch)
tree628cb2361cc2bf750efb58e3a2a8e86fd57b2f12 /linux/drivers/media/common/ir-common.c
parent2d72b576e164cae31abae406649d52af1e2bd340 (diff)
downloadmediapointer-dvb-s2-c3aa185f55fdc149f5491cd71c1e76b49f56ecd4.tar.gz
mediapointer-dvb-s2-c3aa185f55fdc149f5491cd71c1e76b49f56ecd4.tar.bz2
Large changes. Mostly merged patches from mm kernel branch and 2.6.12-rc4.
Update entries for Lifiview Platinum FM and Avermedia cards
Diffstat (limited to 'linux/drivers/media/common/ir-common.c')
-rw-r--r--linux/drivers/media/common/ir-common.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/linux/drivers/media/common/ir-common.c b/linux/drivers/media/common/ir-common.c
index e772b9a1e..686b1042f 100644
--- a/linux/drivers/media/common/ir-common.c
+++ b/linux/drivers/media/common/ir-common.c
@@ -1,5 +1,5 @@
/*
- * $Id: ir-common.c,v 1.9 2005/05/15 19:01:26 mchehab Exp $
+ * $Id: ir-common.c,v 1.10 2005/05/22 19:23:39 nsh Exp $
*
* some common structs and functions to handle infrared remotes via
* input layer ...
@@ -185,18 +185,30 @@ IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE] = {
[ 0x07 ] = KEY_KP7, // 7
[ 0x08 ] = KEY_KP8, // 8
[ 0x09 ] = KEY_KP9, // 9
+ [ 0x0a ] = KEY_TEXT, // keypad asterisk as well
[ 0x0b ] = KEY_RED, // red button
- [ 0x0c ] = KEY_OPTION, // black key without text
+ [ 0x0c ] = KEY_RADIO, // radio
[ 0x0d ] = KEY_MENU, // menu
+ [ 0x0e ] = KEY_SUBTITLE, // also the # key
[ 0x0f ] = KEY_MUTE, // mute
[ 0x10 ] = KEY_VOLUMEUP, // volume +
[ 0x11 ] = KEY_VOLUMEDOWN, // volume -
- [ 0x1e ] = KEY_NEXT, // skip >|
+ [ 0x12 ] = KEY_PREVIOUS, // previous channel
+ [ 0x14 ] = KEY_UP, // up
+ [ 0x15 ] = KEY_DOWN, // down
+ [ 0x16 ] = KEY_LEFT, // left
+ [ 0x17 ] = KEY_RIGHT, // right
+ [ 0x18 ] = KEY_VIDEO, // Videos
+ [ 0x19 ] = KEY_AUDIO, // Music
+ [ 0x1a ] = KEY_MHP, // Pictures - presume this means "Multimedia Home Platform"- no "PICTURES" key in input.h
+ [ 0x1b ] = KEY_EPG, // Guide
+ [ 0x1c ] = KEY_TV, // TV
+ [ 0x1e ] = KEY_NEXTSONG, // skip >|
[ 0x1f ] = KEY_EXIT, // back/exit
[ 0x20 ] = KEY_CHANNELUP, // channel / program +
[ 0x21 ] = KEY_CHANNELDOWN, // channel / program -
[ 0x22 ] = KEY_CHANNEL, // source (old black remote)
- [ 0x24 ] = KEY_PREVIOUS, // replay |<
+ [ 0x24 ] = KEY_PREVIOUSSONG, // replay |<
[ 0x25 ] = KEY_ENTER, // OK
[ 0x26 ] = KEY_SLEEP, // minimize (old black remote)
[ 0x29 ] = KEY_BLUE, // blue key