[console] Move putchar() and getchar() declarations to stdio.h

Signed-off-by: Michael Brown <mcb30@ipxe.org>

src/core/debug.c

@@ -22,7 +22,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <stdarg.h>
 #include <ipxe/io.h>
-#include <ipxe/console.h>
 
 /**
  * Pause until a key is pressed

src/core/pcmcia.c

@@ -34,7 +34,6 @@ FILE_LICENCE ( GPL2_ONLY );
 #define CODE_STATUS "alpha"
 #define	CODE_VERSION "0.1.3"
 #include <pcmcia-opts.h>
-#include <ipxe/console.h>
 #include <ipxe/init.h>
 
 int	sockets; /* AHTODO: Phase this out! */

src/core/vsprintf.c

@@ -21,7 +21,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <ipxe/console.h>
 #include <errno.h>
 #include <ipxe/vsprintf.h>
 

src/drivers/net/3c509-eisa.c

@@ -6,7 +6,6 @@
 
 #include <ipxe/eisa.h>
 #include <ipxe/isa.h>
-#include <ipxe/console.h>
 #include "3c509.h"
 
 /*

src/drivers/net/cs89x0.c

@@ -92,7 +92,6 @@ FILE_LICENCE ( GPL2_ONLY );
 #include "etherboot.h"
 #include "nic.h"
 #include <ipxe/isa.h>
-#include <ipxe/console.h>
 #include "cs89x0.h"
 
 static unsigned short	eth_nic_base;

src/drivers/net/depca.c

@@ -240,7 +240,6 @@ FILE_LICENCE ( GPL_ANY );
 #include "etherboot.h"
 #include "nic.h"
 #include <ipxe/isa.h>
-#include <ipxe/console.h>
 #include <ipxe/ethernet.h>
 
 /*

src/drivers/net/epic100.c

@@ -10,7 +10,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/pci.h>
 #include <ipxe/ethernet.h>
 #include "nic.h"
-#include <ipxe/console.h>
 #include "epic100.h"
 
 /* Condensed operations for readability */

src/drivers/net/etherfabric.c

@@ -20,11 +20,11 @@ FILE_LICENCE ( GPL_ANY );
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
-#include <ipxe/console.h>
 #include <ipxe/io.h>
 #include <ipxe/pci.h>
 #include <ipxe/malloc.h>

src/hci/mucurses/mucurses.c

@@ -1,4 +1,3 @@
-#include <ipxe/console.h>
 #include <curses.h>
 #include "mucurses.h"
 

src/include/etherboot.h

@@ -14,7 +14,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <unistd.h>
 #include <strings.h>
-#include <ipxe/console.h>
 #include <ipxe/timer.h>
 #include <ipxe/if_arp.h>
 #include <ipxe/if_ether.h>

src/include/ipxe/console.h

@@ -1,6 +1,7 @@
 #ifndef _IPXE_CONSOLE_H
 #define _IPXE_CONSOLE_H
 
+#include <stdio.h>
 #include <ipxe/tables.h>
 
 /** @file
@@ -100,8 +101,6 @@ struct console_driver {
 
 /* Function prototypes */
 
-extern void putchar ( int character );
-extern int getchar ( void );
 extern int iskey ( void );
 extern int getkey ( unsigned long timeout );
 

src/include/stdio.h

@@ -6,6 +6,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <stdarg.h>
 
+extern void putchar ( int character );
+
+extern int getchar ( void );
+
 extern int __attribute__ (( format ( printf, 1, 2 ) ))
 printf ( const char *fmt, ... );
 

src/usr/iwmgmt.c

@@ -19,7 +19,6 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdio.h>
-#include <ipxe/console.h>
 #include <string.h>
 #include <errno.h>
 #include <ipxe/net80211.h>