From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 2/5] loadb: deactivate console before using it for loadb
Date: Tue, 17 Nov 2015 12:10:48 +0100 [thread overview]
Message-ID: <1447758651-26575-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1447758651-26575-1-git-send-email-s.hauer@pengutronix.de>
Remove the console device we are about using for loadb from the
console layer by deactivating it. This makes sure that no printf output
disturbs the current file transfer.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
commands/loadb.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/commands/loadb.c b/commands/loadb.c
index bdf1710..6710665 100644
--- a/commands/loadb.c
+++ b/commands/loadb.c
@@ -617,6 +617,7 @@ static int do_load_serial_bin(int argc, char *argv[])
int rcode = 0, ret;
int opt;
char *output_file = NULL;
+ int current_active;
while ((opt = getopt(argc, argv, "f:b:o:c")) > 0) {
switch (opt) {
@@ -641,6 +642,7 @@ static int do_load_serial_bin(int argc, char *argv[])
return -ENODEV;
}
current_baudrate = console_get_baudrate(cdev);
+ current_active = console_get_active(cdev);
/* Load Defaults */
if (load_baudrate == 0)
@@ -665,13 +667,15 @@ static int do_load_serial_bin(int argc, char *argv[])
}
}
+ printf("## Ready for binary (kermit) download "
+ "to 0x%08lX offset on %s device at %d bps...\n", offset,
+ output_file, load_baudrate);
+
+ console_set_active(cdev, 0);
ret = console_set_baudrate(cdev, load_baudrate);
if (ret)
return ret;
- printf("## Ready for binary (kermit) download "
- "to 0x%08lX offset on %s device at %d bps...\n", offset,
- output_file, load_baudrate);
addr = load_serial_bin();
if (addr == 0) {
printf("## Binary (kermit) download aborted\n");
@@ -682,6 +686,8 @@ static int do_load_serial_bin(int argc, char *argv[])
if (ret)
return ret;
+ console_set_active(cdev, current_active);
+
close(ofd);
ofd = 0;
return rcode;
--
2.6.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-11-17 11:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-17 11:10 loadb console cleanups Sascha Hauer
2015-11-17 11:10 ` [PATCH 1/5] loadb: Use local cdev Sascha Hauer
2015-11-17 11:10 ` Sascha Hauer [this message]
2015-11-17 11:10 ` [PATCH 3/5] console: Set baudrate during registration Sascha Hauer
2015-11-17 11:10 ` [PATCH 4/5] loadb: Allow to specify device to use Sascha Hauer
2015-11-17 11:10 ` [PATCH 5/5] loads: Use putchar rather than console_putc Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447758651-26575-3-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox