summaryrefslogtreecommitdiffstats
path: root/src/hci
diff options
context:
space:
mode:
Diffstat (limited to 'src/hci')
-rw-r--r--src/hci/commands/autoboot_cmd.c2
-rw-r--r--src/hci/commands/config_cmd.c6
-rw-r--r--src/hci/commands/dhcp_cmd.c6
-rw-r--r--src/hci/commands/digest_cmd.c10
-rw-r--r--src/hci/commands/gdbstub_cmd.c4
-rw-r--r--src/hci/commands/ifmgmt_cmd.c4
-rw-r--r--src/hci/commands/image_cmd.c4
-rw-r--r--src/hci/commands/iwmgmt_cmd.c6
-rw-r--r--src/hci/commands/login_cmd.c4
-rw-r--r--src/hci/commands/nvo_cmd.c4
-rw-r--r--src/hci/commands/route_cmd.c2
-rw-r--r--src/hci/commands/sanboot_cmd.c2
-rw-r--r--src/hci/commands/time_cmd.c6
-rw-r--r--src/hci/editstring.c4
-rw-r--r--src/hci/mucurses/print.c2
-rw-r--r--src/hci/mucurses/widgets/editbox.c2
-rw-r--r--src/hci/readline.c4
-rw-r--r--src/hci/shell.c6
-rw-r--r--src/hci/shell_banner.c6
-rw-r--r--src/hci/strerror.c4
-rw-r--r--src/hci/tui/login_ui.c8
-rw-r--r--src/hci/tui/settings_ui.c10
-rw-r--r--src/hci/wireless_errors.c4
23 files changed, 55 insertions, 55 deletions
diff --git a/src/hci/commands/autoboot_cmd.c b/src/hci/commands/autoboot_cmd.c
index 95b172d10..51ba6f1fd 100644
--- a/src/hci/commands/autoboot_cmd.c
+++ b/src/hci/commands/autoboot_cmd.c
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include <gpxe/command.h>
+#include <ipxe/command.h>
#include <usr/autoboot.h>
FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/hci/commands/config_cmd.c b/src/hci/commands/config_cmd.c
index a9e1f1698..53b10f914 100644
--- a/src/hci/commands/config_cmd.c
+++ b/src/hci/commands/config_cmd.c
@@ -1,8 +1,8 @@
#include <string.h>
#include <stdio.h>
-#include <gpxe/command.h>
-#include <gpxe/settings.h>
-#include <gpxe/settings_ui.h>
+#include <ipxe/command.h>
+#include <ipxe/settings.h>
+#include <ipxe/settings_ui.h>
FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/hci/commands/dhcp_cmd.c b/src/hci/commands/dhcp_cmd.c
index 96aac8d4d..82869d624 100644
--- a/src/hci/commands/dhcp_cmd.c
+++ b/src/hci/commands/dhcp_cmd.c
@@ -27,9 +27,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <string.h>
#include <assert.h>
#include <getopt.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/in.h>
-#include <gpxe/command.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/in.h>
+#include <ipxe/command.h>
#include <usr/dhcpmgmt.h>
/** @file
diff --git a/src/hci/commands/digest_cmd.c b/src/hci/commands/digest_cmd.c
index bc6e55162..e28e6c3bb 100644
--- a/src/hci/commands/digest_cmd.c
+++ b/src/hci/commands/digest_cmd.c
@@ -19,12 +19,12 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include <gpxe/command.h>
-#include <gpxe/image.h>
-#include <gpxe/crypto.h>
+#include <ipxe/command.h>
+#include <ipxe/image.h>
+#include <ipxe/crypto.h>
-#include <gpxe/md5.h>
-#include <gpxe/sha1.h>
+#include <ipxe/md5.h>
+#include <ipxe/sha1.h>
/**
* "digest" command syntax message
diff --git a/src/hci/commands/gdbstub_cmd.c b/src/hci/commands/gdbstub_cmd.c
index 741675255..4ad597215 100644
--- a/src/hci/commands/gdbstub_cmd.c
+++ b/src/hci/commands/gdbstub_cmd.c
@@ -18,8 +18,8 @@
#include <stdio.h>
#include <getopt.h>
-#include <gpxe/command.h>
-#include <gpxe/gdbstub.h>
+#include <ipxe/command.h>
+#include <ipxe/gdbstub.h>
/** @file
*
diff --git a/src/hci/commands/ifmgmt_cmd.c b/src/hci/commands/ifmgmt_cmd.c
index ad069f14f..ae80cde42 100644
--- a/src/hci/commands/ifmgmt_cmd.c
+++ b/src/hci/commands/ifmgmt_cmd.c
@@ -20,8 +20,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <stdio.h>
#include <getopt.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/command.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/command.h>
#include <usr/ifmgmt.h>
#include <hci/ifmgmt_cmd.h>
diff --git a/src/hci/commands/image_cmd.c b/src/hci/commands/image_cmd.c
index 33994b510..74d0ff55a 100644
--- a/src/hci/commands/image_cmd.c
+++ b/src/hci/commands/image_cmd.c
@@ -24,8 +24,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <errno.h>
#include <libgen.h>
#include <getopt.h>
-#include <gpxe/image.h>
-#include <gpxe/command.h>
+#include <ipxe/image.h>
+#include <ipxe/command.h>
#include <usr/imgmgmt.h>
/** @file
diff --git a/src/hci/commands/iwmgmt_cmd.c b/src/hci/commands/iwmgmt_cmd.c
index 006c9f1df..8c00a206b 100644
--- a/src/hci/commands/iwmgmt_cmd.c
+++ b/src/hci/commands/iwmgmt_cmd.c
@@ -18,9 +18,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/netdevice.h>
-#include <gpxe/net80211.h>
-#include <gpxe/command.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/net80211.h>
+#include <ipxe/command.h>
#include <usr/iwmgmt.h>
#include <hci/ifmgmt_cmd.h>
diff --git a/src/hci/commands/login_cmd.c b/src/hci/commands/login_cmd.c
index 0da2497a7..be8476582 100644
--- a/src/hci/commands/login_cmd.c
+++ b/src/hci/commands/login_cmd.c
@@ -1,7 +1,7 @@
#include <string.h>
#include <stdio.h>
-#include <gpxe/command.h>
-#include <gpxe/login_ui.h>
+#include <ipxe/command.h>
+#include <ipxe/login_ui.h>
FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/hci/commands/nvo_cmd.c b/src/hci/commands/nvo_cmd.c
index 5eb2f06f5..331c3e474 100644
--- a/src/hci/commands/nvo_cmd.c
+++ b/src/hci/commands/nvo_cmd.c
@@ -4,8 +4,8 @@
#include <string.h>
#include <errno.h>
#include <getopt.h>
-#include <gpxe/settings.h>
-#include <gpxe/command.h>
+#include <ipxe/settings.h>
+#include <ipxe/command.h>
FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/hci/commands/route_cmd.c b/src/hci/commands/route_cmd.c
index 4372e34f5..057349723 100644
--- a/src/hci/commands/route_cmd.c
+++ b/src/hci/commands/route_cmd.c
@@ -20,7 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <stdio.h>
#include <getopt.h>
-#include <gpxe/command.h>
+#include <ipxe/command.h>
#include <usr/route.h>
/** @file
diff --git a/src/hci/commands/sanboot_cmd.c b/src/hci/commands/sanboot_cmd.c
index 783b747b2..ec7f5acfa 100644
--- a/src/hci/commands/sanboot_cmd.c
+++ b/src/hci/commands/sanboot_cmd.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <string.h>
#include <getopt.h>
-#include <gpxe/command.h>
+#include <ipxe/command.h>
#include <usr/autoboot.h>
FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/hci/commands/time_cmd.c b/src/hci/commands/time_cmd.c
index 947410ec7..5e2612a6d 100644
--- a/src/hci/commands/time_cmd.c
+++ b/src/hci/commands/time_cmd.c
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <gpxe/command.h>
-#include <gpxe/nap.h>
-#include <gpxe/timer.h>
+#include <ipxe/command.h>
+#include <ipxe/nap.h>
+#include <ipxe/timer.h>
static int time_exec ( int argc, char **argv ) {
unsigned long start;
diff --git a/src/hci/editstring.c b/src/hci/editstring.c
index 648f33893..9207e58a7 100644
--- a/src/hci/editstring.c
+++ b/src/hci/editstring.c
@@ -20,8 +20,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <assert.h>
#include <string.h>
-#include <gpxe/keys.h>
-#include <gpxe/editstring.h>
+#include <ipxe/keys.h>
+#include <ipxe/editstring.h>
/** @file
*
diff --git a/src/hci/mucurses/print.c b/src/hci/mucurses/print.c
index 1608c0a78..9c682588b 100644
--- a/src/hci/mucurses/print.c
+++ b/src/hci/mucurses/print.c
@@ -1,7 +1,7 @@
#include <curses.h>
#include <stdio.h>
#include <stddef.h>
-#include <gpxe/vsprintf.h>
+#include <ipxe/vsprintf.h>
#include "mucurses.h"
/** @file
diff --git a/src/hci/mucurses/widgets/editbox.c b/src/hci/mucurses/widgets/editbox.c
index ee7d609db..40e22d629 100644
--- a/src/hci/mucurses/widgets/editbox.c
+++ b/src/hci/mucurses/widgets/editbox.c
@@ -20,7 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <string.h>
#include <assert.h>
-#include <gpxe/editbox.h>
+#include <ipxe/editbox.h>
/** @file
*
diff --git a/src/hci/readline.c b/src/hci/readline.c
index e5699d519..ee252a199 100644
--- a/src/hci/readline.c
+++ b/src/hci/readline.c
@@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <string.h>
#include <stdlib.h>
#include <console.h>
-#include <gpxe/keys.h>
-#include <gpxe/editstring.h>
+#include <ipxe/keys.h>
+#include <ipxe/editstring.h>
#include <readline/readline.h>
/** @file
diff --git a/src/hci/shell.c b/src/hci/shell.c
index 5bedbdc98..3fc25727e 100644
--- a/src/hci/shell.c
+++ b/src/hci/shell.c
@@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <stdlib.h>
#include <stdio.h>
#include <readline/readline.h>
-#include <gpxe/command.h>
-#include <gpxe/shell.h>
+#include <ipxe/command.h>
+#include <ipxe/shell.h>
/** @file
*
@@ -32,7 +32,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
*/
/** The shell prompt string */
-static const char shell_prompt[] = "gPXE> ";
+static const char shell_prompt[] = "iPXE> ";
/** Flag set in order to exit shell */
static int exit_flag = 0;
diff --git a/src/hci/shell_banner.c b/src/hci/shell_banner.c
index dbe376739..8d2a5d0c7 100644
--- a/src/hci/shell_banner.c
+++ b/src/hci/shell_banner.c
@@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <console.h>
#include <unistd.h>
#include <config/general.h>
-#include <gpxe/keys.h>
-#include <gpxe/shell_banner.h>
+#include <ipxe/keys.h>
+#include <ipxe/shell_banner.h>
/** @file
*
@@ -45,7 +45,7 @@ int shell_banner ( void ) {
return enter_shell;
}
- printf ( "\nPress Ctrl-B for the gPXE command line..." );
+ printf ( "\nPress Ctrl-B for the iPXE command line..." );
/* Wait for key */
for ( wait_count = 0 ; wait_count < BANNER_TIMEOUT ; wait_count++ ) {
diff --git a/src/hci/strerror.c b/src/hci/strerror.c
index 94547dd4b..1b75f9807 100644
--- a/src/hci/strerror.c
+++ b/src/hci/strerror.c
@@ -1,7 +1,7 @@
#include <errno.h>
#include <string.h>
#include <stdio.h>
-#include <gpxe/errortab.h>
+#include <ipxe/errortab.h>
/** @file
*
@@ -52,7 +52,7 @@ static struct errortab * find_closest_error ( int errno ) {
if ( ( errortab = find_error ( errno ) ) != NULL )
return errortab;
- /* Second, try masking off the gPXE-specific bit and seeing if
+ /* Second, try masking off the iPXE-specific bit and seeing if
* we have an entry for the generic POSIX error message.
*/
if ( ( errortab = find_error ( errno & 0x7f0000ff ) ) != NULL )
diff --git a/src/hci/tui/login_ui.c b/src/hci/tui/login_ui.c
index b80bf27b7..bcfd09cb6 100644
--- a/src/hci/tui/login_ui.c
+++ b/src/hci/tui/login_ui.c
@@ -28,10 +28,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <errno.h>
#include <curses.h>
#include <console.h>
-#include <gpxe/settings.h>
-#include <gpxe/editbox.h>
-#include <gpxe/keys.h>
-#include <gpxe/login_ui.h>
+#include <ipxe/settings.h>
+#include <ipxe/editbox.h>
+#include <ipxe/keys.h>
+#include <ipxe/login_ui.h>
/* Colour pairs */
#define CPAIR_NORMAL 1
diff --git a/src/hci/tui/settings_ui.c b/src/hci/tui/settings_ui.c
index 74ce6afb1..be5357ae6 100644
--- a/src/hci/tui/settings_ui.c
+++ b/src/hci/tui/settings_ui.c
@@ -24,10 +24,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <string.h>
#include <curses.h>
#include <console.h>
-#include <gpxe/settings.h>
-#include <gpxe/editbox.h>
-#include <gpxe/keys.h>
-#include <gpxe/settings_ui.h>
+#include <ipxe/settings.h>
+#include <ipxe/editbox.h>
+#include <ipxe/keys.h>
+#include <ipxe/settings_ui.h>
/** @file
*
@@ -301,7 +301,7 @@ static void alert ( const char *fmt, ... ) {
*/
static void draw_title_row ( void ) {
attron ( A_BOLD );
- msg ( TITLE_ROW, "gPXE option configuration console" );
+ msg ( TITLE_ROW, "iPXE option configuration console" );
attroff ( A_BOLD );
}
diff --git a/src/hci/wireless_errors.c b/src/hci/wireless_errors.c
index 46006f9e1..0909c017d 100644
--- a/src/hci/wireless_errors.c
+++ b/src/hci/wireless_errors.c
@@ -19,7 +19,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <errno.h>
-#include <gpxe/errortab.h>
+#include <ipxe/errortab.h>
/* Record errors as though they come from the 802.11 stack */
#undef ERRFILE
@@ -32,7 +32,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
* strerror.
*/
struct errortab wireless_errors[] __errortab = {
- /* gPXE 802.11 stack errors */
+ /* iPXE 802.11 stack errors */
{ EINVAL | EUNIQ_01, "Packet too short" },
{ EINVAL | EUNIQ_02, "Packet 802.11 version not supported" },
{ EINVAL | EUNIQ_03, "Packet not a data packet" },