diff options
| author | Simon Glass <sjg@chromium.org> | 2014-07-23 06:54:59 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-07-23 14:07:23 +0100 |
| commit | 709ea543b92489e7729d2d7ddd6c9f451e52158c (patch) | |
| tree | c3ae9c03a7d031e510bab2cd3fa093e1f126c5ad /include/stdio_dev.h | |
| parent | 91d0be1dd845913ba276e041dc11d1297390de11 (diff) | |
| download | blackbird-obmc-uboot-709ea543b92489e7729d2d7ddd6c9f451e52158c.tar.gz blackbird-obmc-uboot-709ea543b92489e7729d2d7ddd6c9f451e52158c.zip | |
stdio: Pass device pointer to stdio methods
At present stdio device functions do not get any clue as to which stdio
device is being acted on. Some implementations go to great lengths to work
around this, such as defining a whole separate set of functions for each
possible device.
For driver model we need to associate a stdio_dev with a device. It doesn't
seem possible to continue with this work-around approach.
Instead, add a stdio_dev pointer to each of the stdio member functions.
Note: The serial drivers have the same problem, but it is not strictly
necessary to fix that to get driver model running. Also, if we convert
serial over to driver model the problem will go away.
Code size increases by 244 bytes for Thumb2 and 428 for PowerPC.
22: stdio: Pass device pointer to stdio methods
arm: (for 2/2 boards) all +244.0 bss -4.0 text +248.0
powerpc: (for 1/1 boards) all +428.0 text +428.0
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Marek Vasut <marex@denx.de>
Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'include/stdio_dev.h')
| -rw-r--r-- | include/stdio_dev.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/stdio_dev.h b/include/stdio_dev.h index e6dc12ac39..45870054c0 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -27,18 +27,21 @@ struct stdio_dev { /* GENERAL functions */ - int (*start) (void); /* To start the device */ - int (*stop) (void); /* To stop the device */ + int (*start)(struct stdio_dev *dev); /* To start the device */ + int (*stop)(struct stdio_dev *dev); /* To stop the device */ /* OUTPUT functions */ - void (*putc) (const char c); /* To put a char */ - void (*puts) (const char *s); /* To put a string (accelerator) */ + /* To put a char */ + void (*putc)(struct stdio_dev *dev, const char c); + /* To put a string (accelerator) */ + void (*puts)(struct stdio_dev *dev, const char *s); /* INPUT functions */ - int (*tstc) (void); /* To test if a char is ready... */ - int (*getc) (void); /* To get that char */ + /* To test if a char is ready... */ + int (*tstc)(struct stdio_dev *dev); + int (*getc)(struct stdio_dev *dev); /* To get that char */ /* Other functions */ |
