diff options
author | Johannes Stezenbach <js@linuxtv.org> | 2005-05-17 04:54:36 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 14:59:31 (GMT) |
commit | 71e3420111530273f2b26fabfac4d021c2a2b79f (patch) | |
tree | a3482e2868eea3fb19216c43180619097eb2cb29 /drivers/media | |
parent | 1dfb800f9d0391dee86d692142745415f5f65f81 (diff) | |
download | linux-fsl-qoriq-71e3420111530273f2b26fabfac4d021c2a2b79f.tar.xz |
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/frontends/tda1004x.c | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c index ecfa8c7..0beb370 100644 --- 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) { |