Commit 066c8680 authored by Gerd Knorr's avatar Gerd Knorr Committed by Linus Torvalds

[PATCH] v4l: bttv IR input driver update

This patch enables IR support for one AverMedia card and drops a obsolete
function.
Signed-off-by: default avatarGerd Knorr <kraxel@bytesex.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8fbe5e62
/* /*
* $Id: ir-common.c,v 1.5 2004/11/07 13:17:15 kraxel Exp $ * $Id: ir-common.c,v 1.6 2004/12/10 12:33:39 kraxel Exp $
* *
* some common structs and functions to handle infrared remotes via * some common structs and functions to handle infrared remotes via
* input layer ... * input layer ...
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h>
#include <media/ir-common.h> #include <media/ir-common.h>
......
/* /*
* $Id: ir-kbd-gpio.c,v 1.10 2004/09/15 16:15:24 kraxel Exp $ * $Id: ir-kbd-gpio.c,v 1.11 2004/10/25 11:26:36 kraxel Exp $
* *
* Copyright (c) 2003 Gerd Knorr * Copyright (c) 2003 Gerd Knorr
* Copyright (c) 2003 Pavel Machek * Copyright (c) 2003 Pavel Machek
...@@ -366,7 +366,7 @@ static int ir_probe(struct device *dev) ...@@ -366,7 +366,7 @@ static int ir_probe(struct device *dev)
break; break;
case BTTV_AVDVBT_761: case BTTV_AVDVBT_761:
/* case BTTV_AVDVBT_771: */ case BTTV_AVDVBT_771:
ir_codes = ir_codes_avermedia_dvbt; ir_codes = ir_codes_avermedia_dvbt;
ir->mask_keycode = 0x0f00c0; ir->mask_keycode = 0x0f00c0;
ir->mask_keydown = 0x000020; ir->mask_keydown = 0x000020;
......
/* /*
* $Id: ir-kbd-i2c.c,v 1.8 2004/09/15 16:15:24 kraxel Exp $ * $Id: ir-kbd-i2c.c,v 1.10 2004/12/09 12:51:35 kraxel Exp $
* *
* keyboard input driver for i2c IR remote controls * keyboard input driver for i2c IR remote controls
* *
...@@ -433,7 +433,7 @@ static int ir_probe(struct i2c_adapter *adap) ...@@ -433,7 +433,7 @@ static int ir_probe(struct i2c_adapter *adap)
*/ */
static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1}; static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
static const int probe_saa7134[] = { 0x7a, -1}; static const int probe_saa7134[] = { 0x7a, -1 };
const int *probe = NULL; const int *probe = NULL;
struct i2c_client c; char buf; int i,rc; struct i2c_client c; char buf; int i,rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment