stdio: Pass device pointer to stdio methods

[u-boot] / common / console.c

diff --git a/common/console.c b/common/console.c
index 5453726f693270f8a028a570445d13c53e045010..11c102a72647381ee000ab82816630ba6d41520a 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -109,7 +109,7 @@ static int console_setfile(int file, struct stdio_dev * dev)
        case stderr:
                /* Start new device */
                if (dev->start) {
-                       error = dev->start();
+                       error = dev->start(dev);
                        /* If it's not started dont use it */
                        if (error < 0)
                                break;
@@ -159,7 +159,7 @@ static int console_getc(int file)
        unsigned char ret;
 
        /* This is never called with testcdev == NULL */
-       ret = tstcdev->getc();
+       ret = tstcdev->getc(tstcdev);
        tstcdev = NULL;
        return ret;
 }
@@ -173,7 +173,7 @@ static int console_tstc(int file)
        for (i = 0; i < cd_count[file]; i++) {
                dev = console_devices[file][i];
                if (dev->tstc != NULL) {
-                       ret = dev->tstc();
+                       ret = dev->tstc(dev);
                        if (ret > 0) {
                                tstcdev = dev;
                                disable_ctrlc(0);
@@ -194,7 +194,7 @@ static void console_putc(int file, const char c)
        for (i = 0; i < cd_count[file]; i++) {
                dev = console_devices[file][i];
                if (dev->putc != NULL)
-                       dev->putc(c);
+                       dev->putc(dev, c);
        }
 }
 
@@ -206,7 +206,7 @@ static void console_puts(int file, const char *s)
        for (i = 0; i < cd_count[file]; i++) {
                dev = console_devices[file][i];
                if (dev->puts != NULL)
-                       dev->puts(s);
+                       dev->puts(dev, s);
        }
 }
 
@@ -222,22 +222,22 @@ static inline void console_doenv(int file, struct stdio_dev *dev)
 #else
 static inline int console_getc(int file)
 {
-       return stdio_devices[file]->getc();
+       return stdio_devices[file]->getc(stdio_devices[file]);
 }
 
 static inline int console_tstc(int file)
 {
-       return stdio_devices[file]->tstc();
+       return stdio_devices[file]->tstc(stdio_devices[file]);
 }
 
 static inline void console_putc(int file, const char c)
 {
-       stdio_devices[file]->putc(c);
+       stdio_devices[file]->putc(stdio_devices[file], c);
 }
 
 static inline void console_puts(int file, const char *s)
 {
-       stdio_devices[file]->puts(s);
+       stdio_devices[file]->puts(stdio_devices[file], s);
 }
 
 static inline void console_printdevs(int file)