From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 01/15] Revert "sandbox: remove os_putc() and os_puts()"
Date: Mon, 4 Dec 2017 13:48:17 -0700 [thread overview]
Message-ID: <20171204204831.98915-2-sjg@chromium.org> (raw)
In-Reply-To: <20171204204831.98915-1-sjg@chromium.org>
While sandbox works OK without the special-case code, it does result in
console output being stored in the pre-console buffer while sandbox starts
up. If there is a crash or a problem then there is no indication of what
is going on.
For ease of debugging it seems better to revert this change.
This reverts commit 47b98ad0f6779485d0f0c14f337c3eece273eb54.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/sandbox/cpu/os.c | 11 +++++++++++
include/os.h | 20 ++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index c524957b6c..9dd90a1b30 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -421,6 +421,17 @@ int os_get_filesize(const char *fname, loff_t *size)
return 0;
}
+void os_putc(int ch)
+{
+ putchar(ch);
+}
+
+void os_puts(const char *str)
+{
+ while (*str)
+ os_putc(*str++);
+}
+
int os_write_ram_buf(const char *fname)
{
struct sandbox_state *state = state_get_current();
diff --git a/include/os.h b/include/os.h
index 2bf4bdb1b8..049b248c5b 100644
--- a/include/os.h
+++ b/include/os.h
@@ -240,6 +240,26 @@ const char *os_dirent_get_typename(enum os_dirent_t type);
*/
int os_get_filesize(const char *fname, loff_t *size);
+/**
+ * Write a character to the controlling OS terminal
+ *
+ * This bypasses the U-Boot console support and writes directly to the OS
+ * stdout file descriptor.
+ *
+ * @param ch Character to write
+ */
+void os_putc(int ch);
+
+/**
+ * Write a string to the controlling OS terminal
+ *
+ * This bypasses the U-Boot console support and writes directly to the OS
+ * stdout file descriptor.
+ *
+ * @param str String to write (note that \n is not appended)
+ */
+void os_puts(const char *str);
+
/**
* Write the sandbox RAM buffer to a existing file
*
--
2.15.0.531.g2ccb3012c9-goog
next prev parent reply other threads:[~2017-12-04 20:48 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-04 20:48 [U-Boot] [PATCH v4 00/15] log: Add a new logging feature Simon Glass
2017-12-04 20:48 ` Simon Glass [this message]
2017-12-07 22:54 ` [U-Boot] [U-Boot, v4, 01/15] Revert "sandbox: remove os_putc() and os_puts()" Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 02/15] sandbox: Adjust pre-console address to avoid conflict Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 03/15] Revert "sandbox: Drop special case console code for sandbox" Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 04/15] Move debug and logging support to a separate header Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 05/15] mtdparts: Correct use of debug() Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot,v4,05/15] " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 06/15] usb: " Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot,v4,06/15] " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 07/15] Drop the log buffer Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot,v4,07/15] " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 08/15] log: Add an implementation of logging Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 09/15] log: Add a console driver Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot,v4,09/15] " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 10/15] log: Add a 'log level' command Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot,v4,10/15] " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 11/15] log: Add a test command Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot,v4,11/15] " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 12/15] log: Plumb logging into the init sequence Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 13/15] log: sandbox: Enable logging Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot,v4,13/15] " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 14/15] log: test: Add a pytest for logging Simon Glass
2017-12-07 22:54 ` [U-Boot] [U-Boot,v4,14/15] " Tom Rini
2017-12-04 20:48 ` [U-Boot] [PATCH v4 15/15] log: Add documentation Simon Glass
2017-12-07 22:55 ` [U-Boot] [U-Boot,v4,15/15] " Tom Rini
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=20171204204831.98915-2-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.