mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 06/12] loadxy: Use console_get_by_name
Date: Tue,  9 Jun 2015 08:21:09 +0200	[thread overview]
Message-ID: <1433830875-31119-7-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1433830875-31119-1-git-send-email-s.hauer@pengutronix.de>

Use console_get_by_name rather than iterating over the console list in the
loadxy code. The code in loadxy.c used to test whether a console is active
before using it. This check is dropped along the way since there's no reason
to not being able to use a disabled console for loadxy.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/loadxy.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/commands/loadxy.c b/commands/loadxy.c
index 1e65cb6..62b3956 100644
--- a/commands/loadxy.c
+++ b/commands/loadxy.c
@@ -57,28 +57,6 @@ static int console_change_speed(struct console_device *cdev, int baudrate)
 	return current_baudrate;
 }
 
-static struct console_device *get_named_console(const char *cname)
-{
-	struct console_device *cdev;
-	const char *target;
-
-	/*
-	 * Assumption to have BOTH CONSOLE_STDIN AND STDOUT in the
-	 * same output console
-	 */
-	for_each_console(cdev) {
-		target = dev_id(&cdev->class_dev);
-		if (strlen(target) != strlen(cname))
-			continue;
-		printf("RJK: looking for %s in console name %s\n",
-		       cname, target);
-		if ((cdev->f_active & (CONSOLE_STDIN | CONSOLE_STDOUT))
-		    && !strcmp(cname, target))
-			return cdev;
-	}
-	return NULL;
-}
-
 /**
  * @brief provide the loady(Y-Modem or Y-Modem/G) support
  *
@@ -112,7 +90,7 @@ static int do_loady(int argc, char *argv[])
 	}
 
 	if (cname)
-		cdev = get_named_console(cname);
+		cdev = console_get_by_name(cname);
 	else
 		cdev = console_get_first_active();
 	if (!cdev) {
@@ -196,7 +174,7 @@ static int do_loadx(int argc, char *argv[])
 	}
 
 	if (cname)
-		cdev = get_named_console(cname);
+		cdev = console_get_by_name(cname);
 	else
 		cdev = console_get_first_active();
 	if (!cdev) {
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2015-06-09  6:21 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-09  6:21 Add functions for (de)activating consoles and for setting baudrate Sascha Hauer
2015-06-09  6:21 ` [PATCH 01/12] console: Add functions to get/set active state of console Sascha Hauer
2015-06-09  6:21 ` [PATCH 02/12] console: Add functions to get/set baudrate Sascha Hauer
2015-06-09  6:21 ` [PATCH 03/12] console: Add console_get_by_name Sascha Hauer
2015-06-09  6:21 ` [PATCH 04/12] console: When switching baudrate print console name Sascha Hauer
2015-06-09  6:21 ` [PATCH 05/12] usb: gadget: serial: Use console_set_active to activate console Sascha Hauer
2015-06-09  6:21 ` Sascha Hauer [this message]
2015-06-09  6:21 ` [PATCH 07/12] loadxy: use console_get_baudrate Sascha Hauer
2015-06-09  6:21 ` [PATCH 08/12] loadx: ignore -c option Sascha Hauer
2015-06-09  6:21 ` [PATCH 09/12] loadxy: use console_set_baudrate Sascha Hauer
2015-06-09  6:21 ` [PATCH 10/12] loadb: use console_get_baudrate Sascha Hauer
2015-06-09  6:21 ` [PATCH 11/12] loadb: Use console_set_baudrate Sascha Hauer
2015-06-09  6:21 ` [PATCH 12/12] loadb: ignore -c option Sascha Hauer
2015-06-09  7:26 ` Add functions for (de)activating consoles and for setting baudrate 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=1433830875-31119-7-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