[U-Boot] [PATCH 1/2] sandbox: remove os_putc() and os_puts()
They are unused since commit d8c6fb8cedbc ("sandbox: Drop special case console code for sandbox").
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/sandbox/cpu/os.c | 11 ----------- include/os.h | 20 -------------------- 2 files changed, 31 deletions(-)
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index 7243bfc1b1fd..22d6aab53481 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -413,17 +413,6 @@ 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 049b248c5b01..2bf4bdb1b836 100644 --- a/include/os.h +++ b/include/os.h @@ -241,26 +241,6 @@ 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 * * @param fname Filename to write memory to (simple binary format)
Current puts() and putc() have similar #ifdef / if() conditionals. Make puts() iterate over putc() to avoid code duplication.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
common/console.c | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-)
diff --git a/common/console.c b/common/console.c index c6156f33bbbe..01eef5594fcb 100644 --- a/common/console.c +++ b/common/console.c @@ -426,12 +426,6 @@ static void pre_console_putc(const char c) unmap_sysmem(buffer); }
-static void pre_console_puts(const char *s) -{ - while (*s) - pre_console_putc(*s++); -} - static void print_pre_console_buffer(int flushpoint) { unsigned long in = 0, out = 0; @@ -459,7 +453,6 @@ static void print_pre_console_buffer(int flushpoint) } #else static inline void pre_console_putc(const char c) {} -static inline void pre_console_puts(const char *s) {} static inline void print_pre_console_buffer(int flushpoint) {} #endif
@@ -501,41 +494,8 @@ void putc(const char c)
void puts(const char *s) { -#ifdef CONFIG_DEBUG_UART - if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) { - while (*s) { - int ch = *s++; - - printch(ch); - } - return; - } -#endif -#ifdef CONFIG_CONSOLE_RECORD - if (gd && (gd->flags & GD_FLG_RECORD) && gd->console_out.start) - membuff_put(&gd->console_out, s, strlen(s)); -#endif -#ifdef CONFIG_SILENT_CONSOLE - if (gd->flags & GD_FLG_SILENT) - return; -#endif - -#ifdef CONFIG_DISABLE_CONSOLE - if (gd->flags & GD_FLG_DISABLE_CONSOLE) - return; -#endif - - if (!gd->have_console) - return pre_console_puts(s); - - if (gd->flags & GD_FLG_DEVINIT) { - /* Send to the standard output */ - fputs(stdout, s); - } else { - /* Send directly to the handler */ - pre_console_puts(s); - serial_puts(s); - } + while (*s) + putc(*s++); }
#ifdef CONFIG_CONSOLE_RECORD
Hi Masahiro,
On 16 July 2017 at 22:08, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Current puts() and putc() have similar #ifdef / if() conditionals. Make puts() iterate over putc() to avoid code duplication.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
common/console.c | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-)
This is here I think because having the conditions outside the loop is faster. But perhaps it makes not difference really.
Reviewed-by: Simon Glass sjg@chromium.org
On 16 July 2017 at 22:08, Masahiro Yamada yamada.masahiro@socionext.com wrote:
They are unused since commit d8c6fb8cedbc ("sandbox: Drop special case console code for sandbox").
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/sandbox/cpu/os.c | 11 ----------- include/os.h | 20 -------------------- 2 files changed, 31 deletions(-)
I hope it was OK to remove those :-)
Acked-by: Simon Glass sjg@chromium.org
On 16 July 2017 at 22:08, Masahiro Yamada yamada.masahiro@socionext.com wrote:
They are unused since commit d8c6fb8cedbc ("sandbox: Drop special case console code for sandbox").
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/sandbox/cpu/os.c | 11 ----------- include/os.h | 20 -------------------- 2 files changed, 31 deletions(-)
I hope it was OK to remove those :-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm, thanks!
participants (3)
-
Masahiro Yamada -
Simon Glass -
sjg＠google.com