[PATCH] i2c: Drop i2c_driver.flags, 2 of 3
[linux-2.6.git] / drivers / media / video / tda9887.c
index 7e6e6dd..049b44e 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <media/audiochip.h>
 #include <media/tuner.h>
-#include <media/id.h>
+
 
 /* Chips:
    TDA9885 (PAL, NTSC)
@@ -23,6 +23,7 @@
       TDA9887 (world), TDA9885 (USA)
       Note: OP2 of tda988x must be set to 1, else MT2032 is disabled!
    - KNC One TV-Station RDS (saa7134)
+   - Hauppauge PVR-150/500 (possibly more)
 */
 
 
@@ -43,16 +44,23 @@ MODULE_LICENSE("GPL");
 /* ---------------------------------------------------------------------- */
 
 #define UNSET       (-1U)
-#define PREFIX      "tda9885/6/7: "
-#define dprintk     if (debug) printk
+#define tda9887_info(fmt, arg...) do {\
+       printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \
+                       i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0)
+#define tda9887_dbg(fmt, arg...) do {\
+       if (debug) \
+               printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \
+                       i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0)
 
 struct tda9887 {
        struct i2c_client  client;
        v4l2_std_id        std;
-       unsigned int       radio;
+       enum tuner_mode    mode;
        unsigned int       config;
        unsigned int       pinnacle_id;
        unsigned int       using_v4l2;
+       unsigned int       radio_mode;
+       unsigned char      data[4];
 };
 
 struct tvnorm {
@@ -178,7 +186,8 @@ static struct tvnorm tvnorms[] = {
                .name  = "SECAM-L",
                .b     = ( cPositiveAmTV  |
                           cQSS           ),
-               .e     = ( cAudioIF_6_5   |
+               .e     = ( cGating_36     |
+                          cAudioIF_6_5   |
                           cVideoIF_38_90 ),
        },{
                .std   = V4L2_STD_SECAM_DK,
@@ -195,7 +204,7 @@ static struct tvnorm tvnorms[] = {
                .b     = ( cNegativeFmTV  |
                           cQSS           ),
                .c     = ( cDeemphasisON  |
-                          cDeemphasis50  ),
+                          cDeemphasis75  ),
                .e     = ( cGating_36     |
                           cAudioIF_4_5   |
                           cVideoIF_45_75 ),
@@ -212,19 +221,29 @@ static struct tvnorm tvnorms[] = {
        }
 };
 
-static struct tvnorm radio = {
-       .name = "radio",
+static struct tvnorm radio_stereo = {
+       .name = "Radio Stereo",
+       .b    = ( cFmRadio       |
+                 cQSS           ),
+       .c    = ( cDeemphasisOFF |
+                 cAudioGain6 ),
+       .e    = ( cAudioIF_5_5   |
+                 cRadioIF_38_90 ),
+};
+
+static struct tvnorm radio_mono = {
+       .name = "Radio Mono",
        .b    = ( cFmRadio       |
                  cQSS           ),
        .c    = ( cDeemphasisON  |
-                 cDeemphasis50  ),
+                 cDeemphasis50),
        .e    = ( cAudioIF_5_5   |
                  cRadioIF_38_90 ),
 };
 
 /* ---------------------------------------------------------------------- */
 
-static void dump_read_message(unsigned char *buf)
+static void dump_read_message(struct tda9887 *t, unsigned char *buf)
 {
        static char *afc[16] = {
                "- 12.5 kHz",
@@ -244,15 +263,15 @@ static void dump_read_message(unsigned char *buf)
                "+ 37.5 kHz",
                "+ 12.5 kHz",
        };
-       printk(PREFIX "read: 0x%2x\n", buf[0]);
-       printk("  after power on : %s\n", (buf[0] & 0x01) ? "yes" : "no");
-       printk("  afc            : %s\n", afc[(buf[0] >> 1) & 0x0f]);
-       printk("  fmif level     : %s\n", (buf[0] & 0x20) ? "high" : "low");
-       printk("  afc window     : %s\n", (buf[0] & 0x40) ? "in" : "out");
-       printk("  vfi level      : %s\n", (buf[0] & 0x80) ? "high" : "low");
+       tda9887_info("read: 0x%2x\n", buf[0]);
+       tda9887_info("  after power on : %s\n", (buf[0] & 0x01) ? "yes" : "no");
+       tda9887_info("  afc            : %s\n", afc[(buf[0] >> 1) & 0x0f]);
+       tda9887_info("  fmif level     : %s\n", (buf[0] & 0x20) ? "high" : "low");
+       tda9887_info("  afc window     : %s\n", (buf[0] & 0x40) ? "in" : "out");
+       tda9887_info("  vfi level      : %s\n", (buf[0] & 0x80) ? "high" : "low");
 }
 
-static void dump_write_message(unsigned char *buf)
+static void dump_write_message(struct tda9887 *t, unsigned char *buf)
 {
        static char *sound[4] = {
                "AM/TV",
@@ -292,58 +311,58 @@ static void dump_write_message(unsigned char *buf)
                "44 MHz",
        };
 
-       printk(PREFIX "write: byte B 0x%02x\n",buf[1]);
-       printk("  B0   video mode      : %s\n",
+       tda9887_info("write: byte B 0x%02x\n",buf[1]);
+       tda9887_info("  B0   video mode      : %s\n",
               (buf[1] & 0x01) ? "video trap" : "sound trap");
-       printk("  B1   auto mute fm    : %s\n",
+       tda9887_info("  B1   auto mute fm    : %s\n",
               (buf[1] & 0x02) ? "yes" : "no");
-       printk("  B2   carrier mode    : %s\n",
+       tda9887_info("  B2   carrier mode    : %s\n",
               (buf[1] & 0x04) ? "QSS" : "Intercarrier");
-       printk("  B3-4 tv sound/radio  : %s\n",
+       tda9887_info("  B3-4 tv sound/radio  : %s\n",
               sound[(buf[1] & 0x18) >> 3]);
-       printk("  B5   force mute audio: %s\n",
+       tda9887_info("  B5   force mute audio: %s\n",
               (buf[1] & 0x20) ? "yes" : "no");
-       printk("  B6   output port 1   : %s\n",
+       tda9887_info("  B6   output port 1   : %s\n",
               (buf[1] & 0x40) ? "high (inactive)" : "low (active)");
-       printk("  B7   output port 2   : %s\n",
+       tda9887_info("  B7   output port 2   : %s\n",
               (buf[1] & 0x80) ? "high (inactive)" : "low (active)");
 
-       printk(PREFIX "write: byte C 0x%02x\n",buf[2]);
-       printk("  C0-4 top adjustment  : %s dB\n", adjust[buf[2] & 0x1f]);
-       printk("  C5-6 de-emphasis     : %s\n", deemph[(buf[2] & 0x60) >> 5]);
-       printk("  C7   audio gain      : %s\n",
+       tda9887_info("write: byte C 0x%02x\n",buf[2]);
+       tda9887_info("  C0-4 top adjustment  : %s dB\n", adjust[buf[2] & 0x1f]);
+       tda9887_info("  C5-6 de-emphasis     : %s\n", deemph[(buf[2] & 0x60) >> 5]);
+       tda9887_info("  C7   audio gain      : %s\n",
               (buf[2] & 0x80) ? "-6" : "0");
 
-       printk(PREFIX "write: byte E 0x%02x\n",buf[3]);
-       printk("  E0-1 sound carrier   : %s\n",
+       tda9887_info("write: byte E 0x%02x\n",buf[3]);
+       tda9887_info("  E0-1 sound carrier   : %s\n",
               carrier[(buf[3] & 0x03)]);
-       printk("  E6   l pll ganting   : %s\n",
+       tda9887_info("  E6   l pll gating   : %s\n",
               (buf[3] & 0x40) ? "36" : "13");
 
        if (buf[1] & 0x08) {
                /* radio */
-               printk("  E2-4 video if        : %s\n",
+               tda9887_info("  E2-4 video if        : %s\n",
                       rif[(buf[3] & 0x0c) >> 2]);
-               printk("  E7   vif agc output  : %s\n",
+               tda9887_info("  E7   vif agc output  : %s\n",
                       (buf[3] & 0x80)
                       ? ((buf[3] & 0x10) ? "fm-agc radio" : "sif-agc radio")
                       : "fm radio carrier afc");
        } else {
                /* video */
-               printk("  E2-4 video if        : %s\n",
+               tda9887_info("  E2-4 video if        : %s\n",
                       vif[(buf[3] & 0x1c) >> 2]);
-               printk("  E5   tuner gain      : %s\n",
+               tda9887_info("  E5   tuner gain      : %s\n",
                       (buf[3] & 0x80)
                       ? ((buf[3] & 0x20) ? "external" : "normal")
                       : ((buf[3] & 0x20) ? "minimum"  : "normal"));
-               printk("  E7   vif agc output  : %s\n",
+               tda9887_info("  E7   vif agc output  : %s\n",
                       (buf[3] & 0x80)
                       ? ((buf[3] & 0x20)
                          ? "pin3 port, pin22 vif agc out"
                          : "pin22 port, pin3 vif acg ext in")
                       : "pin3+pin22 port");
        }
-       printk("--\n");
+       tda9887_info("--\n");
 }
 
 /* ---------------------------------------------------------------------- */
@@ -353,8 +372,11 @@ static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)
        struct tvnorm *norm = NULL;
        int i;
 
-       if (t->radio) {
-               norm = &radio;
+       if (t->mode == T_RADIO) {
+               if (t->radio_mode == V4L2_TUNER_MODE_MONO)
+                       norm = &radio_mono;
+               else
+                       norm = &radio_stereo;
        } else {
                for (i = 0; i < ARRAY_SIZE(tvnorms); i++) {
                        if (tvnorms[i].std & t->std) {
@@ -364,11 +386,11 @@ static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)
                }
        }
        if (NULL == norm) {
-               dprintk(PREFIX "Oops: no tvnorm entry found\n");
+               tda9887_dbg("Unsupported tvnorm entry - audio muted\n");
                return -1;
        }
 
-       dprintk(PREFIX "configure for: %s\n",norm->name);
+       tda9887_dbg("configure for: %s\n",norm->name);
        buf[1] = norm->b;
        buf[2] = norm->c;
        buf[3] = norm->e;
@@ -443,6 +465,8 @@ static int tda9887_set_config(struct tda9887 *t, char *buf)
                        break;
                }
        }
+       if ((t->config & TDA9887_INTERCARRIER_NTSC) && (t->std & V4L2_STD_NTSC))
+               buf[1] &= ~cQSS;
        return 0;
 }
 
@@ -460,11 +484,11 @@ static int tda9887_set_pinnacle(struct tda9887 *t, char *buf)
                }
        }
        if (t->std & V4L2_STD_525_60) {
-                if ((5 == t->pinnacle_id) || (6 == t->pinnacle_id)) {
+               if ((5 == t->pinnacle_id) || (6 == t->pinnacle_id)) {
                        bCarrierMode = cIntercarrier;
                } else {
                        bCarrierMode = cQSS;
-                }
+               }
        }
 
        if (bCarrierMode != UNSET) {
@@ -490,21 +514,27 @@ static int tda9887_fixup_std(struct tda9887 *t)
                case 'B':
                case 'g':
                case 'G':
-                       dprintk(PREFIX "insmod fixup: PAL => PAL-BG\n");
+                       tda9887_dbg("insmod fixup: PAL => PAL-BG\n");
                        t->std = V4L2_STD_PAL_BG;
                        break;
                case 'i':
                case 'I':
-                       dprintk(PREFIX "insmod fixup: PAL => PAL-I\n");
+                       tda9887_dbg("insmod fixup: PAL => PAL-I\n");
                        t->std = V4L2_STD_PAL_I;
                        break;
                case 'd':
                case 'D':
                case 'k':
                case 'K':
-                       dprintk(PREFIX "insmod fixup: PAL => PAL-DK\n");
+                       tda9887_dbg("insmod fixup: PAL => PAL-DK\n");
                        t->std = V4L2_STD_PAL_DK;
                        break;
+               case '-':
+                       /* default parameter, do nothing */
+                       break;
+               default:
+                       tda9887_info("pal= argument not recognised\n");
+                       break;
                }
        }
        if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) {
@@ -513,14 +543,20 @@ static int tda9887_fixup_std(struct tda9887 *t)
                case 'D':
                case 'k':
                case 'K':
-                       dprintk(PREFIX "insmod fixup: SECAM => SECAM-DK\n");
+                       tda9887_dbg("insmod fixup: SECAM => SECAM-DK\n");
                        t->std = V4L2_STD_SECAM_DK;
                        break;
                case 'l':
                case 'L':
-                       dprintk(PREFIX "insmod fixup: SECAM => SECAM-L\n");
+                       tda9887_dbg("insmod fixup: SECAM => SECAM-L\n");
                        t->std = V4L2_STD_SECAM_L;
                        break;
+               case '-':
+                       /* default parameter, do nothing */
+                       break;
+               default:
+                       tda9887_info("secam= argument not recognised\n");
+                       break;
                }
        }
        return 0;
@@ -532,44 +568,40 @@ static int tda9887_status(struct tda9887 *t)
        int rc;
 
        memset(buf,0,sizeof(buf));
-        if (1 != (rc = i2c_master_recv(&t->client,buf,1)))
-                printk(PREFIX "i2c i/o error: rc == %d (should be 1)\n",rc);
-       dump_read_message(buf);
+       if (1 != (rc = i2c_master_recv(&t->client,buf,1)))
+               tda9887_info("i2c i/o error: rc == %d (should be 1)\n",rc);
+       dump_read_message(t, buf);
        return 0;
 }
 
 static int tda9887_configure(struct tda9887 *t)
 {
-       unsigned char buf[4];
        int rc;
 
-       memset(buf,0,sizeof(buf));
-       tda9887_set_tvnorm(t,buf);
-       buf[1] |= cOutputPort1Inactive;
-       buf[1] |= cOutputPort2Inactive;
+       memset(t->data,0,sizeof(t->data));
+       tda9887_set_tvnorm(t,t->data);
+
+       t->data[1] |= cOutputPort1Inactive;
+       t->data[1] |= cOutputPort2Inactive;
+
        if (UNSET != t->pinnacle_id) {
-               tda9887_set_pinnacle(t,buf);
+               tda9887_set_pinnacle(t,t->data);
        }
-       tda9887_set_config(t,buf);
-       tda9887_set_insmod(t,buf);
-
-#if 0
-       /* This as-is breaks some cards, must be fixed in a
-        * card-specific way, probably using TDA9887_SET_CONFIG to
-        * turn on/off port2 */
-       if (t->std & V4L2_STD_SECAM_L) {
-               /* secam fixup (FIXME: move this to tvnorms array?) */
-               buf[1] &= ~cOutputPort2Inactive;
+       tda9887_set_config(t,t->data);
+       tda9887_set_insmod(t,t->data);
+
+       if (t->mode == T_STANDBY) {
+               t->data[1] |= cForcedMuteAudioON;
        }
-#endif
 
-       dprintk(PREFIX "writing: b=0x%02x c=0x%02x e=0x%02x\n",
-               buf[1],buf[2],buf[3]);
+
+       tda9887_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n",
+               t->data[1],t->data[2],t->data[3]);
        if (debug > 1)
-               dump_write_message(buf);
+               dump_write_message(t, t->data);
 
-        if (4 != (rc = i2c_master_send(&t->client,buf,4)))
-                printk(PREFIX "i2c i/o error: rc == %d (should be 4)\n",rc);
+       if (4 != (rc = i2c_master_send(&t->client,t->data,4)))
+               tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc);
 
        if (debug > 2) {
                msleep_interruptible(1000);
@@ -584,19 +616,22 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
 {
        struct tda9887 *t;
 
-        client_template.adapter = adap;
-        client_template.addr    = addr;
+       client_template.adapter = adap;
+       client_template.addr    = addr;
 
-        printk(PREFIX "chip found @ 0x%x\n", addr<<1);
-
-        if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
-                return -ENOMEM;
+       if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
+               return -ENOMEM;
        memset(t,0,sizeof(*t));
+
        t->client      = client_template;
        t->std         = 0;
        t->pinnacle_id = UNSET;
-        i2c_set_clientdata(&t->client, t);
-        i2c_attach_client(&t->client);
+       t->radio_mode = V4L2_TUNER_MODE_STEREO;
+
+       tda9887_info("chip found @ 0x%x (%s)\n", addr<<1, adap->name);
+
+       i2c_set_clientdata(&t->client, t);
+       i2c_attach_client(&t->client);
 
        return 0;
 }
@@ -608,9 +643,9 @@ static int tda9887_probe(struct i2c_adapter *adap)
                return i2c_probe(adap, &addr_data, tda9887_attach);
 #else
        switch (adap->id) {
-       case I2C_ALGO_BIT | I2C_HW_B_BT848:
-       case I2C_ALGO_BIT | I2C_HW_B_RIVA:
-       case I2C_ALGO_SAA7134:
+       case I2C_HW_B_BT848:
+       case I2C_HW_B_RIVA:
+       case I2C_HW_SAA7134:
                return i2c_probe(adap, &addr_data, tda9887_attach);
                break;
        }
@@ -628,25 +663,32 @@ static int tda9887_detach(struct i2c_client *client)
 }
 
 #define SWITCH_V4L2    if (!t->using_v4l2 && debug) \
-                         printk(PREFIX "switching to v4l2\n"); \
-                         t->using_v4l2 = 1;
+                         tda9887_info("switching to v4l2\n"); \
+                         t->using_v4l2 = 1;
 #define CHECK_V4L2     if (t->using_v4l2) { if (debug) \
-                         printk(PREFIX "ignore v4l1 call\n"); \
-                         return 0; }
+                         tda9887_info("ignore v4l1 call\n"); \
+                         return 0; }
 
 static int
 tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
        struct tda9887 *t = i2c_get_clientdata(client);
 
-        switch (cmd) {
+       switch (cmd) {
 
        /* --- configuration --- */
        case AUDC_SET_RADIO:
-               t->radio = 1;
+       {
+               t->mode = T_RADIO;
                tda9887_configure(t);
                break;
-
+       }
+       case TUNER_SET_STANDBY:
+       {
+               t->mode = T_STANDBY;
+               tda9887_configure(t);
+               break;
+       }
        case AUDC_CONFIG_PINNACLE:
        {
                int *i = arg;
@@ -679,7 +721,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
                struct video_channel *vc = arg;
 
                CHECK_V4L2;
-               t->radio = 0;
+               t->mode = T_ANALOG_TV;
                if (vc->norm < ARRAY_SIZE(map))
                        t->std = map[vc->norm];
                tda9887_fixup_std(t);
@@ -691,7 +733,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
                v4l2_std_id *id = arg;
 
                SWITCH_V4L2;
-               t->radio = 0;
+               t->mode = T_ANALOG_TV;
                t->std   = *id;
                tda9887_fixup_std(t);
                tda9887_configure(t);
@@ -703,14 +745,14 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
                SWITCH_V4L2;
                if (V4L2_TUNER_ANALOG_TV == f->type) {
-                       if (t->radio == 0)
+                       if (t->mode == T_ANALOG_TV)
                                return 0;
-                       t->radio = 0;
+                       t->mode = T_ANALOG_TV;
                }
                if (V4L2_TUNER_RADIO == f->type) {
-                       if (t->radio == 1)
+                       if (t->mode == T_RADIO)
                                return 0;
-                       t->radio = 1;
+                       t->mode = T_RADIO;
                }
                tda9887_configure(t);
                break;
@@ -725,7 +767,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
                };
                struct v4l2_tuner* tuner = arg;
 
-               if (t->radio) {
+               if (t->mode == T_RADIO) {
                        __u8 reg = 0;
                        tuner->afc=0;
                        if (1 == i2c_master_recv(&t->client,&reg,1))
@@ -733,6 +775,21 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
                }
                break;
        }
+       case VIDIOC_S_TUNER:
+       {
+               struct v4l2_tuner* tuner = arg;
+
+               if (t->mode == T_RADIO) {
+                       t->radio_mode = tuner->audmode;
+                       tda9887_configure (t);
+               }
+               break;
+       }
+       case VIDIOC_LOG_STATUS:
+       {
+               tda9887_info("Data bytes: b=%02x c=%02x e=%02x\n", t->data[1], t->data[2], t->data[3]);
+               break;
+       }
        default:
                /* nothing */
                break;
@@ -740,18 +797,21 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
        return 0;
 }
 
-static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level)
+static int tda9887_suspend(struct device * dev, pm_message_t state)
 {
-       dprintk("tda9887: suspend\n");
+       struct i2c_client *c = container_of(dev, struct i2c_client, dev);
+       struct tda9887 *t = i2c_get_clientdata(c);
+
+       tda9887_dbg("suspend\n");
        return 0;
 }
 
-static int tda9887_resume(struct device * dev, u32 level)
+static int tda9887_resume(struct device * dev)
 {
        struct i2c_client *c = container_of(dev, struct i2c_client, dev);
        struct tda9887 *t = i2c_get_clientdata(c);
 
-       dprintk("tda9887: resume\n");
+       tda9887_dbg("resume\n");
        tda9887_configure(t);
        return 0;
 }
@@ -760,12 +820,11 @@ static int tda9887_resume(struct device * dev, u32 level)
 
 static struct i2c_driver driver = {
        .owner          = THIS_MODULE,
-        .name           = "i2c tda9887 driver",
-        .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = tda9887_probe,
-        .detach_client  = tda9887_detach,
-        .command        = tda9887_command,
+       .name           = "i2c tda9887 driver",
+       .id             = -1, /* FIXME */
+       .attach_adapter = tda9887_probe,
+       .detach_client  = tda9887_detach,
+       .command        = tda9887_command,
        .driver = {
                .suspend = tda9887_suspend,
                .resume  = tda9887_resume,
@@ -773,9 +832,9 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-       I2C_DEVNAME("tda9887"),
+       .name      = "tda9887",
        .flags     = I2C_CLIENT_ALLOW_USE,
-        .driver    = &driver,
+       .driver    = &driver,
 };
 
 static int __init tda9887_init_module(void)