diff options
| author | Shao Miller <sha0.miller@gmail.com> | 2012-10-05 15:14:12 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2012-10-05 15:18:57 +0100 |
| commit | a712dae709adc76c76646fa1c86d2cfb5c3edfbc (patch) | |
| tree | 246fe611b372b7ec0b86acba5b0354e88b6a6ab3 | |
| parent | fcdfe817644c601f40a5435c03f16a46b5264ab1 (diff) | |
| download | ipxe-a712dae709adc76c76646fa1c86d2cfb5c3edfbc.tar.gz | |
[serial] Don't enable serial console without serial support
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>
| -rw-r--r-- | src/core/serial.c | 7 | ||||
| -rw-r--r-- | src/core/serial_console.c | 9 | ||||
| -rw-r--r-- | src/include/ipxe/serial.h | 1 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/core/serial.c b/src/core/serial.c index a5551b13..8f5a159c 100644 --- a/src/core/serial.c +++ b/src/core/serial.c @@ -93,6 +93,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define uart_writeb(val,addr) outb((val),(addr)) #endif +/* Boolean for the state of serial driver initialization */ +int serial_initialized = 0; + /* * void serial_putc(int ch); * Write character `ch' to port UART_BASE. @@ -207,7 +210,6 @@ static void serial_init ( void ) { /* Set clear to send, so flow control works... */ uart_writeb((1<<1), UART_BASE + UART_MCR); - /* Flush the input buffer. */ do { /* rx buffer reg @@ -217,6 +219,9 @@ static void serial_init ( void ) { /* line status reg */ status = uart_readb(UART_BASE + UART_LSR); } while(status & UART_LSR_DR); + + /* Note that serial support has been initialized */ + serial_initialized = 1; out: return; } diff --git a/src/core/serial_console.c b/src/core/serial_console.c index bbddd6b2..3852a308 100644 --- a/src/core/serial_console.c +++ b/src/core/serial_console.c @@ -18,9 +18,12 @@ struct console_driver serial_console __console_driver; static void serial_console_init ( void ) { - /* Serial driver initialization should already be done, - * time to enable the serial console. */ - serial_console.disabled = 0; + /* + * 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 = { diff --git a/src/include/ipxe/serial.h b/src/include/ipxe/serial.h index c16e56ae..b47b1d12 100644 --- a/src/include/ipxe/serial.h +++ b/src/include/ipxe/serial.h @@ -12,5 +12,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); extern void serial_putc ( int ch ); extern int serial_getc ( void ); extern int serial_ischar ( void ); +extern int serial_initialized; #endif /* _IPXE_SERIAL_H */ |