summaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorEmil Georgiev <emilonlinester@gmail.com>2007-03-04 07:03:17 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-04-27 15:44:15 -0300
commita6210b7bea86305871bdca32f38b115b3ea67edf (patch)
treef9fbf9550b3a632c00bebe00c603f910e6e4840e /drivers/media/common
parent14500d4a5140252f2524d8d89a22166ef2313614 (diff)
downloadlinux-a6210b7bea86305871bdca32f38b115b3ea67edf.tar.gz
linux-a6210b7bea86305871bdca32f38b115b3ea67edf.tar.bz2
linux-a6210b7bea86305871bdca32f38b115b3ea67edf.zip
V4L/DVB (5383): Fix duplicated codes in Pinnacle Grey remote
The keymap for this remote had duplicated labels for different keys, which resulted in those key pairs being unable to function as different inputs. Signed-off-by: Emil Georgiev <emilonlinester@gmail.com> Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/ir-keymaps.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 03b47a262f27..5ead66f3dcb2 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -667,7 +667,7 @@ IR_KEYTAB_TYPE ir_codes_pinnacle_grey[IR_KEYTAB_SIZE] = {
[ 0x1f ] = KEY_L,
[ 0x2b ] = KEY_I,
- [ 0x2d ] = KEY_ZOOM,
+ [ 0x2d ] = KEY_SCREEN,
[ 0x1e ] = KEY_ZOOM,
[ 0x1b ] = KEY_VOLUMEUP,
[ 0x0f ] = KEY_VOLUMEDOWN,
@@ -682,12 +682,12 @@ IR_KEYTAB_TYPE ir_codes_pinnacle_grey[IR_KEYTAB_SIZE] = {
[ 0x3f ] = KEY_UP,
[ 0x3e ] = KEY_DOWN,
- [ 0x1a ] = KEY_PAUSE,
+ [ 0x1a ] = KEY_ENTER,
[ 0x1d ] = KEY_MENU,
- [ 0x19 ] = KEY_PLAY,
- [ 0x16 ] = KEY_REWIND,
- [ 0x13 ] = KEY_FORWARD,
+ [ 0x19 ] = KEY_AGAIN,
+ [ 0x16 ] = KEY_PREVIOUSSONG,
+ [ 0x13 ] = KEY_NEXTSONG,
[ 0x15 ] = KEY_PAUSE,
[ 0x0e ] = KEY_REWIND,
[ 0x0d ] = KEY_PLAY,