summaryrefslogtreecommitdiffstats
path: root/src/include/ipxe
diff options
context:
space:
mode:
authorMichael Brown2015-06-29 09:43:16 +0200
committerMichael Brown2015-06-29 12:04:10 +0200
commit2a696ab963fe71296d9495caed1b748f6f7d8971 (patch)
treebb6b45746dcb160819dc075d052b24bd77f958ac /src/include/ipxe
parent[gdb] Use new UART abstraction in GDB serial transport (diff)
downloadipxe-2a696ab963fe71296d9495caed1b748f6f7d8971.tar.gz
ipxe-2a696ab963fe71296d9495caed1b748f6f7d8971.tar.xz
ipxe-2a696ab963fe71296d9495caed1b748f6f7d8971.zip
[serial] Use new UART abstraction in serial console driver
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/ipxe')
-rw-r--r--src/include/ipxe/init.h7
-rw-r--r--src/include/ipxe/serial.h9
2 files changed, 7 insertions, 9 deletions
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 <ipxe/uart.h>
+
+extern struct uart serial_console;
#endif /* _IPXE_SERIAL_H */