diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2020-12-18 12:46:44 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-15 14:36:12 -0500 |
| commit | 45375adc97990ade77137c9922e673bb68e1a675 (patch) | |
| tree | 162af5d4acaaf10f50ff0825ada0cd9eaf3440a9 /common | |
| parent | c04f856822aab04c3ccb05d741e83ce3b84913fd (diff) | |
| download | u-boot-45375adc97990ade77137c9922e673bb68e1a675.tar.gz u-boot-45375adc97990ade77137c9922e673bb68e1a675.tar.xz u-boot-45375adc97990ade77137c9922e673bb68e1a675.zip | |
console: add function console_devices_set
Add a new function to access to console_devices only defined if
CONFIG_IS_ENABLED(CONSOLE_MUX).
This path allows to remove #if CONFIG_IS_ENABLED(CONSOLE_MUX)
in console_getc function.
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/console.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/common/console.c b/common/console.c index d225fdd920..036dd0358a 100644 --- a/common/console.c +++ b/common/console.c @@ -177,6 +177,11 @@ static struct stdio_dev *tstcdev; struct stdio_dev **console_devices[MAX_FILES]; int cd_count[MAX_FILES]; +static void __maybe_unused console_devices_set(int file, struct stdio_dev *dev) +{ + console_devices[file][0] = dev; +} + /* * This depends on tstc() always being called before getchar(). * This is guaranteed to be true because this routine is called @@ -275,6 +280,11 @@ static inline void console_doenv(int file, struct stdio_dev *dev) } #endif #else + +static void __maybe_unused console_devices_set(int file, struct stdio_dev *dev) +{ +} + static inline int console_getc(int file) { return stdio_devices[file]->getc(stdio_devices[file]); @@ -958,18 +968,14 @@ int console_init_r(void) if (outputdev != NULL) { console_setfile(stdout, outputdev); console_setfile(stderr, outputdev); -#if CONFIG_IS_ENABLED(CONSOLE_MUX) - console_devices[stdout][0] = outputdev; - console_devices[stderr][0] = outputdev; -#endif + console_devices_set(stdout, outputdev); + console_devices_set(stderr, outputdev); } /* Initializes input console */ if (inputdev != NULL) { console_setfile(stdin, inputdev); -#if CONFIG_IS_ENABLED(CONSOLE_MUX) - console_devices[stdin][0] = inputdev; -#endif + console_devices_set(stdin, inputdev); } if (!IS_ENABLED(CONFIG_SYS_CONSOLE_INFO_QUIET)) |