diff options
author | Manuel Capinha <mcapinha@gmail.com> | 2005-06-24 01:04:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:06:38 -0400 |
commit | 239df2e2b0e1f4f69fdf76fb67e865824029e8ab (patch) | |
tree | 57088068f1f464c9d1c71f9a4e9dccfcd5106c66 /drivers/media/video/cx88/cx88-input.c | |
parent | d81ef559daf2a8afa9292035d58b00e7cb23dd1a (diff) |
[PATCH] v4l: add support for PixelView Ultra Pro
The following patch adds support for the PixelView Ultra Pro video capture
card in v4l.
- It removes the remote control key definitions from ir-kbd-gpio.c and
moves them to ir-common.c so that they can be shared between bt878 and
cx88 based cards.
- The patch also moves the FUSIONHDTV_3_GOLD_Q card from number 27 to 28
to regain compatibility with the V4L cvs.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-input.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index af6ad8cdbdb7..fbf21dbe2511 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -261,6 +261,13 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
261 | ir->mask_keydown = 0x02; | 261 | ir->mask_keydown = 0x02; |
262 | ir->polling = 5; // ms | 262 | ir->polling = 5; // ms |
263 | break; | 263 | break; |
264 | case CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO: | ||
265 | ir_codes = ir_codes_pixelview; | ||
266 | ir->gpio_addr = MO_GP1_IO; | ||
267 | ir->mask_keycode = 0x1f; | ||
268 | ir->mask_keyup = 0x80; | ||
269 | ir->polling = 1; // ms | ||
270 | break; | ||
264 | } | 271 | } |
265 | if (NULL == ir_codes) { | 272 | if (NULL == ir_codes) { |
266 | kfree(ir); | 273 | kfree(ir); |