diff options
Diffstat (limited to 'src/core')
46 files changed, 133 insertions, 133 deletions
diff --git a/src/core/acpi.c b/src/core/acpi.c index b65f4d483..d573d2e98 100644 --- a/src/core/acpi.c +++ b/src/core/acpi.c @@ -18,7 +18,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/acpi.h> +#include <ipxe/acpi.h> /** @file * diff --git a/src/core/ansiesc.c b/src/core/ansiesc.c index 31306e2a8..05bbb8695 100644 --- a/src/core/ansiesc.c +++ b/src/core/ansiesc.c @@ -20,7 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <assert.h> -#include <gpxe/ansiesc.h> +#include <ipxe/ansiesc.h> /** @file * diff --git a/src/core/base64.c b/src/core/base64.c index 5619ef7b1..01bf46e22 100644 --- a/src/core/base64.c +++ b/src/core/base64.c @@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> #include <string.h> #include <assert.h> -#include <gpxe/base64.h> +#include <ipxe/base64.h> /** @file * diff --git a/src/core/bitmap.c b/src/core/bitmap.c index bbe9cbaa1..76fcef67b 100644 --- a/src/core/bitmap.c +++ b/src/core/bitmap.c @@ -19,7 +19,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <errno.h> -#include <gpxe/bitmap.h> +#include <ipxe/bitmap.h> /** @file * diff --git a/src/core/btext.c b/src/core/btext.c index 122d89fb8..994ebbf67 100644 --- a/src/core/btext.c +++ b/src/core/btext.c @@ -10,8 +10,8 @@ */ #include "console.h" -#include <gpxe/init.h> -#include <gpxe/pci.h> +#include <ipxe/init.h> +#include <ipxe/pci.h> #undef __BIG_ENDIAN #if 0 diff --git a/src/core/console.c b/src/core/console.c index e22d26019..1d2aa5e57 100644 --- a/src/core/console.c +++ b/src/core/console.c @@ -1,7 +1,7 @@ #include "stddef.h" #include "console.h" -#include <gpxe/process.h> -#include <gpxe/nap.h> +#include <ipxe/process.h> +#include <ipxe/nap.h> /** @file */ diff --git a/src/core/cpio.c b/src/core/cpio.c index b303fa35f..5b7b3aa1d 100644 --- a/src/core/cpio.c +++ b/src/core/cpio.c @@ -26,7 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdio.h> #include <string.h> -#include <gpxe/cpio.h> +#include <ipxe/cpio.h> /** * Set field within a CPIO header diff --git a/src/core/cwuri.c b/src/core/cwuri.c index 65e01b21e..f649ba440 100644 --- a/src/core/cwuri.c +++ b/src/core/cwuri.c @@ -19,7 +19,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stddef.h> -#include <gpxe/uri.h> +#include <ipxe/uri.h> /** @file * diff --git a/src/core/debug.c b/src/core/debug.c index 8f9293099..a08be9c22 100644 --- a/src/core/debug.c +++ b/src/core/debug.c @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdint.h> #include <stdarg.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #include <console.h> void pause ( void ) { diff --git a/src/core/device.c b/src/core/device.c index 96ccc9ff3..1a227fd9c 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -19,10 +19,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> -#include <gpxe/list.h> -#include <gpxe/tables.h> -#include <gpxe/device.h> -#include <gpxe/init.h> +#include <ipxe/list.h> +#include <ipxe/tables.h> +#include <ipxe/device.h> +#include <ipxe/init.h> /** * @file diff --git a/src/core/downloader.c b/src/core/downloader.c index 86c144dc6..9285efa20 100644 --- a/src/core/downloader.c +++ b/src/core/downloader.c @@ -21,13 +21,13 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> #include <stdarg.h> #include <errno.h> -#include <gpxe/xfer.h> -#include <gpxe/open.h> -#include <gpxe/job.h> -#include <gpxe/uaccess.h> -#include <gpxe/umalloc.h> -#include <gpxe/image.h> -#include <gpxe/downloader.h> +#include <ipxe/xfer.h> +#include <ipxe/open.h> +#include <ipxe/job.h> +#include <ipxe/uaccess.h> +#include <ipxe/umalloc.h> +#include <ipxe/image.h> +#include <ipxe/downloader.h> /** @file * diff --git a/src/core/exec.c b/src/core/exec.c index 6c16aa445..7e866325c 100644 --- a/src/core/exec.c +++ b/src/core/exec.c @@ -27,9 +27,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <getopt.h> #include <errno.h> #include <assert.h> -#include <gpxe/tables.h> -#include <gpxe/command.h> -#include <gpxe/settings.h> +#include <ipxe/tables.h> +#include <ipxe/command.h> +#include <ipxe/settings.h> /** @file * diff --git a/src/core/filter.c b/src/core/filter.c index a8bee7dc2..94a521459 100644 --- a/src/core/filter.c +++ b/src/core/filter.c @@ -18,8 +18,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/xfer.h> -#include <gpxe/filter.h> +#include <ipxe/xfer.h> +#include <ipxe/filter.h> /** @file * diff --git a/src/core/fnrec.c b/src/core/fnrec.c index c768c91d4..888a4a277 100644 --- a/src/core/fnrec.c +++ b/src/core/fnrec.c @@ -21,8 +21,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <gpxe/init.h> -#include <gpxe/uaccess.h> +#include <ipxe/init.h> +#include <ipxe/uaccess.h> /** @file * diff --git a/src/core/gdbserial.c b/src/core/gdbserial.c index b0d50479f..d372da964 100644 --- a/src/core/gdbserial.c +++ b/src/core/gdbserial.c @@ -17,9 +17,9 @@ */ #include <assert.h> -#include <gpxe/serial.h> -#include <gpxe/gdbstub.h> -#include <gpxe/gdbserial.h> +#include <ipxe/serial.h> +#include <ipxe/gdbstub.h> +#include <ipxe/gdbserial.h> struct gdb_transport serial_gdb_transport __gdb_transport; diff --git a/src/core/gdbstub.c b/src/core/gdbstub.c index c80839558..2cae29fec 100644 --- a/src/core/gdbstub.c +++ b/src/core/gdbstub.c @@ -28,7 +28,7 @@ #include <string.h> #include <ctype.h> #include <byteswap.h> -#include <gpxe/gdbstub.h> +#include <ipxe/gdbstub.h> #include "gdbmach.h" enum { diff --git a/src/core/gdbudp.c b/src/core/gdbudp.c index 26feb38a7..287ec6305 100644 --- a/src/core/gdbudp.c +++ b/src/core/gdbudp.c @@ -19,16 +19,16 @@ #include <stdio.h> #include <string.h> #include <byteswap.h> -#include <gpxe/iobuf.h> -#include <gpxe/in.h> -#include <gpxe/if_arp.h> -#include <gpxe/if_ether.h> -#include <gpxe/ip.h> -#include <gpxe/udp.h> -#include <gpxe/netdevice.h> -#include <gpxe/nap.h> -#include <gpxe/gdbstub.h> -#include <gpxe/gdbudp.h> +#include <ipxe/iobuf.h> +#include <ipxe/in.h> +#include <ipxe/if_arp.h> +#include <ipxe/if_ether.h> +#include <ipxe/ip.h> +#include <ipxe/udp.h> +#include <ipxe/netdevice.h> +#include <ipxe/nap.h> +#include <ipxe/gdbstub.h> +#include <ipxe/gdbudp.h> /** @file * diff --git a/src/core/getkey.c b/src/core/getkey.c index dbd074ccf..b159656ec 100644 --- a/src/core/getkey.c +++ b/src/core/getkey.c @@ -20,9 +20,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ctype.h> #include <console.h> -#include <gpxe/process.h> -#include <gpxe/keys.h> -#include <gpxe/timer.h> +#include <ipxe/process.h> +#include <ipxe/keys.h> +#include <ipxe/timer.h> /** @file * diff --git a/src/core/hw.c b/src/core/hw.c index 65604ee0c..f8dc6be4a 100644 --- a/src/core/hw.c +++ b/src/core/hw.c @@ -2,10 +2,10 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <gpxe/refcnt.h> -#include <gpxe/process.h> -#include <gpxe/xfer.h> -#include <gpxe/open.h> +#include <ipxe/refcnt.h> +#include <ipxe/process.h> +#include <ipxe/xfer.h> +#include <ipxe/open.h> /** @file * diff --git a/src/core/image.c b/src/core/image.c index 24fe51ab9..c6ef71f47 100644 --- a/src/core/image.c +++ b/src/core/image.c @@ -25,10 +25,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <errno.h> #include <assert.h> #include <libgen.h> -#include <gpxe/list.h> -#include <gpxe/umalloc.h> -#include <gpxe/uri.h> -#include <gpxe/image.h> +#include <ipxe/list.h> +#include <ipxe/umalloc.h> +#include <ipxe/uri.h> +#include <ipxe/image.h> /** @file * diff --git a/src/core/init.c b/src/core/init.c index cd0f6dcc8..4dc706f63 100644 --- a/src/core/init.c +++ b/src/core/init.c @@ -18,8 +18,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/device.h> -#include <gpxe/init.h> +#include <ipxe/device.h> +#include <ipxe/init.h> /** @file * @@ -31,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); static int started = 0; /** - * Initialise gPXE + * Initialise iPXE * * This function performs the one-time-only and irreversible * initialisation steps, such as initialising the heap. It must be @@ -49,7 +49,7 @@ void initialise ( void ) { } /** - * Start up gPXE + * Start up iPXE * * This function performs the repeatable initialisation steps, such as * probing devices. You may call startup() and shutdown() multiple @@ -71,11 +71,11 @@ void startup ( void ) { } /** - * Shut down gPXE + * Shut down iPXE * * @v flags Shutdown behaviour flags * - * This function reverses the actions of startup(), and leaves gPXE in + * This function reverses the actions of startup(), and leaves iPXE in * a state ready to be removed from memory. You may call startup() * again after calling shutdown(). * diff --git a/src/core/interface.c b/src/core/interface.c index 43d58ed20..d1583a8a9 100644 --- a/src/core/interface.c +++ b/src/core/interface.c @@ -18,7 +18,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/interface.h> +#include <ipxe/interface.h> /** @file * diff --git a/src/core/iobuf.c b/src/core/iobuf.c index 1ce7890e4..d776d606e 100644 --- a/src/core/iobuf.c +++ b/src/core/iobuf.c @@ -20,8 +20,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> #include <errno.h> -#include <gpxe/malloc.h> -#include <gpxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/iobuf.h> /** @file * diff --git a/src/core/job.c b/src/core/job.c index 438064ef2..ffc0057fa 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -20,7 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <errno.h> -#include <gpxe/job.h> +#include <ipxe/job.h> /** @file * diff --git a/src/core/linebuf.c b/src/core/linebuf.c index 221f4e1a6..f152bccb0 100644 --- a/src/core/linebuf.c +++ b/src/core/linebuf.c @@ -29,7 +29,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <stdlib.h> #include <errno.h> -#include <gpxe/linebuf.h> +#include <ipxe/linebuf.h> /** * Retrieve buffered-up line diff --git a/src/core/main.c b/src/core/main.c index d07d24c02..ac81c284c 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1,5 +1,5 @@ /************************************************************************** -gPXE - Network Bootstrap Program +iPXE - Network Bootstrap Program Literature dealing with the network protocols: ARP - RFC826 @@ -15,11 +15,11 @@ Literature dealing with the network protocols: FILE_LICENCE ( GPL2_OR_LATER ); #include <stdio.h> -#include <gpxe/init.h> -#include <gpxe/features.h> -#include <gpxe/shell.h> -#include <gpxe/shell_banner.h> -#include <gpxe/image.h> +#include <ipxe/init.h> +#include <ipxe/features.h> +#include <ipxe/shell.h> +#include <ipxe/shell_banner.h> +#include <ipxe/image.h> #include <usr/autoboot.h> #include <config/general.h> @@ -46,17 +46,17 @@ __asmcall int main ( void ) { * Print welcome banner * * - * If you wish to brand this build of gPXE, please do so by + * If you wish to brand this build of iPXE, please do so by * defining the string PRODUCT_NAME in config/general.h. * * While nothing in the GPL prevents you from removing all - * references to gPXE or http://etherboot.org, we prefer you - * not to do so. + * references to iPXE or http://ipxe.org, we prefer you not to + * do so. * */ - printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD "gPXE " VERSION - NORMAL " -- Open Source Boot Firmware -- " - CYAN "http://etherboot.org" NORMAL "\n" + printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD "iPXE " VERSION + NORMAL " -- Open Source Network Boot Firmware -- " + CYAN "http://ipxe.org" NORMAL "\n" "Features:" ); for_each_table_entry ( feature, FEATURES ) printf ( " %s", feature->name ); diff --git a/src/core/malloc.c b/src/core/malloc.c index 8b0bc24d2..bf01b278d 100644 --- a/src/core/malloc.c +++ b/src/core/malloc.c @@ -22,10 +22,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> #include <string.h> #include <strings.h> -#include <gpxe/io.h> -#include <gpxe/list.h> -#include <gpxe/init.h> -#include <gpxe/malloc.h> +#include <ipxe/io.h> +#include <ipxe/list.h> +#include <ipxe/init.h> +#include <ipxe/malloc.h> /** @file * diff --git a/src/core/misc.c b/src/core/misc.c index c19591bb9..799693577 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -7,8 +7,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> #include <ctype.h> #include <byteswap.h> -#include <gpxe/in.h> -#include <gpxe/timer.h> +#include <ipxe/in.h> +#include <ipxe/timer.h> /************************************************************************** INET_ATON - Convert an ascii x.x.x.x to binary form diff --git a/src/core/monojob.c b/src/core/monojob.c index a24b559e1..cd255076e 100644 --- a/src/core/monojob.c +++ b/src/core/monojob.c @@ -21,12 +21,12 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <stdio.h> #include <errno.h> -#include <gpxe/process.h> +#include <ipxe/process.h> #include <console.h> -#include <gpxe/keys.h> -#include <gpxe/job.h> -#include <gpxe/monojob.h> -#include <gpxe/timer.h> +#include <ipxe/keys.h> +#include <ipxe/job.h> +#include <ipxe/monojob.h> +#include <ipxe/timer.h> /** @file * diff --git a/src/core/null_nap.c b/src/core/null_nap.c index a3b01eb10..c886f548e 100644 --- a/src/core/null_nap.c +++ b/src/core/null_nap.c @@ -1,3 +1,3 @@ -#include <gpxe/nap.h> +#include <ipxe/nap.h> PROVIDE_NAP_INLINE ( null, cpu_nap ); diff --git a/src/core/nvo.c b/src/core/nvo.c index 3dbf51d3f..327f4f981 100644 --- a/src/core/nvo.c +++ b/src/core/nvo.c @@ -22,9 +22,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> #include <string.h> #include <errno.h> -#include <gpxe/dhcp.h> -#include <gpxe/nvs.h> -#include <gpxe/nvo.h> +#include <ipxe/dhcp.h> +#include <ipxe/nvs.h> +#include <ipxe/nvo.h> /** @file * diff --git a/src/core/open.c b/src/core/open.c index 70b427ba2..58edef561 100644 --- a/src/core/open.c +++ b/src/core/open.c @@ -21,10 +21,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdarg.h> #include <string.h> #include <errno.h> -#include <gpxe/xfer.h> -#include <gpxe/uri.h> -#include <gpxe/socket.h> -#include <gpxe/open.h> +#include <ipxe/xfer.h> +#include <ipxe/uri.h> +#include <ipxe/socket.h> +#include <ipxe/open.h> /** @file * @@ -73,7 +73,7 @@ int xfer_open_uri ( struct xfer_interface *xfer, struct uri *uri ) { * Open URI string * * @v xfer Data transfer interface - * @v uri_string URI string (e.g. "http://etherboot.org/kernel") + * @v uri_string URI string (e.g. "http://ipxe.org/kernel") * @ret rc Return status code * * The URI will be regarded as being relative to the current working diff --git a/src/core/pc_kbd.c b/src/core/pc_kbd.c index 799c8beb7..8c07a7f01 100644 --- a/src/core/pc_kbd.c +++ b/src/core/pc_kbd.c @@ -10,7 +10,7 @@ * yhlu@tyan.com */ -#include <gpxe/io.h> +#include <ipxe/io.h> #include "console.h" static char key_map[][128] = { diff --git a/src/core/pcmcia.c b/src/core/pcmcia.c index 631971ef5..72d59b716 100644 --- a/src/core/pcmcia.c +++ b/src/core/pcmcia.c @@ -32,7 +32,7 @@ #define CODE_VERSION "0.1.3" #include <pcmcia-opts.h> #include <console.h> -#include <gpxe/init.h> +#include <ipxe/init.h> int sockets; /* AHTODO: Phase this out! */ u_int pccsocks; diff --git a/src/core/posix_io.c b/src/core/posix_io.c index e6b1a0f69..05077c8b2 100644 --- a/src/core/posix_io.c +++ b/src/core/posix_io.c @@ -21,11 +21,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> #include <string.h> #include <errno.h> -#include <gpxe/list.h> -#include <gpxe/xfer.h> -#include <gpxe/open.h> -#include <gpxe/process.h> -#include <gpxe/posix_io.h> +#include <ipxe/list.h> +#include <ipxe/xfer.h> +#include <ipxe/open.h> +#include <ipxe/process.h> +#include <ipxe/posix_io.h> /** @file * @@ -33,7 +33,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); * * These functions provide traditional blocking I/O semantics. They * are designed to be used by the PXE TFTP API. Because they block, - * they may not be used by most other portions of the gPXE codebase. + * they may not be used by most other portions of the iPXE codebase. */ /** An open file */ diff --git a/src/core/process.c b/src/core/process.c index 9c13e0204..940e3b878 100644 --- a/src/core/process.c +++ b/src/core/process.c @@ -18,9 +18,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/list.h> -#include <gpxe/init.h> -#include <gpxe/process.h> +#include <ipxe/list.h> +#include <ipxe/init.h> +#include <ipxe/process.h> /** @file * diff --git a/src/core/random.c b/src/core/random.c index 6e7374e34..8824dca3a 100644 --- a/src/core/random.c +++ b/src/core/random.c @@ -7,7 +7,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> -#include <gpxe/timer.h> +#include <ipxe/timer.h> static int32_t rnd_seed = 0; diff --git a/src/core/refcnt.c b/src/core/refcnt.c index f2286cacd..cd6ab9648 100644 --- a/src/core/refcnt.c +++ b/src/core/refcnt.c @@ -19,7 +19,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> -#include <gpxe/refcnt.h> +#include <ipxe/refcnt.h> /** @file * diff --git a/src/core/resolv.c b/src/core/resolv.c index 6f01f93e9..9c96b9fca 100644 --- a/src/core/resolv.c +++ b/src/core/resolv.c @@ -22,11 +22,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> #include <string.h> #include <errno.h> -#include <gpxe/in.h> -#include <gpxe/xfer.h> -#include <gpxe/open.h> -#include <gpxe/process.h> -#include <gpxe/resolv.h> +#include <ipxe/in.h> +#include <ipxe/xfer.h> +#include <ipxe/open.h> +#include <ipxe/process.h> +#include <ipxe/resolv.h> /** @file * diff --git a/src/core/serial.c b/src/core/serial.c index d35e89e95..a5551b136 100644 --- a/src/core/serial.c +++ b/src/core/serial.c @@ -14,10 +14,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include "stddef.h" -#include <gpxe/init.h> -#include <gpxe/io.h> +#include <ipxe/init.h> +#include <ipxe/io.h> #include <unistd.h> -#include <gpxe/serial.h> +#include <ipxe/serial.h> #include "config/serial.h" /* Set default values if none specified */ diff --git a/src/core/serial_console.c b/src/core/serial_console.c index 0300482af..70cf2657e 100644 --- a/src/core/serial_console.c +++ b/src/core/serial_console.c @@ -1,5 +1,5 @@ -#include <gpxe/init.h> -#include <gpxe/serial.h> +#include <ipxe/init.h> +#include <ipxe/serial.h> #include "console.h" /** @file diff --git a/src/core/settings.c b/src/core/settings.c index 7d83101cf..427b9ed6c 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -26,12 +26,12 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <byteswap.h> #include <errno.h> #include <assert.h> -#include <gpxe/in.h> -#include <gpxe/vsprintf.h> -#include <gpxe/dhcp.h> -#include <gpxe/uuid.h> -#include <gpxe/uri.h> -#include <gpxe/settings.h> +#include <ipxe/in.h> +#include <ipxe/vsprintf.h> +#include <ipxe/dhcp.h> +#include <ipxe/uuid.h> +#include <ipxe/uri.h> +#include <ipxe/settings.h> /** @file * diff --git a/src/core/uri.c b/src/core/uri.c index 6a1f2e593..57502f26e 100644 --- a/src/core/uri.c +++ b/src/core/uri.c @@ -29,8 +29,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <libgen.h> #include <ctype.h> -#include <gpxe/vsprintf.h> -#include <gpxe/uri.h> +#include <ipxe/vsprintf.h> +#include <ipxe/uri.h> /** * Dump URI for debugging @@ -356,9 +356,9 @@ char * resolve_path ( const char *base_path, * @v relative_uri Relative URI * @ret resolved_uri Resolved URI * - * Takes a base URI (e.g. "http://etherboot.org/kernels/vmlinuz" and a + * Takes a base URI (e.g. "http://ipxe.org/kernels/vmlinuz" and a * relative URI (e.g. "../initrds/initrd.gz") and produces a new URI - * (e.g. "http://etherboot.org/initrds/initrd.gz"). + * (e.g. "http://ipxe.org/initrds/initrd.gz"). */ struct uri * resolve_uri ( struct uri *base_uri, struct uri *relative_uri ) { diff --git a/src/core/uuid.c b/src/core/uuid.c index 2b67d55d5..d98553f0f 100644 --- a/src/core/uuid.c +++ b/src/core/uuid.c @@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> #include <stdio.h> #include <byteswap.h> -#include <gpxe/uuid.h> +#include <ipxe/uuid.h> /** @file * diff --git a/src/core/vsprintf.c b/src/core/vsprintf.c index 21ab24292..3ed4bd3da 100644 --- a/src/core/vsprintf.c +++ b/src/core/vsprintf.c @@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdio.h> #include <console.h> #include <errno.h> -#include <gpxe/vsprintf.h> +#include <ipxe/vsprintf.h> /** @file */ diff --git a/src/core/xfer.c b/src/core/xfer.c index 1ec6f9d3f..8dbfef6c8 100644 --- a/src/core/xfer.c +++ b/src/core/xfer.c @@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <stdio.h> #include <errno.h> -#include <gpxe/xfer.h> +#include <ipxe/xfer.h> /** @file * |