summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorJohannes Stezenbach <devnull@localhost>2005-01-25 00:39:50 +0000
committerJohannes Stezenbach <devnull@localhost>2005-01-25 00:39:50 +0000
commitcdafb4a70f7448bcb62c56967c070a0453024de0 (patch)
treef45eb54b54c95fb8f711c5671c6be05612408919 /linux/drivers/media/dvb
parent62fa5afaabfd4a3b65fd95ed59e3781830a8403e (diff)
downloadmediapointer-dvb-s2-cdafb4a70f7448bcb62c56967c070a0453024de0.tar.gz
mediapointer-dvb-s2-cdafb4a70f7448bcb62c56967c070a0453024de0.tar.bz2
clarify firmware upload messages
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/frontends/nxt2002.c3
-rw-r--r--linux/drivers/media/dvb/frontends/tda1004x.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/frontends/nxt2002.c b/linux/drivers/media/dvb/frontends/nxt2002.c
index 236d79144..2519edb8f 100644
--- a/linux/drivers/media/dvb/frontends/nxt2002.c
+++ b/linux/drivers/media/dvb/frontends/nxt2002.c
@@ -525,7 +525,7 @@ static int nxt2002_init(struct dvb_frontend* fe)
if (!state->initialised) {
/* request the firmware, this will block until someone uploads it */
- printk("nxt2002: Waiting for firmware upload...\n");
+ printk("nxt2002: Waiting for firmware upload (%s)...\n", NXT2002_DEFAULT_FIRMWARE);
ret = state->config->request_firmware(fe, &fw, NXT2002_DEFAULT_FIRMWARE);
printk("nxt2002: Waiting for firmware upload(2)...\n");
if (ret) {
@@ -539,6 +539,7 @@ static int nxt2002_init(struct dvb_frontend* fe)
release_firmware(fw);
return ret;
}
+ printk("nxt2002: firmware upload complete\n");
/* Put the micro into reset */
nxt2002_microcontroller_stop(state);
diff --git a/linux/drivers/media/dvb/frontends/tda1004x.c b/linux/drivers/media/dvb/frontends/tda1004x.c
index 5848378a6..47c90d6e0 100644
--- a/linux/drivers/media/dvb/frontends/tda1004x.c
+++ b/linux/drivers/media/dvb/frontends/tda1004x.c
@@ -359,7 +359,7 @@ static int tda10045_fwupload(struct dvb_frontend* fe)
if (tda1004x_check_upload_ok(state, 0x2c) == 0) return 0;
/* request the firmware, this will block until someone uploads it */
- printk("tda1004x: waiting for firmware upload...\n");
+ printk("tda1004x: waiting for firmware upload (%s)...\n", TDA10045_DEFAULT_FIRMWARE);
ret = state->config->request_firmware(fe, &fw, TDA10045_DEFAULT_FIRMWARE);
if (ret) {
printk("tda1004x: no firmware upload (timeout or file not found?)\n");
@@ -378,6 +378,7 @@ static int tda10045_fwupload(struct dvb_frontend* fe)
ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10045H_FWPAGE, TDA10045H_CODE_IN);
if (ret)
return ret;
+ printk("tda1004x: firmware upload complete\n");
/* wait for DSP to initialise */
/* DSPREADY doesn't seem to work on the TDA10045H */
@@ -402,7 +403,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
if (tda1004x_check_upload_ok(state, 0x20) == 0) return 0;
/* request the firmware, this will block until someone uploads it */
- printk("tda1004x: waiting for firmware upload...\n");
+ printk("tda1004x: waiting for firmware upload (%s)...\n", TDA10046_DEFAULT_FIRMWARE);
ret = state->config->request_firmware(fe, &fw, TDA10046_DEFAULT_FIRMWARE);
if (ret) {
printk("tda1004x: no firmware upload (timeout or file not found?)\n");
@@ -420,6 +421,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN);
if (ret)
return ret;
+ printk("tda1004x: firmware upload complete\n");
/* wait for DSP to initialise */
timeout = jiffies + HZ;