serial: Implement serial_flush() function for console flush() fallback

Like in all other console functions, implement also serial_flush() function
as a fallback int console flush() function.

Flush support is available only when config option CONSOLE_FLUSH_SUPPORT is
enabled. So when it is disabled then provides just empty static inline
function serial_flush().

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/console.c b/common/console.c
index ce0c9b69f58cb7b1f2b086950adb97e1f0d31fff..0c9bf66c3f6d554e45ca0b6e8146957a20ffaf41 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -797,6 +797,9 @@ void flush(void)
        if (gd->flags & GD_FLG_DEVINIT) {
                /* Send to the standard output */
                fflush(stdout);
+       } else {
+               /* Send directly to the handler */
+               serial_flush();
        }
 }
 #endif

diff --git a/common/stdio.c b/common/stdio.c
index 92161a0df87dcd4375dd554da22d9ba8e9e00951..13083842cbd90153f1d714da22ea7652a26b8c7b 100644 (file)
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -87,6 +87,13 @@ static void stdio_serial_puts(struct stdio_dev *dev, const char *s)
        serial_puts(s);
 }
 
+#ifdef CONFIG_CONSOLE_FLUSH_SUPPORT
+static void stdio_serial_flush(struct stdio_dev *dev)
+{
+       serial_flush();
+}
+#endif
+
 static int stdio_serial_getc(struct stdio_dev *dev)
 {
        return serial_getc();
@@ -112,6 +119,7 @@ static void drv_system_init (void)
        dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
        dev.putc = stdio_serial_putc;
        dev.puts = stdio_serial_puts;
+       STDIO_DEV_ASSIGN_FLUSH(&dev, stdio_serial_flush);
        dev.getc = stdio_serial_getc;
        dev.tstc = stdio_serial_tstc;
        stdio_register (&dev);

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 1234fe0e8478e8287268b2a98573330a0339d2fb..53df10ee853dcdc7c489317d308cce882f5798d1 100644 (file)
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -327,6 +327,16 @@ void serial_puts(const char *str)
                _serial_puts(gd->cur_serial_dev, str);
 }
 
+#ifdef CONFIG_CONSOLE_FLUSH_SUPPORT
+void serial_flush(void)
+{
+       if (!gd->cur_serial_dev)
+               return;
+
+       _serial_flush(gd->cur_serial_dev);
+}
+#endif
+
 int serial_getc(void)
 {
        if (!gd->cur_serial_dev)

diff --git a/include/serial.h b/include/serial.h
index 8c2e7adbc3215a0b87103c413a1c852c7305d462..fe01bcfadb9bde6fc249f332a7863968872fe450 100644 (file)
--- a/include/serial.h
+++ b/include/serial.h
@@ -362,6 +362,11 @@ void serial_setbrg(void);
 void serial_putc(const char ch);
 void serial_putc_raw(const char ch);
 void serial_puts(const char *str);
+#if defined(CONFIG_CONSOLE_FLUSH_SUPPORT) && CONFIG_IS_ENABLED(DM_SERIAL)
+void serial_flush(void);
+#else
+static inline void serial_flush(void) {}
+#endif
 int serial_getc(void);
 int serial_tstc(void);