dm: usb: Split hub detection into its own function

[karo-tx-uboot.git] / common / console.c

diff --git a/common/console.c b/common/console.c
index 4695386a332ab867c12df32e938d4976ce7f0115..3f25e76fe79ea3c94a85d0306d668233320e2d47 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -125,13 +125,13 @@ static int console_setfile(int file, struct stdio_dev * dev)
                 */
                switch (file) {
                case stdin:
-                       gd->jt[XF_getc] = dev->getc;
-                       gd->jt[XF_tstc] = dev->tstc;
+                       gd->jt->getc = getc;
+                       gd->jt->tstc = tstc;
                        break;
                case stdout:
-                       gd->jt[XF_putc] = dev->putc;
-                       gd->jt[XF_puts] = dev->puts;
-                       gd->jt[XF_printf] = printf;
+                       gd->jt->putc  = putc;
+                       gd->jt->puts  = puts;
+                       gd->jt->printf = printf;
                        break;
                }
                break;
@@ -199,6 +199,20 @@ static void console_putc(int file, const char c)
        }
 }
 
+#ifdef CONFIG_PRE_CONSOLE_BUFFER
+static void console_putc_noserial(int file, const char c)
+{
+       int i;
+       struct stdio_dev *dev;
+
+       for (i = 0; i < cd_count[file]; i++) {
+               dev = console_devices[file][i];
+               if (dev->putc != NULL && strcmp(dev->name, "serial") != 0)
+                       dev->putc(dev, c);
+       }
+}
+#endif
+
 static void console_puts(int file, const char *s)
 {
        int i;
@@ -236,6 +250,14 @@ static inline void console_putc(int file, const char c)
        stdio_devices[file]->putc(stdio_devices[file], c);
 }
 
+#ifdef CONFIG_PRE_CONSOLE_BUFFER
+static inline void console_putc_noserial(int file, const char c)
+{
+       if (strcmp(stdio_devices[file]->name, "serial") != 0)
+               stdio_devices[file]->putc(stdio_devices[file], c);
+}
+#endif
+
 static inline void console_puts(int file, const char *s)
 {
        stdio_devices[file]->puts(stdio_devices[file], s);
@@ -382,6 +404,9 @@ int tstc(void)
        return serial_tstc();
 }
 
+#define PRE_CONSOLE_FLUSHPOINT1_SERIAL                 0
+#define PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL  1
+
 #ifdef CONFIG_PRE_CONSOLE_BUFFER
 #define CIRC_BUF_IDX(idx) ((idx) % (unsigned long)CONFIG_PRE_CON_BUF_SZ)
 
@@ -398,7 +423,7 @@ static void pre_console_puts(const char *s)
                pre_console_putc(*s++);
 }
 
-static void print_pre_console_buffer(void)
+static void print_pre_console_buffer(int flushpoint)
 {
        unsigned long i = 0;
        char *buffer = (char *)CONFIG_PRE_CON_BUF_ADDR;
@@ -407,12 +432,20 @@ static void print_pre_console_buffer(void)
                i = gd->precon_buf_idx - CONFIG_PRE_CON_BUF_SZ;
 
        while (i < gd->precon_buf_idx)
-               putc(buffer[CIRC_BUF_IDX(i++)]);
+               switch (flushpoint) {
+               case PRE_CONSOLE_FLUSHPOINT1_SERIAL:
+                       putc(buffer[CIRC_BUF_IDX(i++)]);
+                       break;
+               case PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL:
+                       console_putc_noserial(stdout,
+                                             buffer[CIRC_BUF_IDX(i++)]);
+                       break;
+               }
 }
 #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(void) {}
+static inline void print_pre_console_buffer(int flushpoint) {}
 #endif
 
 void putc(const char c)
@@ -441,6 +474,7 @@ void putc(const char c)
                fputc(stdout, c);
        } else {
                /* Send directly to the handler */
+               pre_console_putc(c);
                serial_putc(c);
        }
 }
@@ -472,6 +506,7 @@ void puts(const char *s)
                fputs(stdout, s);
        } else {
                /* Send directly to the handler */
+               pre_console_puts(s);
                serial_puts(s);
        }
 }
@@ -679,7 +714,7 @@ int console_init_f(void)
                gd->flags |= GD_FLG_SILENT;
 #endif
 
-       print_pre_console_buffer();
+       print_pre_console_buffer(PRE_CONSOLE_FLUSHPOINT1_SERIAL);
 
        return 0;
 }
@@ -723,11 +758,11 @@ int console_init_r(void)
 #endif
 
        /* set default handlers at first */
-       gd->jt[XF_getc] = serial_getc;
-       gd->jt[XF_tstc] = serial_tstc;
-       gd->jt[XF_putc] = serial_putc;
-       gd->jt[XF_puts] = serial_puts;
-       gd->jt[XF_printf] = serial_printf;
+       gd->jt->getc  = serial_getc;
+       gd->jt->tstc  = serial_tstc;
+       gd->jt->putc  = serial_putc;
+       gd->jt->puts  = serial_puts;
+       gd->jt->printf = serial_printf;
 
        /* stdin stdout and stderr are in environment */
        /* scan for it */
@@ -794,6 +829,7 @@ done:
        if ((stdio_devices[stdin] == NULL) && (stdio_devices[stdout] == NULL))
                return 0;
 #endif
+       print_pre_console_buffer(PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL);
        return 0;
 }
 
@@ -869,7 +905,7 @@ int console_init_r(void)
        if ((stdio_devices[stdin] == NULL) && (stdio_devices[stdout] == NULL))
                return 0;
 #endif
-
+       print_pre_console_buffer(PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL);
        return 0;
 }