From 1c0ff6e1a720907f9211f43d4d8d9fc18d522348 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 9 Mar 2011 20:09:26 +0000
Subject: [PATCH] [console] Move include/console.h to include/ipxe/console.h

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/arch/i386/core/video_subr.c                 | 2 +-
 src/arch/i386/firmware/pcbios/bios_console.c    | 2 +-
 src/arch/i386/interface/syslinux/comboot_call.c | 2 +-
 src/core/btext.c                                | 2 +-
 src/core/console.c                              | 2 +-
 src/core/debug.c                                | 2 +-
 src/core/getkey.c                               | 2 +-
 src/core/monojob.c                              | 2 +-
 src/core/pc_kbd.c                               | 2 +-
 src/core/pcmcia.c                               | 2 +-
 src/core/serial_console.c                       | 2 +-
 src/core/vsprintf.c                             | 2 +-
 src/drivers/net/3c509-eisa.c                    | 2 +-
 src/drivers/net/cs89x0.c                        | 2 +-
 src/drivers/net/depca.c                         | 2 +-
 src/drivers/net/epic100.c                       | 2 +-
 src/drivers/net/etherfabric.c                   | 2 +-
 src/hci/mucurses/ansi_screen.c                  | 2 +-
 src/hci/mucurses/mucurses.c                     | 2 +-
 src/hci/readline.c                              | 2 +-
 src/hci/tui/login_ui.c                          | 2 +-
 src/hci/tui/settings_ui.c                       | 2 +-
 src/include/etherboot.h                         | 2 +-
 src/include/{ => ipxe}/console.h                | 6 +++---
 src/interface/efi/efi_console.c                 | 2 +-
 src/interface/linux/linux_console.c             | 2 +-
 src/usr/ifmgmt.c                                | 2 +-
 src/usr/iwmgmt.c                                | 2 +-
 src/usr/lotest.c                                | 2 +-
 src/usr/prompt.c                                | 2 +-
 src/usr/pxemenu.c                               | 2 +-
 31 files changed, 33 insertions(+), 33 deletions(-)
 rename src/include/{ => ipxe}/console.h (96%)

diff --git a/src/arch/i386/core/video_subr.c b/src/arch/i386/core/video_subr.c
index 4c583e5b6..6885ad9af 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 0743fd237..0720cd76d 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 221b597d4..571ba9e6d 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 994ebbf67..4fb7378d9 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 1d2aa5e57..f27edf468 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 842199202..73e74d9c3 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 b8e6af786..d692b1bc8 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 682b1dfbe..62e672a4c 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 8c07a7f01..42df755b5 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 f39cd04fe..2d8ceb6f5 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 70cf2657e..b05a06b17 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 3ed4bd3da..b46d9c419 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 bb13f48c8..195a844a4 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 448ff5181..ee34d0c59 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 6be3e1041..735a52dfb 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 c8b6a6cdf..9105a97be 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 f7aae14f8..1073bf7f9 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 51fc7c904..cc342f7ca 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 087ebcc34..7c1620210 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 6a7af9db6..e76d2d09a 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 954bde509..04aabfa8c 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 176fbd3ed..ff2f9af11 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 3241294d9..b2fbe4f67 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
similarity index 96%
rename from src/include/console.h
rename to src/include/ipxe/console.h
index df9e8092f..3bfa5033f 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 6d766ece8..1303a4278 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 0fdb8f2f9..aeb7c6618 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 e031cd09e..e9fdaad0d 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 db0d1b449..29f623c37 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 c8ee62134..7f9f2fd07 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 7f9a94484..3c353a686 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 b31051629..75789e2dc 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>