aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMalcolm Valentine <farkit@iinet.net.au>2006-05-29 12:56:24 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:05:03 -0400
commit2de873e630b9385c6cd5896753335c5bf4829f0c (patch)
treed95fd36f5b3b50b83f062851415e82c463723704 /drivers/media/video
parent4bd6e9d968af68c73bee92bd93cd56937e2e80d8 (diff)
V4L/DVB (4057): Cx88: IR remote support for DTV2000H
Adds support for the Y0400052 remote supplied with this card. In addition to adding a number of buttons to the current winfast definition, it enables all the keys currently masked out with #ifdef 0. It is supplied separately as it remaps two keys from the current definition, The teletext button now sends KEY_TEXT instead of KEY_SUBTITLE, as that keycode is used by the subtitle button. KEY_BACK was changed to KEY_LAST to group it with KEY_NEXT. Other then that the keys don't overlap, so this should support several different versions of the Leadtek remotes. Signed-off-by: Malcolm Valentine <farkit@iinet.net.au> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx88/cx88-input.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 4bd86c4fd1b2..f599cfc5aba0 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -191,12 +191,13 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
191 ir_type = IR_TYPE_RC5; 191 ir_type = IR_TYPE_RC5;
192 ir->sampling = 1; 192 ir->sampling = 1;
193 break; 193 break;
194 case CX88_BOARD_WINFAST_DTV2000H:
194 case CX88_BOARD_WINFAST2000XP_EXPERT: 195 case CX88_BOARD_WINFAST2000XP_EXPERT:
195 ir_codes = ir_codes_winfast; 196 ir_codes = ir_codes_winfast;
196 ir->gpio_addr = MO_GP0_IO; 197 ir->gpio_addr = MO_GP0_IO;
197 ir->mask_keycode = 0x8f8; 198 ir->mask_keycode = 0x8f8;
198 ir->mask_keyup = 0x100; 199 ir->mask_keyup = 0x100;
199 ir->polling = 1; /* ms */ 200 ir->polling = 50; /* ms */
200 break; 201 break;
201 case CX88_BOARD_IODATA_GVBCTV7E: 202 case CX88_BOARD_IODATA_GVBCTV7E:
202 ir_codes = ir_codes_iodata_bctv7e; 203 ir_codes = ir_codes_iodata_bctv7e;