V4L/DVB (6954): There isn't a MTS radio firmware

[linux-2.6-omap-h63xx.git] / drivers / media / video / tuner-xc2028.c

diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index fd248a19c259b89e939d3574c447d0084f9fa63f..f191f6a4807068869ef360d053325d08a7e3f14a 100644 (file)
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -144,7 +144,8 @@ static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val)
        return 0;
 }
 
-void dump_firm_type(unsigned int type)
+#define dump_firm_type(t)      dump_firm_type_and_int_freq(t, 0)
+void dump_firm_type_and_int_freq(unsigned int type, u16 int_freq)
 {
         if (type & BASE)
                printk("BASE ");
@@ -206,6 +207,8 @@ void dump_firm_type(unsigned int type)
                printk("INPUT2 ");
         if (type & SCODE)
                printk("SCODE ");
+        if (type & HAS_IF)
+               printk("HAS_IF_%d ", int_freq);
 }
 
 static  v4l2_std_id parse_audio_std_option(void)
@@ -350,9 +353,9 @@ static int load_all_firmwares(struct dvb_frontend *fe)
                }
                tuner_dbg("Reading firmware type ");
                if (debug) {
-                       dump_firm_type(type);
+                       dump_firm_type_and_int_freq(type, int_freq);
                        printk("(%x), id %llx, size=%d.\n",
-                                  type, (unsigned long long)id, size);
+                              type, (unsigned long long)id, size);
                }
 
                memcpy(priv->firm[n].ptr, p, size);
@@ -392,6 +395,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
 {
        struct xc2028_data *priv = fe->tuner_priv;
        int                 i, best_i = -1, best_nr_matches = 0;
+       unsigned int        ign_firm_type_mask = 0;
 
        tuner_dbg("%s called, want type=", __FUNCTION__);
        if (debug) {
@@ -409,16 +413,18 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
 
        if (type & BASE)
                type &= BASE_TYPES;
-       else if (type & SCODE)
+       else if (type & SCODE) {
                type &= SCODE_TYPES;
-       else if (type & DTV_TYPES)
+               ign_firm_type_mask = HAS_IF;
+       } else if (type & DTV_TYPES)
                type &= DTV_TYPES;
        else if (type & STD_SPECIFIC_TYPES)
                type &= STD_SPECIFIC_TYPES;
 
        /* Seek for exact match */
        for (i = 0; i < priv->firm_size; i++) {
-               if ((type == priv->firm[i].type) && (*id == priv->firm[i].id))
+               if ((type == (priv->firm[i].type & ~ign_firm_type_mask)) &&
+                   (*id == priv->firm[i].id))
                        goto found;
        }
 
@@ -427,7 +433,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
                v4l2_std_id match_mask;
                int nr_matches;
 
-               if (type != priv->firm[i].type)
+               if (type != (priv->firm[i].type & ~ign_firm_type_mask))
                        continue;
 
                match_mask = *id & priv->firm[i].id;
@@ -589,7 +595,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
        } else {
                for (pos = 0; pos < priv->firm_size; pos++) {
                        if ((priv->firm[pos].int_freq == int_freq) &&
-                           (type & HAS_IF))
+                           (priv->firm[pos].type & HAS_IF))
                                break;
                }
                if (pos == priv->firm_size)
@@ -598,7 +604,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
 
        p = priv->firm[pos].ptr;
 
-       if (type & HAS_IF) {
+       if (priv->firm[pos].type & HAS_IF) {
                if (priv->firm[pos].size != 12 * 16 || scode >= 16)
                        return -EINVAL;
                p += 12 * scode;
@@ -612,7 +618,8 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
        }
 
        tuner_info("Loading SCODE for type=");
-       dump_firm_type(priv->firm[pos].type);
+       dump_firm_type_and_int_freq(priv->firm[pos].type,
+                                   priv->firm[pos].int_freq);
        printk("(%x), id %016llx.\n", priv->firm[pos].type,
               (unsigned long long)*id);
 
@@ -656,7 +663,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
                        return rc;
        }
 
-       if (priv->ctrl.mts)
+       if (priv->ctrl.mts && !(type & FM))
                type |= MTS;
 
 retry:
@@ -670,11 +677,15 @@ retry:
        tuner_dbg("checking firmware, user requested type=");
        if (debug) {
                dump_firm_type(new_fw.type);
-               printk("(%x), id %016llx, scode_tbl ", new_fw.type,
+               printk("(%x), id %016llx, ", new_fw.type,
                       (unsigned long long)new_fw.std_req);
-               dump_firm_type(priv->ctrl.scode_table);
-               printk("(%x), scode_nr %d\n", priv->ctrl.scode_table,
-                      new_fw.scode_nr);
+               if (!int_freq) {
+                       printk("scode_tbl ");
+                       dump_firm_type(priv->ctrl.scode_table);
+                       printk("(%x), ", priv->ctrl.scode_table);
+               } else
+                       printk("int_freq %d, ", new_fw.int_freq);
+               printk("scode_nr %d\n", new_fw.scode_nr);
        }
 
        /* No need to reload base firmware if it matches */
@@ -865,9 +876,20 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
         */
        if (new_mode == T_ANALOG_TV) {
                rc = send_seq(priv, {0x00, 0x00});
+       } else if (priv->cur_fw.type & ATSC) {
+               offset = 1750000;
        } else {
                offset = 2750000;
-               if (priv->cur_fw.type & DTV7)
+               /*
+                * We must adjust the offset by 500kHz in two cases in order
+                * to correctly center the IF output:
+                * 1) When the ZARLINK456 or DIBCOM52 tables were explicitly
+                *    selected and a 7MHz channel is tuned;
+                * 2) When tuning a VHF channel with DTV78 firmware.
+                */
+               if (((priv->cur_fw.type & DTV7) &&
+                    (priv->cur_fw.scode_table & (ZARLINK456 | DIBCOM52))) ||
+                   ((priv->cur_fw.type & DTV78) && freq < 470000000))
                        offset -= 500000;
        }
 
@@ -948,6 +970,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,
        struct xc2028_data *priv = fe->tuner_priv;
        unsigned int       type=0;
        fe_bandwidth_t     bw = BANDWIDTH_8_MHZ;
+       u16                demod = 0;
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
@@ -980,20 +1003,27 @@ static int xc2028_set_params(struct dvb_frontend *fe,
                return -EINVAL;
        }
 
-       /* FIXME:
-         There are two Scodes that will never be selected:
-               DTV78 ZARLINK456, DTV78 DIBCOM52
-         When it should opt for DTV78 instead of DTV7 or DTV8?
-       */
        switch (bw) {
        case BANDWIDTH_8_MHZ:
-               type |= DTV8 | F8MHZ;
+               if (p->frequency < 470000000)
+                       priv->ctrl.vhfbw7 = 0;
+               else
+                       priv->ctrl.uhfbw8 = 1;
+               type |= (priv->ctrl.vhfbw7 && priv->ctrl.uhfbw8) ? DTV78 : DTV8;
+               type |= F8MHZ;
                break;
        case BANDWIDTH_7_MHZ:
-               type |= DTV7 | F8MHZ;
+               if (p->frequency < 470000000)
+                       priv->ctrl.vhfbw7 = 1;
+               else
+                       priv->ctrl.uhfbw8 = 0;
+               type |= (priv->ctrl.vhfbw7 && priv->ctrl.uhfbw8) ? DTV78 : DTV7;
+               type |= F8MHZ;
                break;
        case BANDWIDTH_6_MHZ:
-               type |= DTV6 ;
+               type |= DTV6;
+               priv->ctrl.vhfbw7 = 0;
+               priv->ctrl.uhfbw8 = 0;
                break;
        default:
                tuner_err("error: bandwidth not supported.\n");
@@ -1001,10 +1031,10 @@ static int xc2028_set_params(struct dvb_frontend *fe,
 
        /* All S-code tables need a 200kHz shift */
        if (priv->ctrl.demod)
-               priv->ctrl.demod += 200;
+               demod = priv->ctrl.demod + 200;
 
        return generic_set_freq(fe, p->frequency,
-                               T_DIGITAL_TV, type, 0, priv->ctrl.demod);
+                               T_DIGITAL_TV, type, 0, demod);
 }
 
 static int xc2028_sleep(struct dvb_frontend *fe)
@@ -1113,7 +1143,8 @@ static const struct dvb_tuner_ops xc2028_dvb_tuner_ops = {
 
 };
 
-void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)
+struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
+                                  struct xc2028_config *cfg)
 {
        struct xc2028_data *priv;
        void               *video_dev;