diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-05-16 12:14:55 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-19 01:02:46 +0200 |
| commit | 7e3be7cf3bb344f717b6ec3d47a081269ea67ead (patch) | |
| tree | 15a53811bc8b871f6d82eec377822ead907112f8 | |
| parent | a694610d3361465d4c8d27dde72ab8b63d31115e (diff) | |
| download | u-boot-imx-7e3be7cf3bb344f717b6ec3d47a081269ea67ead.zip u-boot-imx-7e3be7cf3bb344f717b6ec3d47a081269ea67ead.tar.gz u-boot-imx-7e3be7cf3bb344f717b6ec3d47a081269ea67ead.tar.bz2 | |
console: unify printing current devices
Create stdio_print_current_devices() for this purpose
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | common/console.c | 75 | ||||
| -rw-r--r-- | include/stdio_dev.h | 1 |
2 files changed, 30 insertions, 46 deletions
diff --git a/common/console.c b/common/console.c index 0a36d2f..867c12c 100644 --- a/common/console.c +++ b/common/console.c @@ -532,6 +532,33 @@ int console_init_f(void) return 0; } +void stdio_print_current_devices(void) +{ +#ifdef CONFIG_SYS_CONSOLE_INFO_QUIET + /* Print information */ + puts("In: "); + if (stdio_devices[stdin] == NULL) { + puts("No input devices available!\n"); + } else { + printf ("%s\n", stdio_devices[stdin]->name); + } + + puts("Out: "); + if (stdio_devices[stdout] == NULL) { + puts("No output devices available!\n"); + } else { + printf ("%s\n", stdio_devices[stdout]->name); + } + + puts("Err: "); + if (stdio_devices[stderr] == NULL) { + puts("No error devices available!\n"); + } else { + printf ("%s\n", stdio_devices[stderr]->name); + } +#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ +} + #ifdef CONFIG_SYS_CONSOLE_IS_IN_ENV /* Called after the relocation - use desired console functions */ int console_init_r(void) @@ -601,29 +628,7 @@ done: gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ -#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET - /* Print information */ - puts("In: "); - if (stdio_devices[stdin] == NULL) { - puts("No input devices available!\n"); - } else { - console_printdevs(stdin); - } - - puts("Out: "); - if (stdio_devices[stdout] == NULL) { - puts("No output devices available!\n"); - } else { - console_printdevs(stdout); - } - - puts("Err: "); - if (stdio_devices[stderr] == NULL) { - puts("No error devices available!\n"); - } else { - console_printdevs(stderr); - } -#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ + stdio_print_current_devices(); #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE /* set the environment variables (will overwrite previous env settings) */ @@ -694,29 +699,7 @@ int console_init_r(void) gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ -#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET - /* Print information */ - puts("In: "); - if (stdio_devices[stdin] == NULL) { - puts("No input devices available!\n"); - } else { - printf("%s\n", stdio_devices[stdin]->name); - } - - puts("Out: "); - if (stdio_devices[stdout] == NULL) { - puts("No output devices available!\n"); - } else { - printf("%s\n", stdio_devices[stdout]->name); - } - - puts("Err: "); - if (stdio_devices[stderr] == NULL) { - puts("No error devices available!\n"); - } else { - printf("%s\n", stdio_devices[stderr]->name); - } -#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ + stdio_print_current_devices(); /* Setting environment variables */ for (i = 0; i < 3; i++) { diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 8b06ccf..83da4cd 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -91,6 +91,7 @@ extern char *stdio_names[MAX_FILES]; */ int stdio_register (struct stdio_dev * dev); int stdio_init (void); +void stdio_print_current_devices(void); #ifdef CONFIG_SYS_STDIO_DEREGISTER int stdio_deregister(char *devname); #endif |