summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <devnull@localhost>2006-01-18 20:21:46 +0000
committerNickolay V. Shmyrev <devnull@localhost>2006-01-18 20:21:46 +0000
commitf3a729df581ce28d255721c36eaff2193df74da3 (patch)
treebdcff5fde727bc40a9764de074dba1a0afe116cf /linux/drivers/media/video/saa7134
parenta75d791caf5378684e185ffdb8ac91881e240d71 (diff)
downloadmediapointer-dvb-s2-f3a729df581ce28d255721c36eaff2193df74da3.tar.gz
mediapointer-dvb-s2-f3a729df581ce28d255721c36eaff2193df74da3.tar.bz2
Remove duplicated keymaps and add keymap for KWorld LTV883IR.
From: Nickolay V. Shmyrev <nshmyrev@yandex.ru> * linux/drivers/media/common/ir-keymaps.c: * linux/drivers/media/video/bttv-input.c: (bttv_input_init): * linux/drivers/media/video/cx88/cx88-input.c: (cx88_ir_init): * linux/drivers/media/video/saa7134/saa7134-input.c: (saa7134_input_init1): * linux/include/media/ir-common.h: - Remove duplicated keymaps and add keymap for KWorld LTV883IR. Thanks to Jon Ferguson <jon@sd-6.org>. Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-input.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index a7a01585e..36c3029f9 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-input.c,v 1.52 2006/01/17 21:54:41 rmcc Exp $
+ * $Id: saa7134-input.c,v 1.53 2006/01/18 20:21:47 nsh Exp $
*
* handle saa7134 IR remotes via linux kernel input layer.
*
@@ -171,7 +171,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
break;
case SAA7134_BOARD_KWORLD_XPERT:
case SAA7134_BOARD_AVACSSMARTTV:
- ir_codes = ir_codes_avacssmart;
+ ir_codes = ir_codes_pixelview;
mask_keycode = 0x00001F;
mask_keyup = 0x000020;
polling = 50; // ms
@@ -192,7 +192,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
break;
case SAA7134_BOARD_KWORLD_TERMINATOR:
- ir_codes = ir_codes_avacssmart;
+ ir_codes = ir_codes_pixelview;
mask_keycode = 0x00001f;
mask_keyup = 0x000060;
polling = 50; // ms