From 2a696ab963fe71296d9495caed1b748f6f7d8971 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 29 Jun 2015 08:43:16 +0100 Subject: [serial] Use new UART abstraction in serial console driver Signed-off-by: Michael Brown --- src/include/ipxe/init.h | 7 +++---- src/include/ipxe/serial.h | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src/include') diff --git a/src/include/ipxe/init.h b/src/include/ipxe/init.h index e051dc6cd..025cfaf37 100644 --- a/src/include/ipxe/init.h +++ b/src/include/ipxe/init.h @@ -26,10 +26,9 @@ struct init_fn { */ #define INIT_EARLY 01 /**< Early initialisation */ -#define INIT_SERIAL 02 /**< Serial driver initialisation */ -#define INIT_CONSOLE 03 /**< Console initialisation */ -#define INIT_NORMAL 04 /**< Normal initialisation */ -#define INIT_LATE 05 /**< Late initialisation */ +#define INIT_CONSOLE 02 /**< Console initialisation */ +#define INIT_NORMAL 03 /**< Normal initialisation */ +#define INIT_LATE 04 /**< Late initialisation */ /** @} */ diff --git a/src/include/ipxe/serial.h b/src/include/ipxe/serial.h index 86d05370d..83be59c31 100644 --- a/src/include/ipxe/serial.h +++ b/src/include/ipxe/serial.h @@ -3,15 +3,14 @@ /** @file * - * Serial driver functions + * Serial console * */ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); -extern void serial_putc ( int ch ); -extern int serial_getc ( void ); -extern int serial_ischar ( void ); -extern int serial_initialized; +#include + +extern struct uart serial_console; #endif /* _IPXE_SERIAL_H */ -- cgit v1.2.3-55-g7522