Browse Source

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

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 12 years ago
parent
commit
a6d49c17c9

+ 0
- 1
src/core/debug.c View File

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

+ 0
- 1
src/core/pcmcia.c View File

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

+ 0
- 1
src/core/vsprintf.c View File

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

+ 0
- 1
src/drivers/net/3c509-eisa.c View File

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

+ 0
- 1
src/drivers/net/cs89x0.c View File

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

+ 0
- 1
src/drivers/net/depca.c View File

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

+ 0
- 1
src/drivers/net/epic100.c View File

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

+ 1
- 1
src/drivers/net/etherfabric.c View File

@@ -20,11 +20,11 @@ FILE_LICENCE ( GPL_ANY );
20 20
 
21 21
 #include <stdint.h>
22 22
 #include <stdlib.h>
23
+#include <stdio.h>
23 24
 #include <unistd.h>
24 25
 #include <errno.h>
25 26
 #include <assert.h>
26 27
 #include <byteswap.h>
27
-#include <ipxe/console.h>
28 28
 #include <ipxe/io.h>
29 29
 #include <ipxe/pci.h>
30 30
 #include <ipxe/malloc.h>

+ 0
- 1
src/hci/mucurses/mucurses.c View File

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

+ 0
- 1
src/include/etherboot.h View File

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

+ 1
- 2
src/include/ipxe/console.h View File

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

+ 4
- 0
src/include/stdio.h View File

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

+ 0
- 1
src/usr/iwmgmt.c View File

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

Loading…
Cancel
Save