summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTaylor Hutt <thutt@chromium.org>2013-02-24 17:33:13 +0000
committerSimon Glass <sjg@chromium.org>2013-02-28 19:09:21 -0800
commite101550a9a8b956434cf2a73f66afbb42f4654bd (patch)
tree9b3779554981488f9fead9eab91eadfbdc0a1d2d /arch
parentbda32ffcf712806c7880ded25a012fbeede35e80 (diff)
downloadu-boot-imx-e101550a9a8b956434cf2a73f66afbb42f4654bd.zip
u-boot-imx-e101550a9a8b956434cf2a73f66afbb42f4654bd.tar.gz
u-boot-imx-e101550a9a8b956434cf2a73f66afbb42f4654bd.tar.bz2
sandbox: Improve sandbox serial port keyboard interface
Implements the tstc() interface for the serial driver. Multiplexing the console between the serial port and a keyboard uses a polling method of checking if characters are available; this means that the serial console must be non-blocking when attempting to read characters. Signed-off-by: Taylor Hutt <thutt@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sandbox/cpu/os.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index 36637af..3e37c93 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -44,6 +44,14 @@ ssize_t os_read(int fd, void *buf, size_t count)
return read(fd, buf, count);
}
+ssize_t os_read_no_block(int fd, void *buf, size_t count)
+{
+ const int flags = fcntl(fd, F_GETFL, 0);
+
+ fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+ return os_read(fd, buf, count);
+}
+
ssize_t os_write(int fd, const void *buf, size_t count)
{
return write(fd, buf, count);