diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/console.c | 32 | ||||
| -rw-r--r-- | src/core/init.c | 4 |
2 files changed, 36 insertions, 0 deletions
diff --git a/src/core/console.c b/src/core/console.c index 73baf7f66..5f3c28d84 100644 --- a/src/core/console.c +++ b/src/core/console.c @@ -121,3 +121,35 @@ int getchar ( void ) { int iskey ( void ) { return has_input() ? 1 : 0; } + +/** + * Configure console + * + * @v config Console configuration + * @ret rc Return status code + * + * The configuration is passed to all configurable consoles, including + * those which are currently disabled. Consoles may choose to enable + * or disable themselves depending upon the configuration. + * + * If configuration fails, then all consoles will be reset. + */ +int console_configure ( struct console_configuration *config ) { + struct console_driver *console; + int rc; + + /* Try to configure each console */ + for_each_table_entry ( console, CONSOLES ) { + if ( ( console->configure ) && + ( ( rc = console->configure ( config ) ) != 0 ) ) + goto err; + } + + return 0; + + err: + /* Reset all consoles, avoiding a potential infinite loop */ + if ( config ) + console_reset(); + return rc; +} diff --git a/src/core/init.c b/src/core/init.c index 562744194..7ea0730fa 100644 --- a/src/core/init.c +++ b/src/core/init.c @@ -20,6 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/device.h> +#include <ipxe/console.h> #include <ipxe/init.h> /** @file @@ -95,5 +96,8 @@ void shutdown ( int flags ) { startup_fn->shutdown ( flags ); } + /* Reset console */ + console_reset(); + started = 0; } |