diff options
| author | Johannes Stezenbach <js@linuxtv.org> | 2005-03-28 04:10:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-28 04:10:18 -0800 |
| commit | 09c95deb071c87541041177a3d7d1fa03512db20 (patch) | |
| tree | 71c6511856cb5b8942fed042b5c83d2dea837247 | |
| parent | d239a0c8b99541b47eb9239396dc8420f0e218b7 (diff) | |
| download | history-09c95deb071c87541041177a3d7d1fa03512db20.tar.gz | |
[PATCH] dvb: clarify firmware upload messages
clarify firmware upload messages
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/media/dvb/frontends/nxt2002.c | 3 | ||||
| -rw-r--r-- | drivers/media/dvb/frontends/tda1004x.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/nxt2002.c b/drivers/media/dvb/frontends/nxt2002.c index 984163af5f7bb..819852c0f47fc 100644 --- a/drivers/media/dvb/frontends/nxt2002.c +++ b/drivers/media/dvb/frontends/nxt2002.c @@ -520,7 +520,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) { @@ -534,6 +534,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/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c index 80ab328529acd..0860e895a088b 100644 --- a/drivers/media/dvb/frontends/tda1004x.c +++ b/drivers/media/dvb/frontends/tda1004x.c @@ -353,7 +353,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"); @@ -372,6 +372,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 */ @@ -396,7 +397,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"); @@ -414,6 +415,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; |