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
 #include <stdint.h>
22
 #include <stdint.h>
23
 #include <stdarg.h>
23
 #include <stdarg.h>
24
 #include <ipxe/io.h>
24
 #include <ipxe/io.h>
25
-#include <ipxe/console.h>
26
 
25
 
27
 /**
26
 /**
28
  * Pause until a key is pressed
27
  * Pause until a key is pressed

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

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

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

21
 #include <stddef.h>
21
 #include <stddef.h>
22
 #include <stdarg.h>
22
 #include <stdarg.h>
23
 #include <stdio.h>
23
 #include <stdio.h>
24
-#include <ipxe/console.h>
25
 #include <errno.h>
24
 #include <errno.h>
26
 #include <ipxe/vsprintf.h>
25
 #include <ipxe/vsprintf.h>
27
 
26
 

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

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

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

92
 #include "etherboot.h"
92
 #include "etherboot.h"
93
 #include "nic.h"
93
 #include "nic.h"
94
 #include <ipxe/isa.h>
94
 #include <ipxe/isa.h>
95
-#include <ipxe/console.h>
96
 #include "cs89x0.h"
95
 #include "cs89x0.h"
97
 
96
 
98
 static unsigned short	eth_nic_base;
97
 static unsigned short	eth_nic_base;

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

240
 #include "etherboot.h"
240
 #include "etherboot.h"
241
 #include "nic.h"
241
 #include "nic.h"
242
 #include <ipxe/isa.h>
242
 #include <ipxe/isa.h>
243
-#include <ipxe/console.h>
244
 #include <ipxe/ethernet.h>
243
 #include <ipxe/ethernet.h>
245
 
244
 
246
 /*
245
 /*

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

10
 #include <ipxe/pci.h>
10
 #include <ipxe/pci.h>
11
 #include <ipxe/ethernet.h>
11
 #include <ipxe/ethernet.h>
12
 #include "nic.h"
12
 #include "nic.h"
13
-#include <ipxe/console.h>
14
 #include "epic100.h"
13
 #include "epic100.h"
15
 
14
 
16
 /* Condensed operations for readability */
15
 /* Condensed operations for readability */

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

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

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

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

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

14
 #include <stdio.h>
14
 #include <stdio.h>
15
 #include <unistd.h>
15
 #include <unistd.h>
16
 #include <strings.h>
16
 #include <strings.h>
17
-#include <ipxe/console.h>
18
 #include <ipxe/timer.h>
17
 #include <ipxe/timer.h>
19
 #include <ipxe/if_arp.h>
18
 #include <ipxe/if_arp.h>
20
 #include <ipxe/if_ether.h>
19
 #include <ipxe/if_ether.h>

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

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

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

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

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

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

Loading…
Cancel
Save