mirror of
https://github.com/ipxe/ipxe
synced 2025-12-22 21:11:03 +03:00
a712dae709
serial_console_init() would enable serial console support without knowing if the serial driver succeeded or not. As a result, the serial console would interfere with a normal keyboard on a system lacking serial support. Reported-by: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> Signed-off-by: Shao Miller <sha0.miller@gmail.com> Signed-off-by: Michael Brown <mcb30@ipxe.org>
43 lines
968 B
C
43 lines
968 B
C
#include <ipxe/init.h>
|
|
#include <ipxe/serial.h>
|
|
#include <ipxe/console.h>
|
|
#include <config/console.h>
|
|
|
|
/** @file
|
|
*
|
|
* Serial console
|
|
*
|
|
*/
|
|
|
|
/* Set default console usage if applicable */
|
|
#if ! ( defined ( CONSOLE_SERIAL ) && CONSOLE_EXPLICIT ( CONSOLE_SERIAL ) )
|
|
#undef CONSOLE_SERIAL
|
|
#define CONSOLE_SERIAL ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_LOG )
|
|
#endif
|
|
|
|
struct console_driver serial_console __console_driver;
|
|
|
|
static void serial_console_init ( void ) {
|
|
/*
|
|
* Check if serial driver initialization is done.
|
|
* If so, it's time to enable the serial console.
|
|
*/
|
|
if ( serial_initialized )
|
|
serial_console.disabled = 0;
|
|
}
|
|
|
|
struct console_driver serial_console __console_driver = {
|
|
.putchar = serial_putc,
|
|
.getchar = serial_getc,
|
|
.iskey = serial_ischar,
|
|
.disabled = 1,
|
|
.usage = CONSOLE_SERIAL,
|
|
};
|
|
|
|
/**
|
|
* Serial console initialisation function
|
|
*/
|
|
struct init_fn serial_console_init_fn __init_fn ( INIT_CONSOLE ) = {
|
|
.initialise = serial_console_init,
|
|
};
|