From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 5/8] console: console_get_by_name pass flags
Date: Thu, 3 Oct 2013 09:21:57 +0200 [thread overview]
Message-ID: <1380784920-30890-5-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1380784920-30890-1-git-send-email-plagnioj@jcrosoft.com>
this will allow to get console by name and specific feature
we use CONSOLE_STDIN to check input support and CONSOLE_STDOUT for output
support at driver level
this will also allow to use non active console for loadxy as example
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
commands/loadxy.c | 4 ++--
common/console_common.c | 10 ++++++----
include/console.h | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/commands/loadxy.c b/commands/loadxy.c
index 7cefba4..41181f2 100644
--- a/commands/loadxy.c
+++ b/commands/loadxy.c
@@ -90,7 +90,7 @@ static int do_loady(int argc, char *argv[])
}
if (cname)
- cdev = console_get_by_name(cname);
+ cdev = console_get_by_name(cname, CONSOLE_STDIN & CONSOLE_STDOUT);
else
cdev = console_get_first_active();
if (!cdev) {
@@ -167,7 +167,7 @@ static int do_loadx(int argc, char *argv[])
}
if (cname)
- cdev = console_get_by_name(cname);
+ cdev = console_get_by_name(cname, CONSOLE_STDIN & CONSOLE_STDOUT);
else
cdev = console_get_first_active();
if (!cdev) {
diff --git a/common/console_common.c b/common/console_common.c
index 05603c4..6e5fb68 100644
--- a/common/console_common.c
+++ b/common/console_common.c
@@ -203,7 +203,7 @@ struct console_device *console_get_first_active(void)
}
EXPORT_SYMBOL(console_get_first_active);
-struct console_device *console_get_by_name(const char *cname)
+struct console_device *console_get_by_name(const char *cname, int flags)
{
struct console_device *cdev;
const char *target;
@@ -212,9 +212,11 @@ struct console_device *console_get_by_name(const char *cname)
target = dev_id(&cdev->class_dev);
if (strcmp(cname, target))
continue;
- if ((cdev->f_active & (CONSOLE_STDIN | CONSOLE_STDOUT))
- return cdev;
- return NULL;
+ if ((flags & CONSOLE_STDIN) && !(cdev->tstc && cdev->getc))
+ return NULL;
+ if ((flags & CONSOLE_STDOUT) && !cdev->putc)
+ return NULL;
+ return cdev;
}
return NULL;
}
diff --git a/include/console.h b/include/console.h
index 8f0aac0..f1bc049 100644
--- a/include/console.h
+++ b/include/console.h
@@ -68,7 +68,7 @@ void console_allow_input(bool val);
extern int barebox_loglevel;
struct console_device *console_get_first_active(void);
-struct console_device *console_get_by_name(const char *cname);
+struct console_device *console_get_by_name(const char *cname, int flags);
int console_open(struct console_device *cdev);
void console_close(struct console_device *cdev);
--
1.8.4.rc3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-10-03 7:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-03 7:17 [PATCH 0/8 v2] more serial cleanup Jean-Christophe PLAGNIOL-VILLARD
2013-10-03 7:21 ` [PATCH 1/8] console: factorise function to get the first enabled console Jean-Christophe PLAGNIOL-VILLARD
2013-10-03 7:21 ` [PATCH 2/8] console: factorise function to get the console by name Jean-Christophe PLAGNIOL-VILLARD
2013-10-06 11:24 ` Sascha Hauer
2013-10-06 18:38 ` Jean-Christophe PLAGNIOL-VILLARD
2013-10-07 6:23 ` Sascha Hauer
2013-10-03 7:21 ` [PATCH 3/8] console: introduce startup and shutdown Jean-Christophe PLAGNIOL-VILLARD
2013-10-03 7:21 ` [PATCH 4/8] loadxy: use console_open/close Jean-Christophe PLAGNIOL-VILLARD
2013-10-03 7:21 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2013-10-03 7:21 ` [PATCH 6/8] animeo_ip: update to use console_open/close for rs485 crossed detection Jean-Christophe PLAGNIOL-VILLARD
2013-10-03 7:21 ` [PATCH 7/8] serial: amba-pl011: add start and shutdown support Jean-Christophe PLAGNIOL-VILLARD
2013-10-03 7:22 ` [PATCH 8/8] serial: atmel: " Jean-Christophe PLAGNIOL-VILLARD
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=1380784920-30890-5-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--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