diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-14 08:36:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-14 08:36:50 -0300 |
| commit | f73d4223cf12d0d65a3bd9d6da0ff8807c86d064 (patch) | |
| tree | 69f2f087b6053c218a8f5431f56aff437c8ee538 /linux/drivers/media/video/cx88/cx88-input.c | |
| parent | 7e2fc0b0dd4648fcd4c2ca82093aebcfaed3e863 (diff) | |
| parent | bdef8c3d9a3ba2fab464529580ae8028d74e8aff (diff) | |
| download | mediapointer-dvb-s2-f73d4223cf12d0d65a3bd9d6da0ff8807c86d064.tar.gz mediapointer-dvb-s2-f73d4223cf12d0d65a3bd9d6da0ff8807c86d064.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/k2c2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-input.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index facb2e800..dad809335 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -92,6 +92,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir) gpio=(gpio & 0x7fd) + (auxgpio & 0xef); break; case CX88_BOARD_WINFAST_DTV1000: + case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL: gpio = (gpio & 0x6ff) | ((cx_read(MO_GP1_IO) << 8) & 0x900); auxgpio = gpio; break; @@ -244,6 +245,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) break; case CX88_BOARD_WINFAST2000XP_EXPERT: case CX88_BOARD_WINFAST_DTV1000: + case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL: ir_codes = ir_codes_winfast; ir->gpio_addr = MO_GP0_IO; ir->mask_keycode = 0x8f8; |