[PATCH] v4l: 784: several improvement on i2c ir handling for em2820
- Several Improvement on I2C IR handling for em2820:
- moved Pinnacle IR table (ir_codes_em2820) to em2820-input.c
- IR struct renamed and moved to a header file.
- New file to handle em2820-specific IR.
- Some cleanups.
- attach now detects I2C IR and calls em2820-specific IR code
- IR compat code moved to compat.h
- New header with struct IR_i2c there, to allow it to be
used by board-specific input handlers.
- Some improvements at em28xx board detection:
- Board detection message improved to show interface and class.
- Now it doesn't touch audio interfaces.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index a7b6f67..f6bfc03 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -26,10 +26,10 @@
#include <linux/kernel.h>
#include <linux/usb.h>
#include <linux/i2c.h>
-#include <media/tuner.h>
#include <linux/video_decoder.h>
#include "em2820.h"
+#include <media/tuner.h>
/* ----------------------------------------------------------- */
@@ -41,14 +41,11 @@
module_param(i2c_debug, int, 0644);
MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
-#define dprintk(fmt, args...) if (i2c_debug) do {\
- printk(KERN_DEBUG "%s: %s: " fmt "\n",\
- dev->name, __FUNCTION__ , ##args); } while (0)
-#define dprintk1(fmt, args...) if (i2c_debug) do{ \
- printk(KERN_DEBUG "%s: %s: " fmt, \
- dev->name, __FUNCTION__ , ##args); } while (0)
-#define dprintk2(fmt, args...) if (i2c_debug) do {\
+#define dprintk1(lvl,fmt, args...) if (i2c_debug>=lvl) do {\
printk(fmt , ##args); } while (0)
+#define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \
+ printk(KERN_DEBUG "%s at %s: " fmt, \
+ dev->name, __FUNCTION__ , ##args); } while (0)
/*
* em2800_i2c_send_max4()
@@ -238,7 +235,7 @@
return 0;
for (i = 0; i < num; i++) {
addr = msgs[i].addr << 1;
- dprintk1("%s %s addr=%x len=%d:",
+ dprintk2(2,"%s %s addr=%x len=%d:",
(msgs[i].flags & I2C_M_RD) ? "read" : "write",
i == num - 1 ? "stop" : "nonstop", addr, msgs[i].len);
if (!msgs[i].len) { /* no len: check only for device presence */
@@ -247,7 +244,7 @@
else
rc = em2820_i2c_check_for_device(dev, addr);
if (rc < 0) {
- dprintk2(" no device\n");
+ dprintk2(2," no device\n");
return rc;
}
@@ -261,14 +258,14 @@
rc = em2820_i2c_recv_bytes(dev, addr,
msgs[i].buf,
msgs[i].len);
- if (i2c_debug) {
+ if (i2c_debug>=2) {
for (byte = 0; byte < msgs[i].len; byte++) {
printk(" %02x", msgs[i].buf[byte]);
}
}
} else {
/* write bytes */
- if (i2c_debug) {
+ if (i2c_debug>=2) {
for (byte = 0; byte < msgs[i].len; byte++)
printk(" %02x", msgs[i].buf[byte]);
}
@@ -284,13 +281,13 @@
if (rc < 0)
goto err;
}
- if (i2c_debug)
+ if (i2c_debug>=2)
printk("\n");
}
return num;
err:
- dprintk2(" ERROR: %i\n", rc);
+ dprintk2(2," ERROR: %i\n", rc);
return rc;
}
@@ -436,26 +433,34 @@
{
struct em2820 *dev = client->adapter->algo_data;
- dprintk("address %x", client->addr << 1);
switch (client->addr << 1) {
case 0x86:
em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
break;
case 0x4a:
- dprintk1("attach_inform: saa7113 detected.\n");
+ dprintk1(1,"attach_inform: saa7113 detected.\n");
break;
case 0xa0:
- dprintk1("attach_inform: eeprom detected.\n");
+ dprintk1(1,"attach_inform: eeprom detected.\n");
break;
+ case 0x60:
+ case 0x8e:
+ {
+ struct IR_i2c *ir = i2c_get_clientdata(client);
+ dprintk1(1,"attach_inform: IR detected (%s).\n",ir->phys);
+ em2820_set_ir(dev,ir);
+ break;
+ }
case 0x80:
case 0x88:
- dprintk1("attach_inform: msp34xx detected.\n");
+ dprintk1(1,"attach_inform: msp34xx detected.\n");
break;
case 0xb8:
case 0xba:
- dprintk1("attach_inform: tvp5150 detected.\n");
+ dprintk1(1,"attach_inform: tvp5150 detected.\n");
break;
default:
+ dprintk1(1,"attach inform: detected I2C address %x\n", client->addr << 1);
dev->tuner_addr = client->addr;
em2820_set_tuner(-1, client);
}