aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdgar Pisani <episani@onqweb.com.au>2007-06-25 13:46:05 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 13:24:20 -0400
commite7d11ecbde987e56845cff012b4a28d7001667b8 (patch)
treee1f25204e4c1056c9397c80f8dceb9a5ce75a509
parent39cf1e810a6b464a8469bf318f21206d84ffb1d8 (diff)
V4L/DVB (5787): Cx88: add remote control support for Leadtek Winfast DTV1000
Signed-off-by: Edgar Pisani <episani@onqweb.com.au> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/cx88/cx88-input.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 5915dbabd608..22cbdf2f0fdd 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -90,6 +90,9 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
90 auxgpio = cx_read(MO_GP1_IO); 90 auxgpio = cx_read(MO_GP1_IO);
91 /* Take out the parity part */ 91 /* Take out the parity part */
92 gpio=(gpio & 0x7fd) + (auxgpio & 0xef); 92 gpio=(gpio & 0x7fd) + (auxgpio & 0xef);
93 } else if (core->board == CX88_BOARD_WINFAST_DTV1000) {
94 gpio = (gpio & 0x6ff) | ((cx_read(MO_GP1_IO) << 8) & 0x900);
95 auxgpio = gpio;
93 } else 96 } else
94 auxgpio = gpio; 97 auxgpio = gpio;
95 98
@@ -231,6 +234,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
231 ir->polling = 50; /* ms */ 234 ir->polling = 50; /* ms */
232 break; 235 break;
233 case CX88_BOARD_WINFAST2000XP_EXPERT: 236 case CX88_BOARD_WINFAST2000XP_EXPERT:
237 case CX88_BOARD_WINFAST_DTV1000:
234 ir_codes = ir_codes_winfast; 238 ir_codes = ir_codes_winfast;
235 ir->gpio_addr = MO_GP0_IO; 239 ir->gpio_addr = MO_GP0_IO;
236 ir->mask_keycode = 0x8f8; 240 ir->mask_keycode = 0x8f8;