diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-01 05:02:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-01 05:02:59 -0300 |
| commit | dd4931dd692b5001b3ccb4d7d74c1d4481f3a7be (patch) | |
| tree | 159af14f7ff781703660d7f12a142b90ef64e52c /linux/drivers/media/video/cx88/cx88-input.c | |
| parent | 3d5f82276e18a37806603a52b23d18c8b60b5d01 (diff) | |
| parent | d7709cc1d93ee6c75fc6e421ae5e8646aff438a7 (diff) | |
| download | mediapointer-dvb-s2-dd4931dd692b5001b3ccb4d7d74c1d4481f3a7be.tar.gz mediapointer-dvb-s2-dd4931dd692b5001b3ccb4d7d74c1d4481f3a7be.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-av-core
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 dad809335..7c5e94916 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_DTV1800H: case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL: gpio = (gpio & 0x6ff) | ((cx_read(MO_GP1_IO) << 8) & 0x900); auxgpio = gpio; @@ -237,6 +238,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ir->sampling = 1; break; case CX88_BOARD_WINFAST_DTV2000H: + case CX88_BOARD_WINFAST_DTV1800H: ir_codes = ir_codes_winfast; ir->gpio_addr = MO_GP0_IO; ir->mask_keycode = 0x8f8; |