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

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

diff --git a/src/core/debug.c b/src/core/debug.c
index 73e74d9c35de6c9f0e08b567ea0aa6e1fd02d011..8fca8d90d194c3289d5e80c2fa3788804f125c90 100644 (file)
--- a/src/core/debug.c
+++ b/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

diff --git a/src/core/pcmcia.c b/src/core/pcmcia.c
index 2d8ceb6f5779f3eb4ec0dd355e7e56035e86db4f..5fd21f4a9720c9b02cbbc22e013fe155cba0d304 100644 (file)
--- a/src/core/pcmcia.c
+++ b/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! */

diff --git a/src/core/vsprintf.c b/src/core/vsprintf.c
index b838b89e536725233caeee8e2209f2f0f1835534..b721b024114d2f598eb8b17caae2e72a6f719339 100644 (file)
--- a/src/core/vsprintf.c
+++ b/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>
 

diff --git a/src/drivers/net/3c509-eisa.c b/src/drivers/net/3c509-eisa.c
index 195a844a433e7a3912c9d3b123bbe18923a3c777..81c60ee913cfffc03f305be0d711b199c0cfd171 100644 (file)
--- a/src/drivers/net/3c509-eisa.c
+++ b/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"
 
 /*

diff --git a/src/drivers/net/cs89x0.c b/src/drivers/net/cs89x0.c
index ee34d0c5942640f48eda15968f867469a618f352..876b8785687784080a41b78e3ad953fac740af3f 100644 (file)
--- a/src/drivers/net/cs89x0.c
+++ b/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;

diff --git a/src/drivers/net/depca.c b/src/drivers/net/depca.c
index 735a52dfbbae577347203b52313ea2fa2554ed09..016f28bb2db51938b008ee1fcfef1bc0188c2172 100644 (file)
--- a/src/drivers/net/depca.c
+++ b/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>
 
 /*

diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index 5211317fffee8bb67544622cc325d01471f4ebe9..b478fab500a720a234b6880826237960e0f55ca5 100644 (file)
--- a/src/drivers/net/epic100.c
+++ b/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 */

diff --git a/src/drivers/net/etherfabric.c b/src/drivers/net/etherfabric.c
index 15e7d4c1395b453b2a2e6988074bac2bb39afabb..e82d6eb8bb82d1ad55b0d38036d4826f7bc63f89 100644 (file)
--- a/src/drivers/net/etherfabric.c
+++ b/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>

diff --git a/src/hci/mucurses/mucurses.c b/src/hci/mucurses/mucurses.c
index 7c1620210d0f5a2f8f3ada06de6a0ac52bb43460..ab9a6535ffad9e4a46bafb63aa97161159ebbd5f 100644 (file)
--- a/src/hci/mucurses/mucurses.c
+++ b/src/hci/mucurses/mucurses.c
@@ -1,4 +1,3 @@
-#include <ipxe/console.h>
 #include <curses.h>
 #include "mucurses.h"
 

diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index b2fbe4f67639880a28f79a2acb3490cd9e4ba85d..ba79cb16ac60474b96489a097dc04bc31745a29a 100644 (file)
--- a/src/include/etherboot.h
+++ b/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>

diff --git a/src/include/ipxe/console.h b/src/include/ipxe/console.h
index 3bfa5033fe7e75998ec410ec8f66e9b7a250ca39..5188f98558501a2ef8bb5a13f14c6bbbd90e9745 100644 (file)
--- a/src/include/ipxe/console.h
+++ b/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 );
 

diff --git a/src/include/stdio.h b/src/include/stdio.h
index 84181f0a1820ba7df445f816b5c244c6bea98a68..91840af5b8f2557c33aa701e90186f989c518166 100644 (file)
--- a/src/include/stdio.h
+++ b/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, ... );
 

diff --git a/src/usr/iwmgmt.c b/src/usr/iwmgmt.c
index 29f623c3797997206257bbf51cb4ba8fe223056b..abcd63f4df295f3eda6b1532d321bba4e9ce9f64 100644 (file)
--- a/src/usr/iwmgmt.c
+++ b/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>