diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2006-01-18 20:21:46 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2006-01-18 20:21:46 +0000 |
| commit | f3a729df581ce28d255721c36eaff2193df74da3 (patch) | |
| tree | bdcff5fde727bc40a9764de074dba1a0afe116cf /linux/drivers/media/video | |
| parent | a75d791caf5378684e185ffdb8ac91881e240d71 (diff) | |
| download | mediapointer-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')
| -rw-r--r-- | linux/drivers/media/video/bttv-input.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 9 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-input.c | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/linux/drivers/media/video/bttv-input.c b/linux/drivers/media/video/bttv-input.c index 54e67f5df..245fccc8e 100644 --- a/linux/drivers/media/video/bttv-input.c +++ b/linux/drivers/media/video/bttv-input.c @@ -1,5 +1,5 @@ /* - * $Id: bttv-input.c,v 1.6 2006/01/17 20:05:21 rmcc Exp $ + * $Id: bttv-input.c,v 1.7 2006/01/18 20:21:46 nsh Exp $ * * Copyright (c) 2003 Gerd Knorr * Copyright (c) 2003 Pavel Machek @@ -330,7 +330,7 @@ int bttv_input_init(struct bttv *btv) ir->polling = 50; // ms break; case BTTV_BOARD_CONCEPTRONIC_CTVFMI2: - ir_codes = ir_codes_conceptronic; + ir_codes = ir_codes_pixelview; ir->mask_keycode = 0x001F00; ir->mask_keyup = 0x006000; ir->polling = 50; // ms diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index 912a9f009..5dd0acaa9 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-input.c,v 1.31 2006/01/17 20:05:21 rmcc Exp $ + * $Id: cx88-input.c,v 1.32 2006/01/18 20:21:47 nsh Exp $ * * Device driver for GPIO attached remote control interfaces * on Conexant 2388x based TV/DVB cards. @@ -194,6 +194,13 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ir->mask_keyup = 0x80; ir->polling = 1; /* ms */ break; + case CX88_BOARD_KWORLD_LTV883: + ir_codes = ir_codes_pixelview; + ir->gpio_addr = MO_GP1_IO; + ir->mask_keycode = 0x1f; + ir->mask_keyup = 0x60; + ir->polling = 1; /* ms */ + break; case CX88_BOARD_ADSTECH_DVB_T_PCI: ir_codes = ir_codes_adstech_dvb_t_pci; ir->gpio_addr = MO_GP1_IO; 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 |