diff options
| author | Steven Toth <stoth@hauppauge.com> | 2008-01-17 20:04:20 -0500 |
|---|---|---|
| committer | Steven Toth <stoth@hauppauge.com> | 2008-01-17 20:04:20 -0500 |
| commit | 8fc0933217b6f50fc0e535d90580b68f1c614db5 (patch) | |
| tree | 21abd871c919db948088cbbf1ce942b9cf958eaf /linux/drivers/media/video/cx88/cx88-input.c | |
| parent | 34ea7bfe97b2fc9f3cb86a3065cbb89e1f43b3af (diff) | |
| parent | 42de0c9d677d2af4e41ed7fe4c149427ebeb271e (diff) | |
| download | mediapointer-dvb-s2-8fc0933217b6f50fc0e535d90580b68f1c614db5.tar.gz mediapointer-dvb-s2-8fc0933217b6f50fc0e535d90580b68f1c614db5.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/build-fix
From: Steven Toth <stoth@hauppauge.com>
merge: http://linuxtv.org/hg/~mkrufky/build-fix
Signed-off-by: Steven Toth <stoth@hauppauge.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 fc6f476af..66f4423c4 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -237,6 +237,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: case CX88_BOARD_HAUPPAUGE_HVR1100: case CX88_BOARD_HAUPPAUGE_HVR3000: + case CX88_BOARD_PINNACLE_PCTV_HD_800i: ir_codes = ir_codes_hauppauge_new; ir_type = IR_TYPE_RC5; ir->sampling = 1; @@ -466,6 +467,7 @@ void cx88_ir_irq(struct cx88_core *core) case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: case CX88_BOARD_HAUPPAUGE_HVR1100: case CX88_BOARD_HAUPPAUGE_HVR3000: + case CX88_BOARD_PINNACLE_PCTV_HD_800i: ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7); ir_dprintk("biphase decoded: %x\n", ircode); if ((ircode & 0xfffff000) != 0x3000) |