[console] Move include/console.h to include/ipxe/console.h

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

diff --git a/src/arch/i386/core/video_subr.c b/src/arch/i386/core/video_subr.c
index 4c583e5b61a1c0235a20af57b6a4707b756eca17..6885ad9af26d54cbdeb4d1d46306c2c58ba0b041 100644 (file)
--- a/src/arch/i386/core/video_subr.c
+++ b/src/arch/i386/core/video_subr.c
@@ -8,7 +8,7 @@
 #include "stddef.h"
 #include "string.h"
 #include <ipxe/io.h>
-#include "console.h"
+#include <ipxe/console.h>
 #include <ipxe/init.h>
 #include "vga.h"
 

diff --git a/src/arch/i386/firmware/pcbios/bios_console.c b/src/arch/i386/firmware/pcbios/bios_console.c
index 0743fd237ccbdd45256b0c493f03a9b1907f11ff..0720cd76de09604a9543e9603f5a47126a6ad185 100644 (file)
--- a/src/arch/i386/firmware/pcbios/bios_console.c
+++ b/src/arch/i386/firmware/pcbios/bios_console.c
@@ -20,7 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <assert.h>
 #include <realmode.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/ansiesc.h>
 
 #define ATTR_BOLD              0x08

diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c
index 221b597d4cc9dc7766bafd4e287b3444fa14eed7..571ba9e6db3a72effad682ea81c28316fdfcead5 100644 (file)
--- a/src/arch/i386/interface/syslinux/comboot_call.c
+++ b/src/arch/i386/interface/syslinux/comboot_call.c
@@ -26,7 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <realmode.h>
 #include <biosint.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <stdlib.h>
 #include <comboot.h>
 #include <bzimage.h>

diff --git a/src/core/btext.c b/src/core/btext.c
index 994ebbf67844b961235971f94b088954cfb7edf1..4fb7378d9d940eefbaa708be7ea98229b5aa7725 100644 (file)
--- a/src/core/btext.c
+++ b/src/core/btext.c
@@ -9,7 +9,7 @@
  *   move to Etherboot by LYH
  */
 
-#include "console.h"
+#include <ipxe/console.h>
 #include <ipxe/init.h>
 #include <ipxe/pci.h>
 

diff --git a/src/core/console.c b/src/core/console.c
index 1d2aa5e570f1b8c5efe3dfc90fb5348b8ae6f908..f27edf468b9c209b65b7f40b7cf99790fcb073c3 100644 (file)
--- a/src/core/console.c
+++ b/src/core/console.c
@@ -1,5 +1,5 @@
 #include "stddef.h"
-#include "console.h"
+#include <ipxe/console.h>
 #include <ipxe/process.h>
 #include <ipxe/nap.h>
 

diff --git a/src/core/debug.c b/src/core/debug.c
index 84219920297359fe7187c644c6819c8b9413a3d3..73e74d9c35de6c9f0e08b567ea0aa6e1fd02d011 100644 (file)
--- a/src/core/debug.c
+++ b/src/core/debug.c
@@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <stdarg.h>
 #include <ipxe/io.h>
-#include <console.h>
+#include <ipxe/console.h>
 
 /**
  * Pause until a key is pressed

diff --git a/src/core/getkey.c b/src/core/getkey.c
index b8e6af78606ea17478c92754ed2d92e61beefa98..d692b1bc85e35271b8bdadb558cf9ddce37a77f5 100644 (file)
--- a/src/core/getkey.c
+++ b/src/core/getkey.c
@@ -19,7 +19,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <ctype.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/process.h>
 #include <ipxe/keys.h>
 #include <ipxe/timer.h>

diff --git a/src/core/monojob.c b/src/core/monojob.c
index 682b1dfbe98cca859f21e23475eba1155acdc993..62e672a4c87a57e70567ca0bdec406d179dce2c1 100644 (file)
--- a/src/core/monojob.c
+++ b/src/core/monojob.c
@@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <errno.h>
 #include <ipxe/process.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/keys.h>
 #include <ipxe/job.h>
 #include <ipxe/monojob.h>

diff --git a/src/core/pc_kbd.c b/src/core/pc_kbd.c
index 8c07a7f017ee3b00c1c6c3b7a0ea0a4b53987406..42df755b510f5ee2462447699a699efe078eace8 100644 (file)
--- a/src/core/pc_kbd.c
+++ b/src/core/pc_kbd.c
@@ -11,7 +11,7 @@
  */
 
 #include <ipxe/io.h>
-#include "console.h"
+#include <ipxe/console.h>
 
 static char key_map[][128] = {
     {

diff --git a/src/core/pcmcia.c b/src/core/pcmcia.c
index f39cd04fee4ef050d26cee30873ad3f9ed6cff2e..2d8ceb6f5779f3eb4ec0dd355e7e56035e86db4f 100644 (file)
--- a/src/core/pcmcia.c
+++ b/src/core/pcmcia.c
@@ -34,7 +34,7 @@ FILE_LICENCE ( GPL2_ONLY );
 #define CODE_STATUS "alpha"
 #define        CODE_VERSION "0.1.3"
 #include <pcmcia-opts.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/init.h>
 
 int    sockets; /* AHTODO: Phase this out! */

diff --git a/src/core/serial_console.c b/src/core/serial_console.c
index 70cf2657e234e45aadc0261b52d1652091c00bf8..b05a06b1740b2a3e162ef0c88f17f82e9bfbac4a 100644 (file)
--- a/src/core/serial_console.c
+++ b/src/core/serial_console.c
@@ -1,6 +1,6 @@
 #include <ipxe/init.h>
 #include <ipxe/serial.h>
-#include "console.h"
+#include <ipxe/console.h>
 
 /** @file
  *

diff --git a/src/core/vsprintf.c b/src/core/vsprintf.c
index 3ed4bd3daf11e1debb2c22b5bf40f94cff02438c..b46d9c4191711cf11722e863c3df0e8a11bf8425 100644 (file)
--- a/src/core/vsprintf.c
+++ b/src/core/vsprintf.c
@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <console.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 bb13f48c86550f56e992ecd421387f0b6bce047c..195a844a433e7a3912c9d3b123bbe18923a3c777 100644 (file)
--- a/src/drivers/net/3c509-eisa.c
+++ b/src/drivers/net/3c509-eisa.c
@@ -6,7 +6,7 @@
 
 #include <ipxe/eisa.h>
 #include <ipxe/isa.h>
-#include "console.h"
+#include <ipxe/console.h>
 #include "3c509.h"
 
 /*

diff --git a/src/drivers/net/cs89x0.c b/src/drivers/net/cs89x0.c
index 448ff5181d27c69b09b985ea5cde62199c44e188..ee34d0c5942640f48eda15968f867469a618f352 100644 (file)
--- a/src/drivers/net/cs89x0.c
+++ b/src/drivers/net/cs89x0.c
@@ -92,7 +92,7 @@ FILE_LICENCE ( GPL2_ONLY );
 #include "etherboot.h"
 #include "nic.h"
 #include <ipxe/isa.h>
-#include "console.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 6be3e1041ca643a6f9e75c902e7848f07964be74..735a52dfbbae577347203b52313ea2fa2554ed09 100644 (file)
--- a/src/drivers/net/depca.c
+++ b/src/drivers/net/depca.c
@@ -240,7 +240,7 @@ FILE_LICENCE ( GPL_ANY );
 #include "etherboot.h"
 #include "nic.h"
 #include <ipxe/isa.h>
-#include "console.h"
+#include <ipxe/console.h>
 #include <ipxe/ethernet.h>
 
 /*

diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index c8b6a6cdf5833983f8dc45dbfca4d60cd5d230f4..9105a97be4b11fa5b25d4888ae78b36a9a18630b 100644 (file)
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -10,7 +10,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/pci.h>
 #include <ipxe/ethernet.h>
 #include "nic.h"
-#include "console.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 f7aae14f8559d0fe89b8669bd2c1820f131681de..1073bf7f92b06b2e6744e55d1cb29225cce66ce0 100644 (file)
--- a/src/drivers/net/etherfabric.c
+++ b/src/drivers/net/etherfabric.c
@@ -24,7 +24,7 @@ FILE_LICENCE ( GPL_ANY );
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/io.h>
 #include <ipxe/pci.h>
 #include <ipxe/malloc.h>

diff --git a/src/hci/mucurses/ansi_screen.c b/src/hci/mucurses/ansi_screen.c
index 51fc7c9044d3caa466b01a2bac17833261cff9ce..cc342f7ca3040a712edd05300297734f43e488c6 100644 (file)
--- a/src/hci/mucurses/ansi_screen.c
+++ b/src/hci/mucurses/ansi_screen.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <curses.h>
-#include <console.h>
+#include <ipxe/console.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 

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

diff --git a/src/hci/readline.c b/src/hci/readline.c
index 6a7af9db6ffd9c81d2e044aa98fe09c7cacc4bc0..e76d2d09aaae7ce3d3003299928467360ec6ea51 100644 (file)
--- a/src/hci/readline.c
+++ b/src/hci/readline.c
@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/keys.h>
 #include <ipxe/editstring.h>
 #include <readline/readline.h>

diff --git a/src/hci/tui/login_ui.c b/src/hci/tui/login_ui.c
index 954bde50934d958e8897ed71fd304f277bc1dfeb..04aabfa8c75a6447cabd78f47223d382cd6a1ab1 100644 (file)
--- a/src/hci/tui/login_ui.c
+++ b/src/hci/tui/login_ui.c
@@ -27,7 +27,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <errno.h>
 #include <curses.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/settings.h>
 #include <ipxe/editbox.h>
 #include <ipxe/keys.h>

diff --git a/src/hci/tui/settings_ui.c b/src/hci/tui/settings_ui.c
index 176fbd3ed3f8e30b60d9abb9b1215fe4cb8aab13..ff2f9af11af460bec16d9bf5da539ffb1c4f3a89 100644 (file)
--- a/src/hci/tui/settings_ui.c
+++ b/src/hci/tui/settings_ui.c
@@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <unistd.h>
 #include <string.h>
 #include <curses.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/settings.h>
 #include <ipxe/editbox.h>
 #include <ipxe/keys.h>

diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index 3241294d9ab20acfdeb7e44715b8218e5d3a6efd..b2fbe4f67639880a28f79a2acb3490cd9e4ba85d 100644 (file)
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@ -14,7 +14,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <unistd.h>
 #include <strings.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/timer.h>
 #include <ipxe/if_arp.h>
 #include <ipxe/if_ether.h>

diff --git a/src/include/console.h b/src/include/ipxe/console.h
similarity index 96%
rename from src/include/console.h
rename to src/include/ipxe/console.h
index df9e8092f63c2180f909d1c721c997b6bd7429f8..3bfa5033fe7e75998ec410ec8f66e9b7a250ca39 100644 (file)
--- a/src/include/console.h
+++ b/src/include/ipxe/console.h
@@ -1,5 +1,5 @@
-#ifndef CONSOLE_H
-#define CONSOLE_H
+#ifndef _IPXE_CONSOLE_H
+#define _IPXE_CONSOLE_H
 
 #include <ipxe/tables.h>
 
@@ -105,4 +105,4 @@ extern int getchar ( void );
 extern int iskey ( void );
 extern int getkey ( unsigned long timeout );
 
-#endif /* CONSOLE_H */
+#endif /* _IPXE_CONSOLE_H */

diff --git a/src/interface/efi/efi_console.c b/src/interface/efi/efi_console.c
index 6d766ece898c906fae08c9b24c813dfbfc1849b3..1303a4278821f90eb77e921d7ecbffb2ce1ef3f2 100644 (file)
--- a/src/interface/efi/efi_console.c
+++ b/src/interface/efi/efi_console.c
@@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <assert.h>
 #include <ipxe/efi/efi.h>
 #include <ipxe/ansiesc.h>
-#include <console.h>
+#include <ipxe/console.h>
 
 #define ATTR_BOLD              0x08
 

diff --git a/src/interface/linux/linux_console.c b/src/interface/linux/linux_console.c
index 0fdb8f2f90730fb28dbab793320232521d0d7c0f..aeb7c6618324bec49cbdd1ac6a4a83c9ac6b5f11 100644 (file)
--- a/src/interface/linux/linux_console.c
+++ b/src/interface/linux/linux_console.c
@@ -24,7 +24,7 @@ FILE_LICENCE(GPL2_OR_LATER);
  *
  */
 
-#include <console.h>
+#include <ipxe/console.h>
 
 #include <ipxe/init.h>
 #include <ipxe/keys.h>

diff --git a/src/usr/ifmgmt.c b/src/usr/ifmgmt.c
index e031cd09e91366a2f402e756ca369c2aa469aef3..e9fdaad0d70d9c27b879a36ae6ff16419ab240e6 100644 (file)
--- a/src/usr/ifmgmt.c
+++ b/src/usr/ifmgmt.c
@@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/netdevice.h>
 #include <ipxe/device.h>
 #include <ipxe/process.h>

diff --git a/src/usr/iwmgmt.c b/src/usr/iwmgmt.c
index db0d1b449d46e391d7b5d5fa4756c94262e696da..29f623c3797997206257bbf51cb4ba8fe223056b 100644 (file)
--- a/src/usr/iwmgmt.c
+++ b/src/usr/iwmgmt.c
@@ -19,7 +19,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdio.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <string.h>
 #include <errno.h>
 #include <ipxe/net80211.h>

diff --git a/src/usr/lotest.c b/src/usr/lotest.c
index c8ee621342c00ad2c9dc4533aea31d434757bb45..7f9f2fd0780f9e64833e7cc208f29d34634ff7dd 100644 (file)
--- a/src/usr/lotest.c
+++ b/src/usr/lotest.c
@@ -28,7 +28,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/netdevice.h>
 #include <ipxe/if_ether.h>
 #include <ipxe/keys.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <usr/ifmgmt.h>
 #include <usr/lotest.h>
 

diff --git a/src/usr/prompt.c b/src/usr/prompt.c
index 7f9a94484c335f6cb9974b1ddff71e7d21d9133b..3c353a686a5fa8d1ea8bfe388c3dffc46c686ff5 100644 (file)
--- a/src/usr/prompt.c
+++ b/src/usr/prompt.c
@@ -26,7 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <errno.h>
 #include <stdio.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/timer.h>
 #include <usr/prompt.h>
 

diff --git a/src/usr/pxemenu.c b/src/usr/pxemenu.c
index b310516294e1beb3368814c3b9bc6e0559801b8a..75789e2dcde52bf389bf4bfc12149100b9648016 100644 (file)
--- a/src/usr/pxemenu.c
+++ b/src/usr/pxemenu.c
@@ -26,7 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ctype.h>
 #include <byteswap.h>
 #include <curses.h>
-#include <console.h>
+#include <ipxe/console.h>
 #include <ipxe/dhcp.h>
 #include <ipxe/keys.h>
 #include <ipxe/timer.h>