v4l: bttv IR input driver update

PATCH New Gerd Knorr 1 participant 1 message Jan 20, 2005 Media (V4L/DVB)

lore

Share & tools

lore

Gerd Knorr

author

2005-01-20 15:38 UTC #0 lore raw

PATCH 1/1 v4l: bttv IR input driver update

This patch enables IR support for one AverMedia card and drops a obsolete function.

Signed-off-by Gerd Knorr <[email protected]>

---
 drivers/media/common/ir-common.c  |    3 ++-
 drivers/media/video/ir-kbd-gpio.c |    4 ++--
 drivers/media/video/ir-kbd-i2c.c  |   14 ++------------
 3 files changed, 6 insertions(+), 15 deletions(-)

drivers/media/video/ir-kbd-gpio.c +2 -2

Index: linux-2004-12-16/drivers/media/video/ir-kbd-gpio.c
===================================================================
@@ -1,5 +1,5 @@
 /*
- * $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 Pavel Machek

@@ -366,7 +366,7 @@ static int ir_probe(struct device *dev)
 		break;
 
 	case BTTV_AVDVBT_761:
-	/* case BTTV_AVDVBT_771: */
+	case BTTV_AVDVBT_771:
 		ir_codes         = ir_codes_avermedia_dvbt;
 		ir->mask_keycode = 0x0f00c0;
 		ir->mask_keydown = 0x000020;

drivers/media/video/ir-kbd-i2c.c +2 ~~-12~~

Index: linux-2004-12-16/drivers/media/video/ir-kbd-i2c.c
===================================================================
@@ -1,5 +1,5 @@
 /*
- * $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
  *

@@ -155,16 +155,6 @@ module_param(debug, int, 0644);    /* de
 
 /* ----------------------------------------------------------------------- */
 
-static inline int reverse(int data, int bits)
-{
-	int i,c;
-
-	for (c=0,i=0; i<bits; i++) {
-		c |= (((data & (1<<i)) ? 1:0)) << (bits-1-i);
-	}
-	return c;
-}
-
 static int get_key_haup(struct IR *ir, u32 *ir_key, u32 *ir_raw)
 {
 	unsigned char buf[3];

@@ -443,7 +433,7 @@ static int ir_probe(struct i2c_adapter *
 	*/
 
 	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;
 	struct i2c_client c; char buf; int i,rc;

drivers/media/common/ir-common.c +2 -1

Index: linux-2004-12-16/drivers/media/common/ir-common.c
===================================================================
@@ -1,5 +1,5 @@
 /*
- * $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
  * input layer ...

@@ -22,6 +22,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 
 #include <media/ir-common.h>

Signature · 1 line

#define printk(args...) fprintf(stderr, ## args)