diff options
| -rw-r--r-- | src/core/debug.c | 1 | ||||
| -rw-r--r-- | src/core/pcmcia.c | 1 | ||||
| -rw-r--r-- | src/core/vsprintf.c | 1 | ||||
| -rw-r--r-- | src/drivers/net/3c509-eisa.c | 1 | ||||
| -rw-r--r-- | src/drivers/net/cs89x0.c | 1 | ||||
| -rw-r--r-- | src/drivers/net/depca.c | 1 | ||||
| -rw-r--r-- | src/drivers/net/epic100.c | 1 | ||||
| -rw-r--r-- | src/drivers/net/etherfabric.c | 2 | ||||
| -rw-r--r-- | src/hci/mucurses/mucurses.c | 1 | ||||
| -rw-r--r-- | src/include/etherboot.h | 1 | ||||
| -rw-r--r-- | src/include/ipxe/console.h | 3 | ||||
| -rw-r--r-- | src/include/stdio.h | 4 | ||||
| -rw-r--r-- | src/usr/iwmgmt.c | 1 |
13 files changed, 6 insertions, 13 deletions
diff --git a/src/core/debug.c b/src/core/debug.c index 73e74d9c..8fca8d90 100644 --- 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 2d8ceb6f..5fd21f4a 100644 --- 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 b838b89e..b721b024 100644 --- 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 195a844a..81c60ee9 100644 --- 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 ee34d0c5..876b8785 100644 --- 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 735a52df..016f28bb 100644 --- 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 5211317f..b478fab5 100644 --- 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 15e7d4c1..e82d6eb8 100644 --- 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 7c162021..ab9a6535 100644 --- 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 b2fbe4f6..ba79cb16 100644 --- 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 3bfa5033..5188f985 100644 --- 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 84181f0a..91840af5 100644 --- 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 29f623c3..abcd63f4 100644 --- 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> |