diff options
author | Michael Brown | 2011-03-09 21:09:26 +0100 |
---|---|---|
committer | Michael Brown | 2011-03-09 21:09:26 +0100 |
commit | 1c0ff6e1a720907f9211f43d4d8d9fc18d522348 (patch) | |
tree | 664255e3bb570dbc248f9782f8f0d26bd98bd76a | |
parent | [script] Allow scripts to be replaced (diff) | |
download | ipxe-1c0ff6e1a720907f9211f43d4d8d9fc18d522348.tar.gz ipxe-1c0ff6e1a720907f9211f43d4d8d9fc18d522348.tar.xz ipxe-1c0ff6e1a720907f9211f43d4d8d9fc18d522348.zip |
[console] Move include/console.h to include/ipxe/console.h
Signed-off-by: Michael Brown <mcb30@ipxe.org>
31 files changed, 33 insertions, 33 deletions
diff --git a/src/arch/i386/core/video_subr.c b/src/arch/i386/core/video_subr.c index 4c583e5b..6885ad9a 100644 --- 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 0743fd23..0720cd76 100644 --- 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 221b597d..571ba9e6 100644 --- 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 994ebbf6..4fb7378d 100644 --- 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 1d2aa5e5..f27edf46 100644 --- 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 84219920..73e74d9c 100644 --- 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 b8e6af78..d692b1bc 100644 --- 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 682b1dfb..62e672a4 100644 --- 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 8c07a7f0..42df755b 100644 --- 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 f39cd04f..2d8ceb6f 100644 --- 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 70cf2657..b05a06b1 100644 --- 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 3ed4bd3d..b46d9c41 100644 --- 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 bb13f48c..195a844a 100644 --- 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 448ff518..ee34d0c5 100644 --- 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 6be3e104..735a52df 100644 --- 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 c8b6a6cd..9105a97b 100644 --- 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 f7aae14f..1073bf7f 100644 --- 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 51fc7c90..cc342f7c 100644 --- 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 087ebcc3..7c162021 100644 --- 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 6a7af9db..e76d2d09 100644 --- 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 954bde50..04aabfa8 100644 --- 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 176fbd3e..ff2f9af1 100644 --- 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 3241294d..b2fbe4f6 100644 --- 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 index df9e8092..3bfa5033 100644 --- 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 6d766ece..1303a427 100644 --- 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 0fdb8f2f..aeb7c661 100644 --- 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 e031cd09..e9fdaad0 100644 --- 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 db0d1b44..29f623c3 100644 --- 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 c8ee6213..7f9f2fd0 100644 --- 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 7f9a9448..3c353a68 100644 --- 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 b3105162..75789e2d 100644 --- 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> |