[PATCH] dvb: tda10046: support for different firmware versions

added support for different tda10046 firmware versions.  tested with v20, v21
and v25.  (Andreas Oberritter)

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware
index 3ffdcb394299f43b65f50c7df3898281504fd32c..a750f0101d9de7d15f47a13e0cc7240b3299ba1f 100644 (file)
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
@@ -107,7 +107,7 @@ sub tda10045 {
 sub tda10046 {
     my $sourcefile = "tt_budget_217g.zip";
     my $url = "http://www.technotrend.de/new/217g/$sourcefile";
-    my $hash = "a25b579e37109af60f4a36c37893957c";
+    my $hash = "6a7e1e2f2644b162ff0502367553c72d";
     my $outfile = "dvb-fe-tda10046.fw";
     my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
 
@@ -115,7 +115,7 @@ sub tda10046 {
 
     wgetfile($sourcefile, $url);
     unzip($sourcefile, $tmpdir);
-    extract("$tmpdir/software/OEM/PCI/App/ttlcdacc.dll", 0x3f731, 24479, "$tmpdir/fwtmp");
+    extract("$tmpdir/software/OEM/PCI/App/ttlcdacc.dll", 0x3f731, 24478, "$tmpdir/fwtmp");
     verify("$tmpdir/fwtmp", $hash);
     copy("$tmpdir/fwtmp", $outfile);
 

diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index ecfa8c7a97845ac0a8226588398532513552fd98..0beb370792ae30584d42398ccdb98273ecb86f91 100644 (file)
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -49,6 +49,7 @@ struct tda1004x_state {
        /* private demod data */
        u8 initialised;
        enum tda1004x_demod demod_type;
+       u8 fw_version;
 };
 
 
@@ -380,6 +381,25 @@ static int tda10045_fwupload(struct dvb_frontend* fe)
        return tda1004x_check_upload_ok(state, 0x2c);
 }
 
+static int tda10046_get_fw_version(struct tda1004x_state *state,
+                                  const struct firmware *fw)
+{
+       const unsigned char pattern[] = { 0x67, 0x00, 0x50, 0x62, 0x5e, 0x18, 0x67 };
+       unsigned int i;
+
+       /* area guessed from firmware v20, v21 and v25 */
+       for (i = 0x660; i < 0x700; i++) {
+               if (!memcmp(&fw->data[i], pattern, sizeof(pattern))) {
+                       state->fw_version = fw->data[i + sizeof(pattern)];
+                       printk(KERN_INFO "tda1004x: using firmware v%02x\n",
+                                       state->fw_version);
+                       return 0;
+               }
+       }
+
+       return -EINVAL;
+}
+
 static int tda10046_fwupload(struct dvb_frontend* fe)
 {
        struct tda1004x_state* state = fe->demodulator_priv;
@@ -393,7 +413,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
        msleep(100);
 
        /* don't re-upload unless necessary */
-       if (tda1004x_check_upload_ok(state, 0x20) == 0)
+       if (tda1004x_check_upload_ok(state, state->fw_version) == 0)
                return 0;
 
        /* request the firmware, this will block until someone uploads it */
@@ -404,6 +424,17 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
                return ret;
        }
 
+       if (fw->size < 24478) { /* size of firmware v20, which is the smallest of v20, v21 and v25 */
+               printk("tda1004x: firmware file seems to be too small (%d bytes)\n", fw->size);
+               return -EINVAL;
+       }
+
+       ret = tda10046_get_fw_version(state, fw);
+       if (ret < 0) {
+               printk("tda1004x: unable to find firmware version\n");
+               return ret;
+       }
+
        /* set parameters */
        tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 10);
        tda1004x_write_byteI(state, TDA10046H_CONFPLL3, state->config->n_i2c);
@@ -427,7 +458,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
                msleep(1);
        }
 
-       return tda1004x_check_upload_ok(state, 0x20);
+       return tda1004x_check_upload_ok(state, state->fw_version);
 }
 
 static int tda1004x_encode_fec(int fec)
@@ -1185,6 +1216,7 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
        memcpy(&state->ops, &tda10046_ops, sizeof(struct dvb_frontend_ops));
        state->initialised = 0;
        state->demod_type = TDA1004X_DEMOD_TDA10046;
+       state->fw_version = 0x20;       /* dummy default value */
 
        /* check if the demod is there */
        if (tda1004x_read_byte(state, TDA1004X_CHIPID) != 0x46) {