diff options
Diffstat (limited to 'src/arch/i386/interface')
27 files changed, 106 insertions, 106 deletions
diff --git a/src/arch/i386/interface/pcbios/abft.c b/src/arch/i386/interface/pcbios/abft.c index 86941728..9aa2f098 100644 --- a/src/arch/i386/interface/pcbios/abft.c +++ b/src/arch/i386/interface/pcbios/abft.c @@ -19,9 +19,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <realmode.h> -#include <gpxe/aoe.h> -#include <gpxe/netdevice.h> -#include <gpxe/abft.h> +#include <ipxe/aoe.h> +#include <ipxe/netdevice.h> +#include <ipxe/abft.h> /** @file * @@ -30,7 +30,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); */ #define abftab __use_data16 ( abftab ) -/** The aBFT used by gPXE */ +/** The aBFT used by iPXE */ struct abft_table __data16 ( abftab ) __attribute__ (( aligned ( 16 ) )) = { /* ACPI header */ .acpi = { @@ -38,7 +38,7 @@ struct abft_table __data16 ( abftab ) __attribute__ (( aligned ( 16 ) )) = { .length = sizeof ( abftab ), .revision = 1, .oem_id = "FENSYS", - .oem_table_id = "gPXE", + .oem_table_id = "iPXE", }, }; diff --git a/src/arch/i386/interface/pcbios/aoeboot.c b/src/arch/i386/interface/pcbios/aoeboot.c index 2670b15d..388cd140 100644 --- a/src/arch/i386/interface/pcbios/aoeboot.c +++ b/src/arch/i386/interface/pcbios/aoeboot.c @@ -3,11 +3,11 @@ #include <stdlib.h> #include <stdio.h> #include <errno.h> -#include <gpxe/aoe.h> -#include <gpxe/ata.h> -#include <gpxe/netdevice.h> -#include <gpxe/sanboot.h> -#include <gpxe/abft.h> +#include <ipxe/aoe.h> +#include <ipxe/ata.h> +#include <ipxe/netdevice.h> +#include <ipxe/sanboot.h> +#include <ipxe/abft.h> #include <int13.h> FILE_LICENCE ( GPL2_OR_LATER ); diff --git a/src/arch/i386/interface/pcbios/bios_nap.c b/src/arch/i386/interface/pcbios/bios_nap.c index e38cac7a..7f461466 100644 --- a/src/arch/i386/interface/pcbios/bios_nap.c +++ b/src/arch/i386/interface/pcbios/bios_nap.c @@ -1,4 +1,4 @@ -#include <gpxe/nap.h> +#include <ipxe/nap.h> #include <realmode.h> FILE_LICENCE ( GPL2_OR_LATER ); diff --git a/src/arch/i386/interface/pcbios/bios_smbios.c b/src/arch/i386/interface/pcbios/bios_smbios.c index 094214bd..cde3d060 100644 --- a/src/arch/i386/interface/pcbios/bios_smbios.c +++ b/src/arch/i386/interface/pcbios/bios_smbios.c @@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <errno.h> #include <assert.h> -#include <gpxe/uaccess.h> -#include <gpxe/smbios.h> +#include <ipxe/uaccess.h> +#include <ipxe/smbios.h> #include <realmode.h> #include <pnpbios.h> diff --git a/src/arch/i386/interface/pcbios/bios_timer.c b/src/arch/i386/interface/pcbios/bios_timer.c index 8ecf7c12..70c3986b 100644 --- a/src/arch/i386/interface/pcbios/bios_timer.c +++ b/src/arch/i386/interface/pcbios/bios_timer.c @@ -24,7 +24,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); * */ -#include <gpxe/timer.h> +#include <ipxe/timer.h> #include <realmode.h> #include <bios.h> diff --git a/src/arch/i386/interface/pcbios/ib_srpboot.c b/src/arch/i386/interface/pcbios/ib_srpboot.c index b1cbc337..711c1e93 100644 --- a/src/arch/i386/interface/pcbios/ib_srpboot.c +++ b/src/arch/i386/interface/pcbios/ib_srpboot.c @@ -3,10 +3,10 @@ #include <stdlib.h> #include <stdio.h> #include <errno.h> -#include <gpxe/sanboot.h> +#include <ipxe/sanboot.h> #include <int13.h> -#include <gpxe/srp.h> -#include <gpxe/sbft.h> +#include <ipxe/srp.h> +#include <ipxe/sbft.h> FILE_LICENCE ( GPL2_OR_LATER ); diff --git a/src/arch/i386/interface/pcbios/ibft.c b/src/arch/i386/interface/pcbios/ibft.c index adf8e6b9..63dba65e 100644 --- a/src/arch/i386/interface/pcbios/ibft.c +++ b/src/arch/i386/interface/pcbios/ibft.c @@ -33,14 +33,14 @@ FILE_LICENCE ( BSD2 ); #include <errno.h> #include <byteswap.h> #include <realmode.h> -#include <gpxe/pci.h> -#include <gpxe/acpi.h> -#include <gpxe/in.h> -#include <gpxe/netdevice.h> -#include <gpxe/ethernet.h> -#include <gpxe/dhcp.h> -#include <gpxe/iscsi.h> -#include <gpxe/ibft.h> +#include <ipxe/pci.h> +#include <ipxe/acpi.h> +#include <ipxe/in.h> +#include <ipxe/netdevice.h> +#include <ipxe/ethernet.h> +#include <ipxe/dhcp.h> +#include <ipxe/iscsi.h> +#include <ipxe/ibft.h> /** @file * @@ -54,8 +54,8 @@ FILE_LICENCE ( BSD2 ); */ #define ibftab __use_data16 ( ibftab ) -/** The iBFT used by gPXE */ -struct gpxe_ibft __data16 ( ibftab ) = { +/** The iBFT used by iPXE */ +struct ipxe_ibft __data16 ( ibftab ) = { /* Table header */ .table = { /* ACPI header */ @@ -64,7 +64,7 @@ struct gpxe_ibft __data16 ( ibftab ) = { .length = sizeof ( ibftab ), .revision = 1, .oem_id = "FENSYS", - .oem_table_id = "gPXE", + .oem_table_id = "iPXE", }, /* Control block */ .control = { diff --git a/src/arch/i386/interface/pcbios/int13.c b/src/arch/i386/interface/pcbios/int13.c index 87b613a8..a2cf5e6b 100644 --- a/src/arch/i386/interface/pcbios/int13.c +++ b/src/arch/i386/interface/pcbios/int13.c @@ -23,9 +23,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <byteswap.h> #include <errno.h> #include <assert.h> -#include <gpxe/list.h> -#include <gpxe/blockdev.h> -#include <gpxe/memmap.h> +#include <ipxe/list.h> +#include <ipxe/blockdev.h> +#include <ipxe/memmap.h> #include <realmode.h> #include <bios.h> #include <biosint.h> diff --git a/src/arch/i386/interface/pcbios/iscsiboot.c b/src/arch/i386/interface/pcbios/iscsiboot.c index 00efd8ff..12c5566d 100644 --- a/src/arch/i386/interface/pcbios/iscsiboot.c +++ b/src/arch/i386/interface/pcbios/iscsiboot.c @@ -3,10 +3,10 @@ #include <stdlib.h> #include <stdio.h> #include <errno.h> -#include <gpxe/iscsi.h> -#include <gpxe/netdevice.h> -#include <gpxe/ibft.h> -#include <gpxe/sanboot.h> +#include <ipxe/iscsi.h> +#include <ipxe/netdevice.h> +#include <ipxe/ibft.h> +#include <ipxe/sanboot.h> #include <int13.h> FILE_LICENCE ( GPL2_OR_LATER ); diff --git a/src/arch/i386/interface/pcbios/keepsan.c b/src/arch/i386/interface/pcbios/keepsan.c index 904e017d..b2a93177 100644 --- a/src/arch/i386/interface/pcbios/keepsan.c +++ b/src/arch/i386/interface/pcbios/keepsan.c @@ -1,9 +1,9 @@ #include <stdint.h> #include <stdio.h> -#include <gpxe/settings.h> -#include <gpxe/dhcp.h> -#include <gpxe/init.h> -#include <gpxe/sanboot.h> +#include <ipxe/settings.h> +#include <ipxe/dhcp.h> +#include <ipxe/init.h> +#include <ipxe/sanboot.h> #include <usr/autoboot.h> struct setting keep_san_setting __setting = { diff --git a/src/arch/i386/interface/pcbios/memtop_umalloc.c b/src/arch/i386/interface/pcbios/memtop_umalloc.c index 0645fe63..51240f2a 100644 --- a/src/arch/i386/interface/pcbios/memtop_umalloc.c +++ b/src/arch/i386/interface/pcbios/memtop_umalloc.c @@ -27,10 +27,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <limits.h> #include <errno.h> -#include <gpxe/uaccess.h> -#include <gpxe/hidemem.h> -#include <gpxe/memmap.h> -#include <gpxe/umalloc.h> +#include <ipxe/uaccess.h> +#include <ipxe/hidemem.h> +#include <ipxe/memmap.h> +#include <ipxe/umalloc.h> /** Alignment of external allocated memory */ #define EM_ALIGN ( 4 * 1024 ) diff --git a/src/arch/i386/interface/pcbios/pcibios.c b/src/arch/i386/interface/pcbios/pcibios.c index f2c3880c..4d09c054 100644 --- a/src/arch/i386/interface/pcbios/pcibios.c +++ b/src/arch/i386/interface/pcbios/pcibios.c @@ -19,7 +19,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> -#include <gpxe/pci.h> +#include <ipxe/pci.h> #include <realmode.h> /** @file diff --git a/src/arch/i386/interface/pcbios/sbft.c b/src/arch/i386/interface/pcbios/sbft.c index 12927c77..6d51020a 100644 --- a/src/arch/i386/interface/pcbios/sbft.c +++ b/src/arch/i386/interface/pcbios/sbft.c @@ -38,14 +38,14 @@ FILE_LICENCE ( BSD2 ); #include <assert.h> #include <realmode.h> -#include <gpxe/srp.h> -#include <gpxe/ib_srp.h> -#include <gpxe/acpi.h> -#include <gpxe/sbft.h> +#include <ipxe/srp.h> +#include <ipxe/ib_srp.h> +#include <ipxe/acpi.h> +#include <ipxe/sbft.h> #define sbftab __use_data16 ( sbftab ) -/** The sBFT used by gPXE */ -struct gpxe_sbft __data16 ( sbftab ) = { +/** The sBFT used by iPXE */ +struct ipxe_sbft __data16 ( sbftab ) = { /* Table header */ .table = { /* ACPI header */ @@ -54,7 +54,7 @@ struct gpxe_sbft __data16 ( sbftab ) = { .length = sizeof ( sbftab ), .revision = 1, .oem_id = "FENSYS", - .oem_table_id = "gPXE", + .oem_table_id = "iPXE", }, .scsi_offset = offsetof ( typeof ( sbftab ), scsi ), .srp_offset = offsetof ( typeof ( sbftab ), srp ), diff --git a/src/arch/i386/interface/pxe/pxe_call.c b/src/arch/i386/interface/pxe/pxe_call.c index 66a9b1e2..f6b3fc54 100644 --- a/src/arch/i386/interface/pxe/pxe_call.c +++ b/src/arch/i386/interface/pxe/pxe_call.c @@ -18,8 +18,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/uaccess.h> -#include <gpxe/init.h> +#include <ipxe/uaccess.h> +#include <ipxe/init.h> #include <registers.h> #include <biosint.h> #include <pxe.h> diff --git a/src/arch/i386/interface/pxe/pxe_errors.c b/src/arch/i386/interface/pxe/pxe_errors.c index f884ef8a..f6bbd304 100644 --- a/src/arch/i386/interface/pxe/pxe_errors.c +++ b/src/arch/i386/interface/pxe/pxe_errors.c @@ -1,5 +1,5 @@ #include <errno.h> -#include <gpxe/errortab.h> +#include <ipxe/errortab.h> /* * This table was generated from the relevant section of errno.h using diff --git a/src/arch/i386/interface/pxe/pxe_file.c b/src/arch/i386/interface/pxe/pxe_file.c index 8d832123..26762568 100644 --- a/src/arch/i386/interface/pxe/pxe_file.c +++ b/src/arch/i386/interface/pxe/pxe_file.c @@ -8,9 +8,9 @@ #include <stdio.h> #include <errno.h> #include <byteswap.h> -#include <gpxe/uaccess.h> -#include <gpxe/posix_io.h> -#include <gpxe/features.h> +#include <ipxe/uaccess.h> +#include <ipxe/posix_io.h> +#include <ipxe/features.h> #include <pxe.h> #include <realmode.h> @@ -245,7 +245,7 @@ segoff_t __data16 ( pxe_exit_hook ) = { 0, 0 }; * @ret #PXENV_EXIT_FAILURE Command was not executed successfully * @ret s_PXENV_FILE_API_CHECK::Status PXE status code * @ret s_PXENV_FILE_API_CHECK::Magic Outbound magic number (0xe9c17b20) - * @ret s_PXENV_FILE_API_CHECK::Provider "gPXE" (0x45585067) + * @ret s_PXENV_FILE_API_CHECK::Provider "iPXE" (0x45585067) * @ret s_PXENV_FILE_API_CHECK::APIMask API function bitmask * @ret s_PXENV_FILE_API_CHECK::Flags Reserved * @@ -264,7 +264,7 @@ PXENV_EXIT_t pxenv_file_api_check ( struct s_PXENV_FILE_API_CHECK *file_api_chec file_api_check->Status = PXENV_STATUS_SUCCESS; file_api_check->Size = sizeof(struct s_PXENV_FILE_API_CHECK); file_api_check->Magic = 0xe9c17b20; - file_api_check->Provider = 0x45585067; /* "gPXE" */ + file_api_check->Provider = 0x45585067; /* "iPXE" */ file_api_check->APIMask = 0x0000007f; /* Functions e0-e6 */ /* Check to see if we have a PXE exit hook */ if ( pxe_exit_hook.segment | pxe_exit_hook.offset ) diff --git a/src/arch/i386/interface/pxe/pxe_loader.c b/src/arch/i386/interface/pxe/pxe_loader.c index b35caf77..63858be2 100644 --- a/src/arch/i386/interface/pxe/pxe_loader.c +++ b/src/arch/i386/interface/pxe/pxe_loader.c @@ -18,7 +18,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/init.h> +#include <ipxe/init.h> #include "pxe.h" #include "pxe_call.h" diff --git a/src/arch/i386/interface/pxe/pxe_preboot.c b/src/arch/i386/interface/pxe/pxe_preboot.c index 22be2e02..1d36faea 100644 --- a/src/arch/i386/interface/pxe/pxe_preboot.c +++ b/src/arch/i386/interface/pxe/pxe_preboot.c @@ -28,14 +28,14 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> #include <string.h> #include <stdlib.h> -#include <gpxe/uaccess.h> -#include <gpxe/dhcp.h> -#include <gpxe/fakedhcp.h> -#include <gpxe/device.h> -#include <gpxe/netdevice.h> -#include <gpxe/isapnp.h> -#include <gpxe/init.h> -#include <gpxe/if_ether.h> +#include <ipxe/uaccess.h> +#include <ipxe/dhcp.h> +#include <ipxe/fakedhcp.h> +#include <ipxe/device.h> +#include <ipxe/netdevice.h> +#include <ipxe/isapnp.h> +#include <ipxe/init.h> +#include <ipxe/if_ether.h> #include <basemem_packet.h> #include <biosint.h> #include "pxe.h" diff --git a/src/arch/i386/interface/pxe/pxe_tftp.c b/src/arch/i386/interface/pxe/pxe_tftp.c index e0ec5f1d..84f6527a 100644 --- a/src/arch/i386/interface/pxe/pxe_tftp.c +++ b/src/arch/i386/interface/pxe/pxe_tftp.c @@ -28,12 +28,12 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdio.h> #include <errno.h> #include <byteswap.h> -#include <gpxe/uaccess.h> -#include <gpxe/in.h> -#include <gpxe/tftp.h> -#include <gpxe/xfer.h> -#include <gpxe/open.h> -#include <gpxe/process.h> +#include <ipxe/uaccess.h> +#include <ipxe/in.h> +#include <ipxe/tftp.h> +#include <ipxe/xfer.h> +#include <ipxe/open.h> +#include <ipxe/process.h> #include <pxe.h> /** A PXE TFTP connection */ diff --git a/src/arch/i386/interface/pxe/pxe_udp.c b/src/arch/i386/interface/pxe/pxe_udp.c index f4702201..cdc9d0ae 100644 --- a/src/arch/i386/interface/pxe/pxe_udp.c +++ b/src/arch/i386/interface/pxe/pxe_udp.c @@ -6,10 +6,10 @@ #include <string.h> #include <byteswap.h> -#include <gpxe/xfer.h> -#include <gpxe/udp.h> -#include <gpxe/uaccess.h> -#include <gpxe/process.h> +#include <ipxe/xfer.h> +#include <ipxe/udp.h> +#include <ipxe/uaccess.h> +#include <ipxe/process.h> #include <pxe.h> /* diff --git a/src/arch/i386/interface/pxe/pxe_undi.c b/src/arch/i386/interface/pxe/pxe_undi.c index a2b0b773..3ebee94e 100644 --- a/src/arch/i386/interface/pxe/pxe_undi.c +++ b/src/arch/i386/interface/pxe/pxe_undi.c @@ -29,14 +29,14 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <byteswap.h> #include <basemem_packet.h> -#include <gpxe/netdevice.h> -#include <gpxe/iobuf.h> -#include <gpxe/device.h> -#include <gpxe/pci.h> -#include <gpxe/if_ether.h> -#include <gpxe/ip.h> -#include <gpxe/arp.h> -#include <gpxe/rarp.h> +#include <ipxe/netdevice.h> +#include <ipxe/iobuf.h> +#include <ipxe/device.h> +#include <ipxe/pci.h> +#include <ipxe/if_ether.h> +#include <ipxe/ip.h> +#include <ipxe/arp.h> +#include <ipxe/rarp.h> #include "pxe.h" /** diff --git a/src/arch/i386/interface/pxeparent/pxeparent.c b/src/arch/i386/interface/pxeparent/pxeparent.c index 582db5d2..dd0bbc5c 100644 --- a/src/arch/i386/interface/pxeparent/pxeparent.c +++ b/src/arch/i386/interface/pxeparent/pxeparent.c @@ -18,7 +18,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/dhcp.h> +#include <ipxe/dhcp.h> #include <pxeparent.h> #include <pxe_api.h> #include <pxe_types.h> diff --git a/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c b/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c index 66059437..439ebda3 100644 --- a/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c +++ b/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c @@ -19,8 +19,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> -#include <gpxe/dhcp.h> -#include <gpxe/netdevice.h> +#include <ipxe/dhcp.h> +#include <ipxe/netdevice.h> #include <undipreload.h> #include <pxeparent.h> #include <realmode.h> diff --git a/src/arch/i386/interface/syslinux/com32_call.c b/src/arch/i386/interface/syslinux/com32_call.c index d2c3f918..7a758373 100644 --- a/src/arch/i386/interface/syslinux/com32_call.c +++ b/src/arch/i386/interface/syslinux/com32_call.c @@ -27,7 +27,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <realmode.h> #include <comboot.h> #include <assert.h> -#include <gpxe/uaccess.h> +#include <ipxe/uaccess.h> static com32sys_t __bss16 ( com32_regs ); #define com32_regs __use_data16 ( com32_regs ) diff --git a/src/arch/i386/interface/syslinux/com32_wrapper.S b/src/arch/i386/interface/syslinux/com32_wrapper.S index 5c5bd139..0ac6ff2d 100644 --- a/src/arch/i386/interface/syslinux/com32_wrapper.S +++ b/src/arch/i386/interface/syslinux/com32_wrapper.S @@ -82,7 +82,7 @@ com32_wrapper: .data -/* Internal gPXE virtual address space %esp */ +/* Internal iPXE virtual address space %esp */ .globl com32_internal_esp .lcomm com32_internal_esp, 4 diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c index 51a1b6d9..e5bf11c9 100644 --- a/src/arch/i386/interface/syslinux/comboot_call.c +++ b/src/arch/i386/interface/syslinux/comboot_call.c @@ -33,21 +33,21 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <pxe_call.h> #include <setjmp.h> #include <string.h> -#include <gpxe/posix_io.h> -#include <gpxe/process.h> -#include <gpxe/serial.h> -#include <gpxe/init.h> -#include <gpxe/image.h> +#include <ipxe/posix_io.h> +#include <ipxe/process.h> +#include <ipxe/serial.h> +#include <ipxe/init.h> +#include <ipxe/image.h> #include <usr/imgmgmt.h> #include "config/console.h" #include "config/serial.h" /** The "SYSLINUX" version string */ -static char __data16_array ( syslinux_version, [] ) = "\r\ngPXE " VERSION; +static char __data16_array ( syslinux_version, [] ) = "\r\niPXE " VERSION; #define syslinux_version __use_data16 ( syslinux_version ) /** The "SYSLINUX" copyright string */ -static char __data16_array ( syslinux_copyright, [] ) = " http://etherboot.org"; +static char __data16_array ( syslinux_copyright, [] ) = " http://ipxe.org"; #define syslinux_copyright __use_data16 ( syslinux_copyright ) static char __data16_array ( syslinux_configuration_file, [] ) = ""; @@ -335,7 +335,7 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) { ix86->regs.cl = 0; /* minor */ /* SYSLINUX derivative ID */ - ix86->regs.dl = BZI_LOADER_TYPE_GPXE; + ix86->regs.dl = BZI_LOADER_TYPE_IPXE; /* SYSLINUX version and copyright strings */ ix86->segs.es = rm_ds; @@ -396,7 +396,7 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) { break; } - /* This relies on the fact that a gPXE POSIX fd will + /* This relies on the fact that a iPXE POSIX fd will * always fit in 16 bits. */ #if (POSIX_FD_MAX > 65535) @@ -453,9 +453,9 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) { case 0x000A: /* Get Derivative-Specific Information */ - /* gPXE has its own derivative ID, so there is no defined + /* iPXE has its own derivative ID, so there is no defined * output here; just return AL for now */ - ix86->regs.al = BZI_LOADER_TYPE_GPXE; + ix86->regs.al = BZI_LOADER_TYPE_IPXE; ix86->flags &= ~CF; break; diff --git a/src/arch/i386/interface/syslinux/comboot_resolv.c b/src/arch/i386/interface/syslinux/comboot_resolv.c index 30ac502e..c505d96b 100644 --- a/src/arch/i386/interface/syslinux/comboot_resolv.c +++ b/src/arch/i386/interface/syslinux/comboot_resolv.c @@ -1,9 +1,9 @@ #include <errno.h> #include <comboot.h> -#include <gpxe/in.h> -#include <gpxe/list.h> -#include <gpxe/process.h> -#include <gpxe/resolv.h> +#include <ipxe/in.h> +#include <ipxe/list.h> +#include <ipxe/process.h> +#include <ipxe/resolv.h> FILE_LICENCE ( GPL2_OR_LATER ); |