V4L/DVB (3269): ioctls cleanups.
[pandora-kernel.git] / drivers / media / video / em28xx / em28xx-i2c.c
index a7b6f67..0591a70 100644 (file)
@@ -1,11 +1,10 @@
 /*
-   em2820-i2c.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
+   em28xx-i2c.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
 
-   Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>
-                      Ludovico Cavedon <cavedon@sssup.it>
-                      Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-
-   Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>
+   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
+                     Markus Rechberger <mrechberger@gmail.com>
+                     Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+                     Sascha Sommer <saschasommer@freenet.de>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 #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 "em28xx.h"
+#include <media/v4l2-common.h>
+#include <media/tuner.h>
 
 /* ----------------------------------------------------------- */
 
@@ -41,20 +41,17 @@ static unsigned int i2c_debug = 0;
 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, \
+#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)
-#define dprintk2(fmt, args...) if (i2c_debug) do {\
-                       printk(fmt , ##args); } while (0)
 
 /*
  * em2800_i2c_send_max4()
  * send up to 4 bytes to the i2c device
  */
-static int em2800_i2c_send_max4(struct em2820 *dev, unsigned char addr,
+static int em2800_i2c_send_max4(struct em28xx *dev, unsigned char addr,
                                char *buf, int len)
 {
        int ret;
@@ -71,19 +68,19 @@ static int em2800_i2c_send_max4(struct em2820 *dev, unsigned char addr,
        if (len > 3)
                b2[0] = buf[3];
 
-       ret = dev->em2820_write_regs(dev, 4 - len, &b2[4 - len], 2 + len);
+       ret = dev->em28xx_write_regs(dev, 4 - len, &b2[4 - len], 2 + len);
        if (ret != 2 + len) {
-               em2820_warn("writting to i2c device failed (error=%i)\n", ret);
+               em28xx_warn("writting to i2c device failed (error=%i)\n", ret);
                return -EIO;
        }
        for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0;
             write_timeout -= 5) {
-               ret = dev->em2820_read_reg(dev, 0x05);
+               ret = dev->em28xx_read_reg(dev, 0x05);
                if (ret == 0x80 + len - 1)
                        return len;
                mdelay(5);
        }
-       em2820_warn("i2c write timed out\n");
+       em28xx_warn("i2c write timed out\n");
        return -EIO;
 }
 
@@ -98,7 +95,7 @@ static int em2800_i2c_send_bytes(void *data, unsigned char addr, char *buf,
        int wrcount = 0;
        int count;
        int maxLen = 4;
-       struct em2820 *dev = (struct em2820 *)data;
+       struct em28xx *dev = (struct em28xx *)data;
        while (len > 0) {
                count = (len > maxLen) ? maxLen : len;
                ret = em2800_i2c_send_max4(dev, addr, bufPtr, count);
@@ -116,27 +113,27 @@ static int em2800_i2c_send_bytes(void *data, unsigned char addr, char *buf,
  * em2800_i2c_check_for_device()
  * check if there is a i2c_device at the supplied address
  */
-static int em2800_i2c_check_for_device(struct em2820 *dev, unsigned char addr)
+static int em2800_i2c_check_for_device(struct em28xx *dev, unsigned char addr)
 {
        char msg;
        int ret;
        int write_timeout;
        msg = addr;
-       ret = dev->em2820_write_regs(dev, 0x04, &msg, 1);
+       ret = dev->em28xx_write_regs(dev, 0x04, &msg, 1);
        if (ret < 0) {
-               em2820_warn("setting i2c device address failed (error=%i)\n",
+               em28xx_warn("setting i2c device address failed (error=%i)\n",
                            ret);
                return ret;
        }
        msg = 0x84;
-       ret = dev->em2820_write_regs(dev, 0x05, &msg, 1);
+       ret = dev->em28xx_write_regs(dev, 0x05, &msg, 1);
        if (ret < 0) {
-               em2820_warn("preparing i2c read failed (error=%i)\n", ret);
+               em28xx_warn("preparing i2c read failed (error=%i)\n", ret);
                return ret;
        }
        for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0;
             write_timeout -= 5) {
-               unsigned msg = dev->em2820_read_reg(dev, 0x5);
+               unsigned msg = dev->em28xx_read_reg(dev, 0x5);
                if (msg == 0x94)
                        return -ENODEV;
                else if (msg == 0x84)
@@ -150,21 +147,21 @@ static int em2800_i2c_check_for_device(struct em2820 *dev, unsigned char addr)
  * em2800_i2c_recv_bytes()
  * read from the i2c device
  */
-static int em2800_i2c_recv_bytes(struct em2820 *dev, unsigned char addr,
+static int em2800_i2c_recv_bytes(struct em28xx *dev, unsigned char addr,
                                 char *buf, int len)
 {
        int ret;
        /* check for the device and set i2c read address */
        ret = em2800_i2c_check_for_device(dev, addr);
        if (ret) {
-               em2820_warn
+               em28xx_warn
                    ("preparing read at i2c address 0x%x failed (error=%i)\n",
                     addr, ret);
                return ret;
        }
-       ret = dev->em2820_read_reg_req_len(dev, 0x0, 0x3, buf, len);
+       ret = dev->em28xx_read_reg_req_len(dev, 0x0, 0x3, buf, len);
        if (ret < 0) {
-               em2820_warn("reading from i2c device at 0x%x failed (error=%i)",
+               em28xx_warn("reading from i2c device at 0x%x failed (error=%i)",
                            addr, ret);
                return ret;
        }
@@ -172,82 +169,82 @@ static int em2800_i2c_recv_bytes(struct em2820 *dev, unsigned char addr,
 }
 
 /*
- * em2820_i2c_send_bytes()
+ * em28xx_i2c_send_bytes()
  * untested for more than 4 bytes
  */
-static int em2820_i2c_send_bytes(void *data, unsigned char addr, char *buf,
+static int em28xx_i2c_send_bytes(void *data, unsigned char addr, char *buf,
                                 short len, int stop)
 {
        int wrcount = 0;
-       struct em2820 *dev = (struct em2820 *)data;
+       struct em28xx *dev = (struct em28xx *)data;
 
-       wrcount = dev->em2820_write_regs_req(dev, stop ? 2 : 3, addr, buf, len);
+       wrcount = dev->em28xx_write_regs_req(dev, stop ? 2 : 3, addr, buf, len);
 
        return wrcount;
 }
 
 /*
- * em2820_i2c_recv_bytes()
+ * em28xx_i2c_recv_bytes()
  * read a byte from the i2c device
  */
-static int em2820_i2c_recv_bytes(struct em2820 *dev, unsigned char addr,
+static int em28xx_i2c_recv_bytes(struct em28xx *dev, unsigned char addr,
                                 char *buf, int len)
 {
        int ret;
-       ret = dev->em2820_read_reg_req_len(dev, 2, addr, buf, len);
+       ret = dev->em28xx_read_reg_req_len(dev, 2, addr, buf, len);
        if (ret < 0) {
-               em2820_warn("reading i2c device failed (error=%i)\n", ret);
+               em28xx_warn("reading i2c device failed (error=%i)\n", ret);
                return ret;
        }
-       if (dev->em2820_read_reg(dev, 0x5) != 0)
+       if (dev->em28xx_read_reg(dev, 0x5) != 0)
                return -ENODEV;
        return ret;
 }
 
 /*
- * em2820_i2c_check_for_device()
+ * em28xx_i2c_check_for_device()
  * check if there is a i2c_device at the supplied address
  */
-static int em2820_i2c_check_for_device(struct em2820 *dev, unsigned char addr)
+static int em28xx_i2c_check_for_device(struct em28xx *dev, unsigned char addr)
 {
        char msg;
        int ret;
        msg = addr;
 
-       ret = dev->em2820_read_reg_req(dev, 2, addr);
+       ret = dev->em28xx_read_reg_req(dev, 2, addr);
        if (ret < 0) {
-               em2820_warn("reading from i2c device failed (error=%i)\n", ret);
+               em28xx_warn("reading from i2c device failed (error=%i)\n", ret);
                return ret;
        }
-       if (dev->em2820_read_reg(dev, 0x5) != 0)
+       if (dev->em28xx_read_reg(dev, 0x5) != 0)
                return -ENODEV;
        return 0;
 }
 
 /*
- * em2820_i2c_xfer()
+ * em28xx_i2c_xfer()
  * the main i2c transfer function
  */
-static int em2820_i2c_xfer(struct i2c_adapter *i2c_adap,
+static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap,
                           struct i2c_msg msgs[], int num)
 {
-       struct em2820 *dev = i2c_adap->algo_data;
+       struct em28xx *dev = i2c_adap->algo_data;
        int addr, rc, i, byte;
 
        if (num <= 0)
                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 */
                        if (dev->is_em2800)
                                rc = em2800_i2c_check_for_device(dev, addr);
                        else
-                               rc = em2820_i2c_check_for_device(dev, addr);
+                               rc = em28xx_i2c_check_for_device(dev, addr);
                        if (rc < 0) {
-                               dprintk2(" no device\n");
+                               dprintk2(2," no device\n");
                                return rc;
                        }
 
@@ -258,17 +255,17 @@ static int em2820_i2c_xfer(struct i2c_adapter *i2c_adap,
                                                           msgs[i].buf,
                                                           msgs[i].len);
                        else
-                               rc = em2820_i2c_recv_bytes(dev, addr,
+                               rc = em28xx_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]);
                        }
@@ -277,27 +274,27 @@ static int em2820_i2c_xfer(struct i2c_adapter *i2c_adap,
                                                           msgs[i].buf,
                                                           msgs[i].len);
                        else
-                               rc = em2820_i2c_send_bytes(dev, addr,
+                               rc = em28xx_i2c_send_bytes(dev, addr,
                                                           msgs[i].buf,
                                                           msgs[i].len,
                                                           i == num - 1);
                        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;
 }
 
-static int em2820_i2c_eeprom(struct em2820 *dev, unsigned char *eedata, int len)
+static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
 {
        unsigned char buf, *p = eedata;
-       struct em2820_eeprom *em_eeprom = (void *)eedata;
+       struct em28xx_eeprom *em_eeprom = (void *)eedata;
        int i, err, size = len, block;
 
        dev->i2c_client.addr = 0xa0 >> 1;
@@ -376,6 +373,9 @@ static int em2820_i2c_eeprom(struct em2820 *dev, unsigned char *eedata, int len)
                printk(KERN_INFO "200mA max power\n");
                break;
        }
+       printk(KERN_INFO "Table at 0x%02x, strings=0x%04x, 0x%04x, 0x%04x\n",
+                               em_eeprom->string_idx_table,em_eeprom->string1,
+                               em_eeprom->string2,em_eeprom->string3);
 
        return 0;
 }
@@ -411,9 +411,9 @@ static void dec_use(struct i2c_adapter *adap)
 }
 #endif
 
-static int em2820_set_tuner(int check_eeprom, struct i2c_client *client)
+static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client)
 {
-       struct em2820 *dev = client->adapter->algo_data;
+       struct em28xx *dev = client->adapter->algo_data;
        struct tuner_setup tun_setup;
 
        if (dev->has_tuner) {
@@ -421,7 +421,7 @@ static int em2820_set_tuner(int check_eeprom, struct i2c_client *client)
                tun_setup.type = dev->tuner_type;
                tun_setup.addr = dev->tuner_addr;
 
-               em2820_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup);
+               em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup);
        }
 
        return (0);
@@ -434,60 +434,68 @@ static int em2820_set_tuner(int check_eeprom, struct i2c_client *client)
  */
 static int attach_inform(struct i2c_client *client)
 {
-       struct em2820 *dev = client->adapter->algo_data;
+       struct em28xx *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);
+                       em28xx_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
+                       break;
+               case 0x42:
+                       dprintk1(1,"attach_inform: saa7114 detected.\n");
                        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);
+                       em28xx_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);
+                       em28xx_set_tuner(-1, client);
        }
 
        return 0;
 }
 
-static struct i2c_algorithm em2820_algo = {
-       .master_xfer   = em2820_i2c_xfer,
+static struct i2c_algorithm em28xx_algo = {
+       .master_xfer   = em28xx_i2c_xfer,
        .algo_control  = algo_control,
        .functionality = functionality,
 };
 
-static struct i2c_adapter em2820_adap_template = {
+static struct i2c_adapter em28xx_adap_template = {
 #ifdef I2C_PEC
        .owner = THIS_MODULE,
 #else
        .inc_use = inc_use,
        .dec_use = dec_use,
 #endif
-#ifdef I2C_CLASS_TV_ANALOG
        .class = I2C_CLASS_TV_ANALOG,
-#endif
-       .name = "em2820",
-       .id = I2C_HW_B_EM2820,
-       .algo = &em2820_algo,
+       .name = "em28xx",
+       .id = I2C_HW_B_EM28XX,
+       .algo = &em28xx_algo,
        .client_register = attach_inform,
 };
 
-static struct i2c_client em2820_client_template = {
-       .name = "em2820 internal",
-       .flags = I2C_CLIENT_ALLOW_USE,
+static struct i2c_client em28xx_client_template = {
+       .name = "em28xx internal",
 };
 
 /* ----------------------------------------------------------- */
@@ -532,33 +540,33 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
 }
 
 /*
- * em2820_i2c_call_clients()
+ * em28xx_i2c_call_clients()
  * send commands to all attached i2c devices
  */
-void em2820_i2c_call_clients(struct em2820 *dev, unsigned int cmd, void *arg)
+void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg)
 {
        BUG_ON(NULL == dev->i2c_adap.algo_data);
        i2c_clients_command(&dev->i2c_adap, cmd, arg);
 }
 
 /*
- * em2820_i2c_register()
+ * em28xx_i2c_register()
  * register i2c bus
  */
-int em2820_i2c_register(struct em2820 *dev)
+int em28xx_i2c_register(struct em28xx *dev)
 {
-       BUG_ON(!dev->em2820_write_regs || !dev->em2820_read_reg);
-       BUG_ON(!dev->em2820_write_regs_req || !dev->em2820_read_reg_req);
-       dev->i2c_adap = em2820_adap_template;
+       BUG_ON(!dev->em28xx_write_regs || !dev->em28xx_read_reg);
+       BUG_ON(!dev->em28xx_write_regs_req || !dev->em28xx_read_reg_req);
+       dev->i2c_adap = em28xx_adap_template;
        dev->i2c_adap.dev.parent = &dev->udev->dev;
        strcpy(dev->i2c_adap.name, dev->name);
        dev->i2c_adap.algo_data = dev;
        i2c_add_adapter(&dev->i2c_adap);
 
-       dev->i2c_client = em2820_client_template;
+       dev->i2c_client = em28xx_client_template;
        dev->i2c_client.adapter = &dev->i2c_adap;
 
-       em2820_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
+       em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
 
        if (i2c_scan)
                do_i2c_scan(dev->name, &dev->i2c_client);
@@ -566,10 +574,10 @@ int em2820_i2c_register(struct em2820 *dev)
 }
 
 /*
- * em2820_i2c_unregister()
+ * em28xx_i2c_unregister()
  * unregister i2c_bus
  */
-int em2820_i2c_unregister(struct em2820 *dev)
+int em28xx_i2c_unregister(struct em28xx *dev)
 {
        i2c_del_adapter(&dev->i2c_adap);
        return 0;