aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/assert.h2
-rw-r--r--src/include/compiler.h2
-rw-r--r--src/include/console.h2
-rw-r--r--src/include/curses.h4
-rw-r--r--src/include/errno.h6
-rw-r--r--src/include/etherboot.h6
-rw-r--r--src/include/ipxe/acpi.h (renamed from src/include/gpxe/acpi.h)6
-rw-r--r--src/include/ipxe/aes.h (renamed from src/include/gpxe/aes.h)6
-rw-r--r--src/include/ipxe/ansiesc.h (renamed from src/include/gpxe/ansiesc.h)6
-rw-r--r--src/include/ipxe/aoe.h (renamed from src/include/gpxe/aoe.h)14
-rw-r--r--src/include/ipxe/api.h (renamed from src/include/gpxe/api.h)10
-rw-r--r--src/include/ipxe/arc4.h (renamed from src/include/gpxe/arc4.h)6
-rw-r--r--src/include/ipxe/arp.h (renamed from src/include/gpxe/arp.h)8
-rw-r--r--src/include/ipxe/asn1.h (renamed from src/include/gpxe/asn1.h)6
-rw-r--r--src/include/ipxe/ata.h (renamed from src/include/gpxe/ata.h)12
-rw-r--r--src/include/ipxe/base64.h (renamed from src/include/gpxe/base64.h)6
-rw-r--r--src/include/ipxe/bitbash.h (renamed from src/include/gpxe/bitbash.h)6
-rw-r--r--src/include/ipxe/bitmap.h (renamed from src/include/gpxe/bitmap.h)6
-rw-r--r--src/include/ipxe/bitops.h (renamed from src/include/gpxe/bitops.h)6
-rw-r--r--src/include/ipxe/blockdev.h (renamed from src/include/gpxe/blockdev.h)8
-rw-r--r--src/include/ipxe/cbc.h (renamed from src/include/gpxe/cbc.h)8
-rw-r--r--src/include/ipxe/chap.h (renamed from src/include/gpxe/chap.h)8
-rw-r--r--src/include/ipxe/command.h (renamed from src/include/gpxe/command.h)8
-rw-r--r--src/include/ipxe/cpio.h (renamed from src/include/gpxe/cpio.h)6
-rw-r--r--src/include/ipxe/crc32.h (renamed from src/include/gpxe/crc32.h)4
-rw-r--r--src/include/ipxe/crypto.h (renamed from src/include/gpxe/crypto.h)6
-rw-r--r--src/include/ipxe/device.h (renamed from src/include/gpxe/device.h)10
-rw-r--r--src/include/ipxe/dhcp.h (renamed from src/include/gpxe/dhcp.h)26
-rw-r--r--src/include/ipxe/dhcpopts.h (renamed from src/include/gpxe/dhcpopts.h)6
-rw-r--r--src/include/ipxe/dhcppkt.h (renamed from src/include/gpxe/dhcppkt.h)12
-rw-r--r--src/include/ipxe/dns.h (renamed from src/include/gpxe/dns.h)8
-rw-r--r--src/include/ipxe/downloader.h (renamed from src/include/gpxe/downloader.h)6
-rw-r--r--src/include/ipxe/eapol.h (renamed from src/include/gpxe/eapol.h)8
-rw-r--r--src/include/ipxe/editbox.h (renamed from src/include/gpxe/editbox.h)8
-rw-r--r--src/include/ipxe/editstring.h (renamed from src/include/gpxe/editstring.h)6
-rw-r--r--src/include/ipxe/efi/Base.h (renamed from src/include/gpxe/efi/Base.h)2
-rw-r--r--src/include/ipxe/efi/Guid/PcAnsi.h (renamed from src/include/gpxe/efi/Guid/PcAnsi.h)0
-rw-r--r--src/include/ipxe/efi/Guid/SmBios.h (renamed from src/include/gpxe/efi/Guid/SmBios.h)0
-rw-r--r--src/include/ipxe/efi/Ia32/ProcessorBind.h (renamed from src/include/gpxe/efi/Ia32/ProcessorBind.h)0
-rw-r--r--src/include/ipxe/efi/IndustryStandard/Pci22.h (renamed from src/include/gpxe/efi/IndustryStandard/Pci22.h)0
-rw-r--r--src/include/ipxe/efi/IndustryStandard/PeImage.h (renamed from src/include/gpxe/efi/IndustryStandard/PeImage.h)0
-rw-r--r--src/include/ipxe/efi/LICENCE (renamed from src/include/gpxe/efi/LICENCE)2
-rw-r--r--src/include/ipxe/efi/Pi/PiBootMode.h (renamed from src/include/gpxe/efi/Pi/PiBootMode.h)2
-rw-r--r--src/include/ipxe/efi/Pi/PiDependency.h (renamed from src/include/gpxe/efi/Pi/PiDependency.h)0
-rw-r--r--src/include/ipxe/efi/Pi/PiDxeCis.h (renamed from src/include/gpxe/efi/Pi/PiDxeCis.h)2
-rw-r--r--src/include/ipxe/efi/Pi/PiFirmwareFile.h (renamed from src/include/gpxe/efi/Pi/PiFirmwareFile.h)2
-rw-r--r--src/include/ipxe/efi/Pi/PiFirmwareVolume.h (renamed from src/include/gpxe/efi/Pi/PiFirmwareVolume.h)2
-rw-r--r--src/include/ipxe/efi/Pi/PiHob.h (renamed from src/include/gpxe/efi/Pi/PiHob.h)8
-rw-r--r--src/include/ipxe/efi/Pi/PiMultiPhase.h (renamed from src/include/gpxe/efi/Pi/PiMultiPhase.h)12
-rw-r--r--src/include/ipxe/efi/PiDxe.h (renamed from src/include/gpxe/efi/PiDxe.h)6
-rw-r--r--src/include/ipxe/efi/ProcessorBind.h (renamed from src/include/gpxe/efi/ProcessorBind.h)4
-rw-r--r--src/include/ipxe/efi/Protocol/ComponentName2.h (renamed from src/include/gpxe/efi/Protocol/ComponentName2.h)0
-rw-r--r--src/include/ipxe/efi/Protocol/Cpu.h (renamed from src/include/gpxe/efi/Protocol/Cpu.h)2
-rw-r--r--src/include/ipxe/efi/Protocol/CpuIo.h (renamed from src/include/gpxe/efi/Protocol/CpuIo.h)2
-rw-r--r--src/include/ipxe/efi/Protocol/DebugSupport.h (renamed from src/include/gpxe/efi/Protocol/DebugSupport.h)4
-rw-r--r--src/include/ipxe/efi/Protocol/DevicePath.h (renamed from src/include/gpxe/efi/Protocol/DevicePath.h)2
-rw-r--r--src/include/ipxe/efi/Protocol/DriverBinding.h (renamed from src/include/gpxe/efi/Protocol/DriverBinding.h)2
-rw-r--r--src/include/ipxe/efi/Protocol/NetworkInterfaceIdentifier.h (renamed from src/include/gpxe/efi/Protocol/NetworkInterfaceIdentifier.h)0
-rw-r--r--src/include/ipxe/efi/Protocol/PciIo.h (renamed from src/include/gpxe/efi/Protocol/PciIo.h)0
-rw-r--r--src/include/ipxe/efi/Protocol/PciRootBridgeIo.h (renamed from src/include/gpxe/efi/Protocol/PciRootBridgeIo.h)0
-rw-r--r--src/include/ipxe/efi/Protocol/SimpleNetwork.h (renamed from src/include/gpxe/efi/Protocol/SimpleNetwork.h)0
-rw-r--r--src/include/ipxe/efi/Protocol/SimpleTextIn.h (renamed from src/include/gpxe/efi/Protocol/SimpleTextIn.h)2
-rw-r--r--src/include/ipxe/efi/Protocol/SimpleTextOut.h (renamed from src/include/gpxe/efi/Protocol/SimpleTextOut.h)0
-rw-r--r--src/include/ipxe/efi/Uefi.h (renamed from src/include/gpxe/efi/Uefi.h)4
-rw-r--r--src/include/ipxe/efi/Uefi/UefiBaseType.h (renamed from src/include/gpxe/efi/Uefi/UefiBaseType.h)2
-rw-r--r--src/include/ipxe/efi/Uefi/UefiGpt.h (renamed from src/include/gpxe/efi/Uefi/UefiGpt.h)0
-rw-r--r--src/include/ipxe/efi/Uefi/UefiInternalFormRepresentation.h (renamed from src/include/gpxe/efi/Uefi/UefiInternalFormRepresentation.h)0
-rw-r--r--src/include/ipxe/efi/Uefi/UefiMultiPhase.h (renamed from src/include/gpxe/efi/Uefi/UefiMultiPhase.h)2
-rw-r--r--src/include/ipxe/efi/Uefi/UefiPxe.h (renamed from src/include/gpxe/efi/Uefi/UefiPxe.h)0
-rw-r--r--src/include/ipxe/efi/Uefi/UefiSpec.h (renamed from src/include/gpxe/efi/Uefi/UefiSpec.h)14
-rw-r--r--src/include/ipxe/efi/X64/ProcessorBind.h (renamed from src/include/gpxe/efi/X64/ProcessorBind.h)0
-rw-r--r--src/include/ipxe/efi/efi.h (renamed from src/include/gpxe/efi/efi.h)34
-rw-r--r--src/include/ipxe/efi/efi_io.h (renamed from src/include/gpxe/efi/efi_io.h)8
-rw-r--r--src/include/ipxe/efi/efi_pci.h (renamed from src/include/gpxe/efi/efi_pci.h)8
-rw-r--r--src/include/ipxe/efi/efi_smbios.h (renamed from src/include/gpxe/efi/efi_smbios.h)8
-rw-r--r--src/include/ipxe/efi/efi_timer.h (renamed from src/include/gpxe/efi/efi_timer.h)8
-rw-r--r--src/include/ipxe/efi/efi_uaccess.h (renamed from src/include/gpxe/efi/efi_uaccess.h)8
-rw-r--r--src/include/ipxe/efi/efi_umalloc.h (renamed from src/include/gpxe/efi/efi_umalloc.h)8
-rwxr-xr-xsrc/include/ipxe/efi/import.pl (renamed from src/include/gpxe/efi/import.pl)24
-rw-r--r--src/include/ipxe/eisa.h (renamed from src/include/gpxe/eisa.h)6
-rw-r--r--src/include/ipxe/elf.h (renamed from src/include/gpxe/elf.h)6
-rw-r--r--src/include/ipxe/errfile.h (renamed from src/include/gpxe/errfile.h)6
-rw-r--r--src/include/ipxe/errortab.h (renamed from src/include/gpxe/errortab.h)8
-rw-r--r--src/include/ipxe/ethernet.h (renamed from src/include/gpxe/ethernet.h)6
-rw-r--r--src/include/ipxe/fakedhcp.h (renamed from src/include/gpxe/fakedhcp.h)6
-rw-r--r--src/include/ipxe/features.h (renamed from src/include/gpxe/features.h)10
-rw-r--r--src/include/ipxe/filter.h (renamed from src/include/gpxe/filter.h)8
-rw-r--r--src/include/ipxe/ftp.h (renamed from src/include/gpxe/ftp.h)6
-rw-r--r--src/include/ipxe/gdbserial.h (renamed from src/include/gpxe/gdbserial.h)6
-rw-r--r--src/include/ipxe/gdbstub.h (renamed from src/include/gpxe/gdbstub.h)8
-rw-r--r--src/include/ipxe/gdbudp.h (renamed from src/include/gpxe/gdbudp.h)6
-rw-r--r--src/include/ipxe/hidemem.h (renamed from src/include/gpxe/hidemem.h)6
-rw-r--r--src/include/ipxe/hmac.h (renamed from src/include/gpxe/hmac.h)8
-rw-r--r--src/include/ipxe/http.h (renamed from src/include/gpxe/http.h)6
-rw-r--r--src/include/ipxe/i2c.h (renamed from src/include/gpxe/i2c.h)8
-rw-r--r--src/include/ipxe/ib_cm.h (renamed from src/include/gpxe/ib_cm.h)10
-rw-r--r--src/include/ipxe/ib_cmrc.h (renamed from src/include/gpxe/ib_cmrc.h)10
-rw-r--r--src/include/ipxe/ib_mad.h (renamed from src/include/gpxe/ib_mad.h)8
-rw-r--r--src/include/ipxe/ib_mcast.h (renamed from src/include/gpxe/ib_mcast.h)8
-rw-r--r--src/include/ipxe/ib_mi.h (renamed from src/include/gpxe/ib_mi.h)14
-rw-r--r--src/include/ipxe/ib_packet.h (renamed from src/include/gpxe/ib_packet.h)6
-rw-r--r--src/include/ipxe/ib_pathrec.h (renamed from src/include/gpxe/ib_pathrec.h)8
-rw-r--r--src/include/ipxe/ib_sma.h (renamed from src/include/gpxe/ib_sma.h)6
-rw-r--r--src/include/ipxe/ib_smc.h (renamed from src/include/gpxe/ib_smc.h)8
-rw-r--r--src/include/ipxe/ib_srp.h (renamed from src/include/gpxe/ib_srp.h)10
-rw-r--r--src/include/ipxe/icmp.h (renamed from src/include/gpxe/icmp.h)6
-rw-r--r--src/include/ipxe/icmp6.h (renamed from src/include/gpxe/icmp6.h)10
-rw-r--r--src/include/ipxe/ieee80211.h (renamed from src/include/gpxe/ieee80211.h)18
-rw-r--r--src/include/ipxe/if_arp.h (renamed from src/include/gpxe/if_arp.h)6
-rw-r--r--src/include/ipxe/if_ether.h (renamed from src/include/gpxe/if_ether.h)6
-rw-r--r--src/include/ipxe/image.h (renamed from src/include/gpxe/image.h)14
-rw-r--r--src/include/ipxe/in.h (renamed from src/include/gpxe/in.h)8
-rw-r--r--src/include/ipxe/infiniband.h (renamed from src/include/gpxe/infiniband.h)14
-rw-r--r--src/include/ipxe/init.h (renamed from src/include/gpxe/init.h)10
-rw-r--r--src/include/ipxe/interface.h (renamed from src/include/gpxe/interface.h)8
-rw-r--r--src/include/ipxe/io.h (renamed from src/include/gpxe/io.h)14
-rw-r--r--src/include/ipxe/iobuf.h (renamed from src/include/gpxe/iobuf.h)8
-rw-r--r--src/include/ipxe/ip.h (renamed from src/include/gpxe/ip.h)12
-rw-r--r--src/include/ipxe/ip6.h (renamed from src/include/gpxe/ip6.h)8
-rw-r--r--src/include/ipxe/ipoib.h (renamed from src/include/gpxe/ipoib.h)8
-rw-r--r--src/include/ipxe/isa.h (renamed from src/include/gpxe/isa.h)6
-rw-r--r--src/include/ipxe/isa_ids.h (renamed from src/include/gpxe/isa_ids.h)0
-rw-r--r--src/include/ipxe/isapnp.h (renamed from src/include/gpxe/isapnp.h)6
-rw-r--r--src/include/ipxe/iscsi.h (renamed from src/include/gpxe/iscsi.h)18
-rw-r--r--src/include/ipxe/job.h (renamed from src/include/gpxe/job.h)8
-rw-r--r--src/include/ipxe/keys.h (renamed from src/include/gpxe/keys.h)6
-rw-r--r--src/include/ipxe/linebuf.h (renamed from src/include/gpxe/linebuf.h)6
-rw-r--r--src/include/ipxe/linux_compat.h (renamed from src/include/gpxe/linux_compat.h)10
-rw-r--r--src/include/ipxe/list.h (renamed from src/include/gpxe/list.h)6
-rw-r--r--src/include/ipxe/login_ui.h (renamed from src/include/gpxe/login_ui.h)6
-rw-r--r--src/include/ipxe/malloc.h (renamed from src/include/gpxe/malloc.h)8
-rw-r--r--src/include/ipxe/mca.h (renamed from src/include/gpxe/mca.h)6
-rw-r--r--src/include/ipxe/md5.h (renamed from src/include/gpxe/md5.h)6
-rw-r--r--src/include/ipxe/memmap.h (renamed from src/include/gpxe/memmap.h)6
-rw-r--r--src/include/ipxe/monojob.h (renamed from src/include/gpxe/monojob.h)6
-rw-r--r--src/include/ipxe/nap.h (renamed from src/include/gpxe/nap.h)10
-rw-r--r--src/include/ipxe/ndp.h (renamed from src/include/gpxe/ndp.h)12
-rw-r--r--src/include/ipxe/net80211.h (renamed from src/include/gpxe/net80211.h)24
-rw-r--r--src/include/ipxe/netdevice.h (renamed from src/include/gpxe/netdevice.h)14
-rw-r--r--src/include/ipxe/null_nap.h (renamed from src/include/gpxe/null_nap.h)6
-rw-r--r--src/include/ipxe/nvo.h (renamed from src/include/gpxe/nvo.h)10
-rw-r--r--src/include/ipxe/nvs.h (renamed from src/include/gpxe/nvs.h)6
-rw-r--r--src/include/ipxe/open.h (renamed from src/include/gpxe/open.h)10
-rw-r--r--src/include/ipxe/pci.h (renamed from src/include/gpxe/pci.h)12
-rw-r--r--src/include/ipxe/pci_ids.h (renamed from src/include/gpxe/pci_ids.h)6
-rw-r--r--src/include/ipxe/pci_io.h (renamed from src/include/gpxe/pci_io.h)10
-rw-r--r--src/include/ipxe/pcibackup.h (renamed from src/include/gpxe/pcibackup.h)6
-rw-r--r--src/include/ipxe/posix_io.h (renamed from src/include/gpxe/posix_io.h)8
-rw-r--r--src/include/ipxe/process.h (renamed from src/include/gpxe/process.h)12
-rw-r--r--src/include/ipxe/profile.h (renamed from src/include/gpxe/profile.h)6
-rw-r--r--src/include/ipxe/ramdisk.h (renamed from src/include/gpxe/ramdisk.h)10
-rw-r--r--src/include/ipxe/rarp.h (renamed from src/include/gpxe/rarp.h)6
-rw-r--r--src/include/ipxe/rc80211.h (renamed from src/include/gpxe/rc80211.h)6
-rw-r--r--src/include/ipxe/refcnt.h (renamed from src/include/gpxe/refcnt.h)6
-rw-r--r--src/include/ipxe/resolv.h (renamed from src/include/gpxe/resolv.h)14
-rw-r--r--src/include/ipxe/retry.h (renamed from src/include/gpxe/retry.h)8
-rw-r--r--src/include/ipxe/rotate.h (renamed from src/include/gpxe/rotate.h)6
-rw-r--r--src/include/ipxe/rsa.h (renamed from src/include/gpxe/rsa.h)6
-rw-r--r--src/include/ipxe/sanboot.h (renamed from src/include/gpxe/sanboot.h)8
-rw-r--r--src/include/ipxe/scsi.h (renamed from src/include/gpxe/scsi.h)12
-rw-r--r--src/include/ipxe/sec80211.h (renamed from src/include/gpxe/sec80211.h)8
-rw-r--r--src/include/ipxe/segment.h (renamed from src/include/gpxe/segment.h)8
-rw-r--r--src/include/ipxe/serial.h (renamed from src/include/gpxe/serial.h)6
-rw-r--r--src/include/ipxe/settings.h (renamed from src/include/gpxe/settings.h)12
-rw-r--r--src/include/ipxe/settings_ui.h (renamed from src/include/gpxe/settings_ui.h)6
-rw-r--r--src/include/ipxe/sha1.h (renamed from src/include/gpxe/sha1.h)6
-rw-r--r--src/include/ipxe/shell.h (renamed from src/include/gpxe/shell.h)6
-rw-r--r--src/include/ipxe/shell_banner.h (renamed from src/include/gpxe/shell_banner.h)6
-rw-r--r--src/include/ipxe/smbios.h (renamed from src/include/gpxe/smbios.h)12
-rw-r--r--src/include/ipxe/socket.h (renamed from src/include/gpxe/socket.h)6
-rw-r--r--src/include/ipxe/spi.h (renamed from src/include/gpxe/spi.h)8
-rw-r--r--src/include/ipxe/spi_bit.h (renamed from src/include/gpxe/spi_bit.h)10
-rw-r--r--src/include/ipxe/srp.h (renamed from src/include/gpxe/srp.h)12
-rw-r--r--src/include/ipxe/tables.h (renamed from src/include/gpxe/tables.h)6
-rw-r--r--src/include/ipxe/tcp.h (renamed from src/include/gpxe/tcp.h)10
-rw-r--r--src/include/ipxe/tcpip.h (renamed from src/include/gpxe/tcpip.h)12
-rw-r--r--src/include/ipxe/tftp.h (renamed from src/include/gpxe/tftp.h)6
-rw-r--r--src/include/ipxe/threewire.h (renamed from src/include/gpxe/threewire.h)8
-rw-r--r--src/include/ipxe/timer.h (renamed from src/include/gpxe/timer.h)12
-rw-r--r--src/include/ipxe/tls.h (renamed from src/include/gpxe/tls.h)20
-rw-r--r--src/include/ipxe/uaccess.h (renamed from src/include/gpxe/uaccess.h)12
-rw-r--r--src/include/ipxe/udp.h (renamed from src/include/gpxe/udp.h)14
-rw-r--r--src/include/ipxe/umalloc.h (renamed from src/include/gpxe/umalloc.h)12
-rw-r--r--src/include/ipxe/uri.h (renamed from src/include/gpxe/uri.h)12
-rw-r--r--src/include/ipxe/uuid.h (renamed from src/include/gpxe/uuid.h)6
-rw-r--r--src/include/ipxe/virtio-pci.h (renamed from src/include/gpxe/virtio-pci.h)0
-rw-r--r--src/include/ipxe/virtio-ring.h (renamed from src/include/gpxe/virtio-ring.h)0
-rw-r--r--src/include/ipxe/vsprintf.h (renamed from src/include/gpxe/vsprintf.h)6
-rw-r--r--src/include/ipxe/wpa.h (renamed from src/include/gpxe/wpa.h)10
-rw-r--r--src/include/ipxe/x509.h (renamed from src/include/gpxe/x509.h)6
-rw-r--r--src/include/ipxe/xfer.h (renamed from src/include/gpxe/xfer.h)10
-rw-r--r--src/include/mii.h2
-rw-r--r--src/include/nic.h12
-rw-r--r--src/include/unistd.h2
-rw-r--r--src/include/usr/autoboot.h2
195 files changed, 707 insertions, 707 deletions
diff --git a/src/include/assert.h b/src/include/assert.h
index cc784bc..40a00a2 100644
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -54,7 +54,7 @@ assert_printf ( const char *fmt, ... ) asm ( "printf" );
* If the condition is not true, the link will fail with an unresolved
* symbol (error_symbol).
*
- * This macro is gPXE-specific. Do not use this macro in code
+ * This macro is iPXE-specific. Do not use this macro in code
* intended to be portable.
*
*/
diff --git a/src/include/compiler.h b/src/include/compiler.h
index ea81fc8..a9067c9 100644
--- a/src/include/compiler.h
+++ b/src/include/compiler.h
@@ -538,7 +538,7 @@ int __debug_disable;
* @defgroup licences Licence declarations
*
* For reasons that are partly historical, various different files
- * within the gPXE codebase have differing licences.
+ * within the iPXE codebase have differing licences.
*
* @{
*/
diff --git a/src/include/console.h b/src/include/console.h
index 62fedf5..da26c36 100644
--- a/src/include/console.h
+++ b/src/include/console.h
@@ -1,7 +1,7 @@
#ifndef CONSOLE_H
#define CONSOLE_H
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
/** @file
*
diff --git a/src/include/curses.h b/src/include/curses.h
index e2c5af2..2069779 100644
--- a/src/include/curses.h
+++ b/src/include/curses.h
@@ -194,9 +194,9 @@ extern unsigned short _LINES;
#define COLORS COLOURS
/*
- * KEY code constants are define in gpxe/keys.h
+ * KEY code constants are define in ipxe/keys.h
*/
-#include <gpxe/keys.h>
+#include <ipxe/keys.h>
//extern int addch ( const chtype * );
//extern int addchnstr ( const chtype *, int );
diff --git a/src/include/errno.h b/src/include/errno.h
index 56095ec..0757fad 100644
--- a/src/include/errno.h
+++ b/src/include/errno.h
@@ -7,7 +7,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
*
* Error codes
*
- * Return status codes as used within gPXE are designed to allow for
+ * Return status codes as used within iPXE are designed to allow for
* maximum visibility into the source of an error even in an end-user
* build with no debugging. They are constructed as follows:
*
@@ -72,7 +72,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
*/
/* Get definitions for file identifiers */
-#include <gpxe/errfile.h>
+#include <ipxe/errfile.h>
/* If we do not have a valid file identifier, generate a compiler
* warning upon usage of any error codes. (Don't just use a #warning,
@@ -85,7 +85,7 @@ extern char missing_errfile_declaration[] __attribute__ (( deprecated ));
#define ERRFILE ( 0 * ( ( int ) missing_errfile_declaration ) )
#endif
-/** Derive PXENV_STATUS code from gPXE error number */
+/** Derive PXENV_STATUS code from iPXE error number */
#define PXENV_STATUS( rc ) ( (-(rc)) & 0x00ff )
/**
diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index ad44e8a..3241294 100644
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@ -15,9 +15,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <unistd.h>
#include <strings.h>
#include <console.h>
-#include <gpxe/timer.h>
-#include <gpxe/if_arp.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/timer.h>
+#include <ipxe/if_arp.h>
+#include <ipxe/if_ether.h>
typedef unsigned long Address;
diff --git a/src/include/gpxe/acpi.h b/src/include/ipxe/acpi.h
index 12edda9..eabbec3 100644
--- a/src/include/gpxe/acpi.h
+++ b/src/include/ipxe/acpi.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ACPI_H
-#define _GPXE_ACPI_H
+#ifndef _IPXE_ACPI_H
+#define _IPXE_ACPI_H
/** @file
*
@@ -40,4 +40,4 @@ struct acpi_description_header {
extern void acpi_fix_checksum ( struct acpi_description_header *acpi );
-#endif /* _GPXE_ACPI_H */
+#endif /* _IPXE_ACPI_H */
diff --git a/src/include/gpxe/aes.h b/src/include/ipxe/aes.h
index fc1694b..5d645b2 100644
--- a/src/include/gpxe/aes.h
+++ b/src/include/ipxe/aes.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_AES_H
-#define _GPXE_AES_H
+#ifndef _IPXE_AES_H
+#define _IPXE_AES_H
FILE_LICENCE ( GPL2_OR_LATER );
@@ -27,4 +27,4 @@ extern struct cipher_algorithm aes_cbc_algorithm;
int aes_wrap ( const void *kek, const void *src, void *dest, int nblk );
int aes_unwrap ( const void *kek, const void *src, void *dest, int nblk );
-#endif /* _GPXE_AES_H */
+#endif /* _IPXE_AES_H */
diff --git a/src/include/gpxe/ansiesc.h b/src/include/ipxe/ansiesc.h
index 85f7a9f..35438e4 100644
--- a/src/include/gpxe/ansiesc.h
+++ b/src/include/ipxe/ansiesc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ANSIESC_H
-#define _GPXE_ANSIESC_H
+#ifndef _IPXE_ANSIESC_H
+#define _IPXE_ANSIESC_H
/** @file
*
@@ -117,4 +117,4 @@ struct ansiesc_context {
extern int ansiesc_process ( struct ansiesc_context *ctx, int c );
-#endif /* _GPXE_ANSIESC_H */
+#endif /* _IPXE_ANSIESC_H */
diff --git a/src/include/gpxe/aoe.h b/src/include/ipxe/aoe.h
index 6b42fd5..d2a1285 100644
--- a/src/include/gpxe/aoe.h
+++ b/src/include/ipxe/aoe.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_AOE_H
-#define _GPXE_AOE_H
+#ifndef _IPXE_AOE_H
+#define _IPXE_AOE_H
/** @file
*
@@ -10,10 +10,10 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/list.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/retry.h>
-#include <gpxe/ata.h>
+#include <ipxe/list.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/retry.h>
+#include <ipxe/ata.h>
/** An AoE config command */
struct aoecfg {
@@ -147,4 +147,4 @@ extern void aoe_detach ( struct ata_device *ata );
extern int aoe_attach ( struct ata_device *ata, struct net_device *netdev,
const char *root_path );
-#endif /* _GPXE_AOE_H */
+#endif /* _IPXE_AOE_H */
diff --git a/src/include/gpxe/api.h b/src/include/ipxe/api.h
index ff2ba59..838b893 100644
--- a/src/include/gpxe/api.h
+++ b/src/include/ipxe/api.h
@@ -1,11 +1,11 @@
-#ifndef _GPXE_API_H
-#define _GPXE_API_H
+#ifndef _IPXE_API_H
+#define _IPXE_API_H
/** @file
*
- * gPXE internal APIs
+ * iPXE internal APIs
*
- * There are various formally-defined APIs internal to gPXE, with
+ * There are various formally-defined APIs internal to iPXE, with
* several differing implementations specific to particular execution
* environments (e.g. PC BIOS, EFI, LinuxBIOS).
*
@@ -81,4 +81,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
/** @} */
-#endif /* _GPXE_API_H */
+#endif /* _IPXE_API_H */
diff --git a/src/include/gpxe/arc4.h b/src/include/ipxe/arc4.h
index 9917628..9da972b 100644
--- a/src/include/gpxe/arc4.h
+++ b/src/include/ipxe/arc4.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ARC4_H
-#define _GPXE_ARC4_H
+#ifndef _IPXE_ARC4_H
+#define _IPXE_ARC4_H
FILE_LICENCE ( GPL2_OR_LATER );
@@ -19,4 +19,4 @@ extern struct cipher_algorithm arc4_algorithm;
void arc4_skip ( const void *key, size_t keylen, size_t skip,
const void *src, void *dst, size_t msglen );
-#endif /* _GPXE_ARC4_H */
+#endif /* _IPXE_ARC4_H */
diff --git a/src/include/gpxe/arp.h b/src/include/ipxe/arp.h
index 0623d35..373a95d 100644
--- a/src/include/gpxe/arp.h
+++ b/src/include/ipxe/arp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ARP_H
-#define _GPXE_ARP_H
+#ifndef _IPXE_ARP_H
+#define _IPXE_ARP_H
/** @file
*
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
struct net_device;
struct net_protocol;
@@ -43,4 +43,4 @@ extern int arp_resolve ( struct net_device *netdev,
const void *source_net_addr,
void *dest_ll_addr );
-#endif /* _GPXE_ARP_H */
+#endif /* _IPXE_ARP_H */
diff --git a/src/include/gpxe/asn1.h b/src/include/ipxe/asn1.h
index 477c209..85e480e 100644
--- a/src/include/gpxe/asn1.h
+++ b/src/include/ipxe/asn1.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ASN1_H
-#define _GPXE_ASN1_H
+#ifndef _IPXE_ASN1_H
+#define _IPXE_ASN1_H
/** @file
*
@@ -31,4 +31,4 @@ struct asn1_cursor {
extern int asn1_enter ( struct asn1_cursor *cursor, unsigned int type );
extern int asn1_skip ( struct asn1_cursor *cursor, unsigned int type );
-#endif /* _GPXE_ASN1_H */
+#endif /* _IPXE_ASN1_H */
diff --git a/src/include/gpxe/ata.h b/src/include/ipxe/ata.h
index 3c56584..043e370 100644
--- a/src/include/gpxe/ata.h
+++ b/src/include/ipxe/ata.h
@@ -1,10 +1,10 @@
-#ifndef _GPXE_ATA_H
-#define _GPXE_ATA_H
+#ifndef _IPXE_ATA_H
+#define _IPXE_ATA_H
#include <stdint.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/refcnt.h>
/** @file
*
@@ -206,4 +206,4 @@ struct ata_device {
extern int init_atadev ( struct ata_device *ata );
-#endif /* _GPXE_ATA_H */
+#endif /* _IPXE_ATA_H */
diff --git a/src/include/gpxe/base64.h b/src/include/ipxe/base64.h
index e38bef0..1295941 100644
--- a/src/include/gpxe/base64.h
+++ b/src/include/ipxe/base64.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BASE64_H
-#define _GPXE_BASE64_H
+#ifndef _IPXE_BASE64_H
+#define _IPXE_BASE64_H
/** @file
*
@@ -23,4 +23,4 @@ static inline size_t base64_encoded_len ( size_t raw_len ) {
extern void base64_encode ( const char *raw, char *encoded );
-#endif /* _GPXE_BASE64_H */
+#endif /* _IPXE_BASE64_H */
diff --git a/src/include/gpxe/bitbash.h b/src/include/ipxe/bitbash.h
index f2ba9f7..62b54b1 100644
--- a/src/include/gpxe/bitbash.h
+++ b/src/include/ipxe/bitbash.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BITBASH_H
-#define _GPXE_BITBASH_H
+#ifndef _IPXE_BITBASH_H
+#define _IPXE_BITBASH_H
/** @file
*
@@ -49,4 +49,4 @@ extern void write_bit ( struct bit_basher *basher, unsigned int bit_id,
unsigned long data );
extern int read_bit ( struct bit_basher *basher, unsigned int bit_id );
-#endif /* _GPXE_BITBASH_H */
+#endif /* _IPXE_BITBASH_H */
diff --git a/src/include/gpxe/bitmap.h b/src/include/ipxe/bitmap.h
index d6911a5..38d1f22 100644
--- a/src/include/gpxe/bitmap.h
+++ b/src/include/ipxe/bitmap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BITMAP_H
-#define _GPXE_BITMAP_H
+#ifndef _IPXE_BITMAP_H
+#define _IPXE_BITMAP_H
/** @file
*
@@ -82,4 +82,4 @@ static inline int bitmap_full ( struct bitmap *bitmap ) {
return ( bitmap->first_gap == bitmap->length );
}
-#endif /* _GPXE_BITMAP_H */
+#endif /* _IPXE_BITMAP_H */
diff --git a/src/include/gpxe/bitops.h b/src/include/ipxe/bitops.h
index 8db3431..0599168 100644
--- a/src/include/gpxe/bitops.h
+++ b/src/include/ipxe/bitops.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BITOPS_H
-#define _GPXE_BITOPS_H
+#ifndef _IPXE_BITOPS_H
+#define _IPXE_BITOPS_H
/*
* Copyright (C) 2008 Michael Brown <mbrown@fensystems.co.uk>.
@@ -227,4 +227,4 @@ typedef unsigned char pseudo_bit_t;
*__ptr |= cpu_to_BIT64 ( __value << __shift ); \
} while ( 0 )
-#endif /* _GPXE_BITOPS_H */
+#endif /* _IPXE_BITOPS_H */
diff --git a/src/include/gpxe/blockdev.h b/src/include/ipxe/blockdev.h
index cf28524..5c1ab13 100644
--- a/src/include/gpxe/blockdev.h
+++ b/src/include/ipxe/blockdev.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BLOCKDEV_H
-#define _GPXE_BLOCKDEV_H
+#ifndef _IPXE_BLOCKDEV_H
+#define _IPXE_BLOCKDEV_H
/**
* @file
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
struct block_device;
@@ -50,4 +50,4 @@ struct block_device {
uint64_t blocks;
};
-#endif /* _GPXE_BLOCKDEV_H */
+#endif /* _IPXE_BLOCKDEV_H */
diff --git a/src/include/gpxe/cbc.h b/src/include/ipxe/cbc.h
index 1262f1d..fae3765 100644
--- a/src/include/gpxe/cbc.h
+++ b/src/include/ipxe/cbc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_CBC_H
-#define _GPXE_CBC_H
+#ifndef _IPXE_CBC_H
+#define _IPXE_CBC_H
/** @file
*
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/crypto.h>
+#include <ipxe/crypto.h>
/**
* Set key
@@ -97,4 +97,4 @@ struct cipher_algorithm _cbc_cipher = { \
.decrypt = _cbc_name ## _decrypt, \
};
-#endif /* _GPXE_CBC_H */
+#endif /* _IPXE_CBC_H */
diff --git a/src/include/gpxe/chap.h b/src/include/ipxe/chap.h
index e86ede3..fce48f3 100644
--- a/src/include/gpxe/chap.h
+++ b/src/include/ipxe/chap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_CHAP_H
-#define _GPXE_CHAP_H
+#ifndef _IPXE_CHAP_H
+#define _IPXE_CHAP_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/md5.h>
+#include <ipxe/md5.h>
struct digest_algorithm;
@@ -50,4 +50,4 @@ static inline void chap_set_identifier ( struct chap_response *chap,
chap_update ( chap, &ident_byte, sizeof ( ident_byte ) );
}
-#endif /* _GPXE_CHAP_H */
+#endif /* _IPXE_CHAP_H */
diff --git a/src/include/gpxe/command.h b/src/include/ipxe/command.h
index 51ca6d6..a7d0ae4 100644
--- a/src/include/gpxe/command.h
+++ b/src/include/ipxe/command.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_COMMAND_H
-#define _GPXE_COMMAND_H
+#ifndef _IPXE_COMMAND_H
+#define _IPXE_COMMAND_H
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
/** A command-line command */
struct command {
@@ -23,4 +23,4 @@ struct command {
#define __command __table_entry ( COMMANDS, 01 )
-#endif /* _GPXE_COMMAND_H */
+#endif /* _IPXE_COMMAND_H */
diff --git a/src/include/gpxe/cpio.h b/src/include/ipxe/cpio.h
index f462cec..2772328 100644
--- a/src/include/gpxe/cpio.h
+++ b/src/include/ipxe/cpio.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_CPIO_H
-#define _GPXE_CPIO_H
+#ifndef _IPXE_CPIO_H
+#define _IPXE_CPIO_H
/** @file
*
@@ -50,4 +50,4 @@ struct cpio_header {
extern void cpio_set_field ( char *field, unsigned long value );
-#endif /* _GPXE_CPIO_H */
+#endif /* _IPXE_CPIO_H */
diff --git a/src/include/gpxe/crc32.h b/src/include/ipxe/crc32.h
index d1c7437..38ac1b3 100644
--- a/src/include/gpxe/crc32.h
+++ b/src/include/ipxe/crc32.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_CRC32_H
-#define _GPXE_CRC32_H
+#ifndef _IPXE_CRC32_H
+#define _IPXE_CRC32_H
FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/include/gpxe/crypto.h b/src/include/ipxe/crypto.h
index ecda5f6..9383c07 100644
--- a/src/include/gpxe/crypto.h
+++ b/src/include/ipxe/crypto.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_CRYPTO_H
-#define _GPXE_CRYPTO_H
+#ifndef _IPXE_CRYPTO_H
+#define _IPXE_CRYPTO_H
/** @file
*
@@ -153,4 +153,4 @@ extern struct pubkey_algorithm pubkey_null;
void get_random_bytes ( void *buf, size_t len );
-#endif /* _GPXE_CRYPTO_H */
+#endif /* _IPXE_CRYPTO_H */
diff --git a/src/include/gpxe/device.h b/src/include/ipxe/device.h
index 1db3ff9..8567530 100644
--- a/src/include/gpxe/device.h
+++ b/src/include/ipxe/device.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DEVICE_H
-#define _GPXE_DEVICE_H
+#ifndef _IPXE_DEVICE_H
+#define _IPXE_DEVICE_H
/**
* @file
@@ -10,8 +10,8 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/list.h>
-#include <gpxe/tables.h>
+#include <ipxe/list.h>
+#include <ipxe/tables.h>
/** A hardware device description */
struct device_description {
@@ -110,4 +110,4 @@ struct root_driver {
/** Declare a root device */
#define __root_device __table_entry ( ROOT_DEVICES, 01 )
-#endif /* _GPXE_DEVICE_H */
+#endif /* _IPXE_DEVICE_H */
diff --git a/src/include/gpxe/dhcp.h b/src/include/ipxe/dhcp.h
index ebfe8ed..bbfa293 100644
--- a/src/include/gpxe/dhcp.h
+++ b/src/include/ipxe/dhcp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DHCP_H
-#define _GPXE_DHCP_H
+#ifndef _IPXE_DHCP_H
+#define _IPXE_DHCP_H
/** @file
*
@@ -10,13 +10,13 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/in.h>
-#include <gpxe/list.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/tables.h>
-#include <gpxe/uuid.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/in.h>
+#include <ipxe/list.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/tables.h>
+#include <ipxe/uuid.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/uaccess.h>
struct job_interface;
struct dhcp_options;
@@ -291,7 +291,7 @@ struct dhcp_client_uuid {
/** Keep SAN drive registered
*
- * If set to a non-zero value, gPXE will not detach any SAN drive
+ * If set to a non-zero value, iPXE will not detach any SAN drive
* after failing to boot from it. (This option is required in order
* to perform a Windows Server 2008 installation direct to an iSCSI
* target.)
@@ -305,7 +305,7 @@ struct dhcp_client_uuid {
/** Skip PXE DHCP protocol extensions such as ProxyDHCP
*
- * If set to a non-zero value, gPXE will not wait for ProxyDHCP offers
+ * If set to a non-zero value, iPXE will not wait for ProxyDHCP offers
* and will ignore any PXE-specific DHCP options that it receives.
*/
#define DHCP_EB_NO_PXEDHCP DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xb0 )
@@ -386,7 +386,7 @@ struct dhcp_netdev_desc {
*/
#define DHCP_EB_REVERSE_PASSWORD DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xc1 )
-/** gPXE version number */
+/** iPXE version number */
#define DHCP_EB_VERSION DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xeb )
/** iSCSI primary target IQN */
@@ -634,4 +634,4 @@ __weak_decl ( void, get_cached_dhcpack, ( void ), (), );
extern void store_cached_dhcpack ( userptr_t data, size_t len );
-#endif /* _GPXE_DHCP_H */
+#endif /* _IPXE_DHCP_H */
diff --git a/src/include/gpxe/dhcpopts.h b/src/include/ipxe/dhcpopts.h
index 3d90f41..fea99d5 100644
--- a/src/include/gpxe/dhcpopts.h
+++ b/src/include/ipxe/dhcpopts.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DHCPOPTS_H
-#define _GPXE_DHCPOPTS_H
+#ifndef _IPXE_DHCPOPTS_H
+#define _IPXE_DHCPOPTS_H
/** @file
*
@@ -31,4 +31,4 @@ extern int dhcpopt_fetch ( struct dhcp_options *options, unsigned int tag,
extern void dhcpopt_init ( struct dhcp_options *options,
void *data, size_t max_len );
-#endif /* _GPXE_DHCPOPTS_H */
+#endif /* _IPXE_DHCPOPTS_H */
diff --git a/src/include/gpxe/dhcppkt.h b/src/include/ipxe/dhcppkt.h
index 6007cca..5709cc7 100644
--- a/src/include/gpxe/dhcppkt.h
+++ b/src/include/ipxe/dhcppkt.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DHCPPKT_H
-#define _GPXE_DHCPPKT_H
+#ifndef _IPXE_DHCPPKT_H
+#define _IPXE_DHCPPKT_H
/** @file
*
@@ -9,9 +9,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/dhcp.h>
-#include <gpxe/dhcpopts.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/dhcpopts.h>
+#include <ipxe/refcnt.h>
/**
* A DHCP packet
@@ -61,4 +61,4 @@ extern int dhcppkt_fetch ( struct dhcp_packet *dhcppkt, unsigned int tag,
extern void dhcppkt_init ( struct dhcp_packet *dhcppkt,
struct dhcphdr *data, size_t len );
-#endif /* _GPXE_DHCPPKT_H */
+#endif /* _IPXE_DHCPPKT_H */
diff --git a/src/include/gpxe/dns.h b/src/include/ipxe/dns.h
index 9e5e874..1c42760 100644
--- a/src/include/gpxe/dns.h
+++ b/src/include/ipxe/dns.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DNS_H
-#define _GPXE_DNS_H
+#ifndef _IPXE_DNS_H
+#define _IPXE_DNS_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/in.h>
+#include <ipxe/in.h>
/*
* Constants
@@ -89,4 +89,4 @@ union dns_rr_info {
struct dns_rr_info_cname cname;
};
-#endif /* _GPXE_DNS_H */
+#endif /* _IPXE_DNS_H */
diff --git a/src/include/gpxe/downloader.h b/src/include/ipxe/downloader.h
index 7f21e07..023bf94 100644
--- a/src/include/gpxe/downloader.h
+++ b/src/include/ipxe/downloader.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DOWNLOADER_H
-#define _GPXE_DOWNLOADER_H
+#ifndef _IPXE_DOWNLOADER_H
+#define _IPXE_DOWNLOADER_H
/** @file
*
@@ -16,4 +16,4 @@ extern int create_downloader ( struct job_interface *job, struct image *image,
int ( * register_image ) ( struct image *image ),
int type, ... );
-#endif /* _GPXE_DOWNLOADER_H */
+#endif /* _IPXE_DOWNLOADER_H */
diff --git a/src/include/gpxe/eapol.h b/src/include/ipxe/eapol.h
index c9855d0..43d891c 100644
--- a/src/include/gpxe/eapol.h
+++ b/src/include/ipxe/eapol.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef _GPXE_EAPOL_H
-#define _GPXE_EAPOL_H
+#ifndef _IPXE_EAPOL_H
+#define _IPXE_EAPOL_H
/** @file
*
@@ -26,7 +26,7 @@
* them are elsewhere.
*/
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
#include <stdint.h>
FILE_LICENCE ( GPL2_OR_LATER );
@@ -109,4 +109,4 @@ struct eapol_handler
extern struct net_protocol eapol_protocol __net_protocol;
-#endif /* _GPXE_EAPOL_H */
+#endif /* _IPXE_EAPOL_H */
diff --git a/src/include/gpxe/editbox.h b/src/include/ipxe/editbox.h
index b7cc411..9122dbb 100644
--- a/src/include/gpxe/editbox.h
+++ b/src/include/ipxe/editbox.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_EDITBOX_H
-#define _GPXE_EDITBOX_H
+#ifndef _IPXE_EDITBOX_H
+#define _IPXE_EDITBOX_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <curses.h>
-#include <gpxe/editstring.h>
+#include <ipxe/editstring.h>
/** An editable text box widget */
struct edit_box {
@@ -58,4 +58,4 @@ static inline int edit_editbox ( struct edit_box *box, int key ) {
return edit_string ( &box->string, key );
}
-#endif /* _GPXE_EDITBOX_H */
+#endif /* _IPXE_EDITBOX_H */
diff --git a/src/include/gpxe/editstring.h b/src/include/ipxe/editstring.h
index 48c1baa..5c1a18b 100644
--- a/src/include/gpxe/editstring.h
+++ b/src/include/ipxe/editstring.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_EDITSTRING_H
-#define _GPXE_EDITSTRING_H
+#ifndef _IPXE_EDITSTRING_H
+#define _IPXE_EDITSTRING_H
/** @file
*
@@ -30,4 +30,4 @@ struct edit_string {
extern int edit_string ( struct edit_string *string, int key ) __nonnull;
-#endif /* _GPXE_EDITSTRING_H */
+#endif /* _IPXE_EDITSTRING_H */
diff --git a/src/include/gpxe/efi/Base.h b/src/include/ipxe/efi/Base.h
index b2552d8..14fd9cb 100644
--- a/src/include/gpxe/efi/Base.h
+++ b/src/include/ipxe/efi/Base.h
@@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
// Include processor specific binding
//
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
typedef struct {
UINT32 Data1;
diff --git a/src/include/gpxe/efi/Guid/PcAnsi.h b/src/include/ipxe/efi/Guid/PcAnsi.h
index 1dab310..1dab310 100644
--- a/src/include/gpxe/efi/Guid/PcAnsi.h
+++ b/src/include/ipxe/efi/Guid/PcAnsi.h
diff --git a/src/include/gpxe/efi/Guid/SmBios.h b/src/include/ipxe/efi/Guid/SmBios.h
index c6c7f77..c6c7f77 100644
--- a/src/include/gpxe/efi/Guid/SmBios.h
+++ b/src/include/ipxe/efi/Guid/SmBios.h
diff --git a/src/include/gpxe/efi/Ia32/ProcessorBind.h b/src/include/ipxe/efi/Ia32/ProcessorBind.h
index 5a3a918..5a3a918 100644
--- a/src/include/gpxe/efi/Ia32/ProcessorBind.h
+++ b/src/include/ipxe/efi/Ia32/ProcessorBind.h
diff --git a/src/include/gpxe/efi/IndustryStandard/Pci22.h b/src/include/ipxe/efi/IndustryStandard/Pci22.h
index 5b96a56..5b96a56 100644
--- a/src/include/gpxe/efi/IndustryStandard/Pci22.h
+++ b/src/include/ipxe/efi/IndustryStandard/Pci22.h
diff --git a/src/include/gpxe/efi/IndustryStandard/PeImage.h b/src/include/ipxe/efi/IndustryStandard/PeImage.h
index 73b3a5a..73b3a5a 100644
--- a/src/include/gpxe/efi/IndustryStandard/PeImage.h
+++ b/src/include/ipxe/efi/IndustryStandard/PeImage.h
diff --git a/src/include/gpxe/efi/LICENCE b/src/include/ipxe/efi/LICENCE
index 6aa2b2f..6c28e6f 100644
--- a/src/include/gpxe/efi/LICENCE
+++ b/src/include/ipxe/efi/LICENCE
@@ -37,4 +37,4 @@ following licence:
This licence applies only to files that are part of the EFI
Development Kit. Other files may contain their own licence terms, or
-may fall under the standard gPXE GPL licence.
+may fall under the standard iPXE GPL licence.
diff --git a/src/include/gpxe/efi/Pi/PiBootMode.h b/src/include/ipxe/efi/Pi/PiBootMode.h
index bebca22..a33bdf4 100644
--- a/src/include/gpxe/efi/Pi/PiBootMode.h
+++ b/src/include/ipxe/efi/Pi/PiBootMode.h
@@ -18,7 +18,7 @@
#ifndef __PI_BOOT_MODE_H__
#define __PI_BOOT_MODE_H__
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
///
/// EFI boot mode
diff --git a/src/include/gpxe/efi/Pi/PiDependency.h b/src/include/ipxe/efi/Pi/PiDependency.h
index 73f6027..73f6027 100644
--- a/src/include/gpxe/efi/Pi/PiDependency.h
+++ b/src/include/ipxe/efi/Pi/PiDependency.h
diff --git a/src/include/gpxe/efi/Pi/PiDxeCis.h b/src/include/ipxe/efi/Pi/PiDxeCis.h
index a924888..514295a 100644
--- a/src/include/gpxe/efi/Pi/PiDxeCis.h
+++ b/src/include/ipxe/efi/Pi/PiDxeCis.h
@@ -18,7 +18,7 @@
#ifndef __PI_DXECIS_H__
#define __PI_DXECIS_H__
-#include <gpxe/efi/Pi/PiMultiPhase.h>
+#include <ipxe/efi/Pi/PiMultiPhase.h>
///
/// Global Coherencey Domain types - Memory type
diff --git a/src/include/gpxe/efi/Pi/PiFirmwareFile.h b/src/include/ipxe/efi/Pi/PiFirmwareFile.h
index be6f8bd..973a2b5 100644
--- a/src/include/gpxe/efi/Pi/PiFirmwareFile.h
+++ b/src/include/ipxe/efi/Pi/PiFirmwareFile.h
@@ -19,7 +19,7 @@
#ifndef __PI_FIRMWARE_FILE_H__
#define __PI_FIRMWARE_FILE_H__
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
#pragma pack(1)
///
diff --git a/src/include/gpxe/efi/Pi/PiFirmwareVolume.h b/src/include/ipxe/efi/Pi/PiFirmwareVolume.h
index 277b704..5f530e6 100644
--- a/src/include/gpxe/efi/Pi/PiFirmwareVolume.h
+++ b/src/include/ipxe/efi/Pi/PiFirmwareVolume.h
@@ -18,7 +18,7 @@
#ifndef __PI_FIRMWAREVOLUME_H__
#define __PI_FIRMWAREVOLUME_H__
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
///
/// EFI_FV_FILE_ATTRIBUTES
diff --git a/src/include/gpxe/efi/Pi/PiHob.h b/src/include/ipxe/efi/Pi/PiHob.h
index 0c8df1f..26dc45c 100644
--- a/src/include/gpxe/efi/Pi/PiHob.h
+++ b/src/include/ipxe/efi/Pi/PiHob.h
@@ -18,10 +18,10 @@
#ifndef __PI_HOB_H__
#define __PI_HOB_H__
-#include <gpxe/efi/ProcessorBind.h>
-#include <gpxe/efi/Pi/PiBootMode.h>
-#include <gpxe/efi/Uefi/UefiBaseType.h>
-#include <gpxe/efi/Uefi/UefiMultiPhase.h>
+#include <ipxe/efi/ProcessorBind.h>
+#include <ipxe/efi/Pi/PiBootMode.h>
+#include <ipxe/efi/Uefi/UefiBaseType.h>
+#include <ipxe/efi/Uefi/UefiMultiPhase.h>
//
// HobType of EFI_HOB_GENERIC_HEADER.
diff --git a/src/include/gpxe/efi/Pi/PiMultiPhase.h b/src/include/ipxe/efi/Pi/PiMultiPhase.h
index 3ab6421..9644024 100644
--- a/src/include/gpxe/efi/Pi/PiMultiPhase.h
+++ b/src/include/ipxe/efi/Pi/PiMultiPhase.h
@@ -18,14 +18,14 @@
#ifndef __PI_MULTIPHASE_H__
#define __PI_MULTIPHASE_H__
-#include <gpxe/efi/Uefi/UefiMultiPhase.h>
+#include <ipxe/efi/Uefi/UefiMultiPhase.h>
-#include <gpxe/efi/Pi/PiFirmwareVolume.h>
-#include <gpxe/efi/Pi/PiFirmwareFile.h>
-#include <gpxe/efi/Pi/PiBootMode.h>
+#include <ipxe/efi/Pi/PiFirmwareVolume.h>
+#include <ipxe/efi/Pi/PiFirmwareFile.h>
+#include <ipxe/efi/Pi/PiBootMode.h>
-#include <gpxe/efi/Pi/PiHob.h>
-#include <gpxe/efi/Pi/PiDependency.h>
+#include <ipxe/efi/Pi/PiHob.h>
+#include <ipxe/efi/Pi/PiDependency.h>
#define EFI_NOT_AVAILABLE_YET EFIERR (32)
diff --git a/src/include/gpxe/efi/PiDxe.h b/src/include/ipxe/efi/PiDxe.h
index c326302..b79a96e 100644
--- a/src/include/gpxe/efi/PiDxe.h
+++ b/src/include/ipxe/efi/PiDxe.h
@@ -16,10 +16,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef __PI_DXE_H__
#define __PI_DXE_H__
-#include <gpxe/efi/Uefi/UefiBaseType.h>
-#include <gpxe/efi/Uefi/UefiSpec.h>
+#include <ipxe/efi/Uefi/UefiBaseType.h>
+#include <ipxe/efi/Uefi/UefiSpec.h>
-#include <gpxe/efi/Pi/PiDxeCis.h>
+#include <ipxe/efi/Pi/PiDxeCis.h>
#endif
diff --git a/src/include/gpxe/efi/ProcessorBind.h b/src/include/ipxe/efi/ProcessorBind.h
index 3dbaf1b..bf39cd6 100644
--- a/src/include/gpxe/efi/ProcessorBind.h
+++ b/src/include/ipxe/efi/ProcessorBind.h
@@ -6,9 +6,9 @@
*/
#if __i386__
-#include <gpxe/efi/Ia32/ProcessorBind.h>
+#include <ipxe/efi/Ia32/ProcessorBind.h>
#endif
#if __x86_64__
-#include <gpxe/efi/X64/ProcessorBind.h>
+#include <ipxe/efi/X64/ProcessorBind.h>
#endif
diff --git a/src/include/gpxe/efi/Protocol/ComponentName2.h b/src/include/ipxe/efi/Protocol/ComponentName2.h
index 0f01014..0f01014 100644
--- a/src/include/gpxe/efi/Protocol/ComponentName2.h
+++ b/src/include/ipxe/efi/Protocol/ComponentName2.h
diff --git a/src/include/gpxe/efi/Protocol/Cpu.h b/src/include/ipxe/efi/Protocol/Cpu.h
index da3d0fd..b06c0df 100644
--- a/src/include/gpxe/efi/Protocol/Cpu.h
+++ b/src/include/ipxe/efi/Protocol/Cpu.h
@@ -17,7 +17,7 @@
#ifndef __ARCH_PROTOCOL_CPU_H__
#define __ARCH_PROTOCOL_CPU_H__
-#include <gpxe/efi/Protocol/DebugSupport.h>
+#include <ipxe/efi/Protocol/DebugSupport.h>
#define EFI_CPU_ARCH_PROTOCOL_GUID \
{ 0x26baccb1, 0x6f42, 0x11d4, {0xbc, 0xe7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } }
diff --git a/src/include/gpxe/efi/Protocol/CpuIo.h b/src/include/ipxe/efi/Protocol/CpuIo.h
index 8d35c6c..e3d9610 100644
--- a/src/include/gpxe/efi/Protocol/CpuIo.h
+++ b/src/include/ipxe/efi/Protocol/CpuIo.h
@@ -22,7 +22,7 @@
#ifndef _CPUIO_H_
#define _CPUIO_H_
-#include <gpxe/efi/PiDxe.h>
+#include <ipxe/efi/PiDxe.h>
#define EFI_CPU_IO_PROTOCOL_GUID \
{ \
diff --git a/src/include/gpxe/efi/Protocol/DebugSupport.h b/src/include/ipxe/efi/Protocol/DebugSupport.h
index c8db249..370614d 100644
--- a/src/include/gpxe/efi/Protocol/DebugSupport.h
+++ b/src/include/ipxe/efi/Protocol/DebugSupport.h
@@ -19,8 +19,8 @@
#ifndef __DEBUG_SUPPORT_H__
#define __DEBUG_SUPPORT_H__
-#include <gpxe/efi/ProcessorBind.h>
-#include <gpxe/efi/IndustryStandard/PeImage.h>
+#include <ipxe/efi/ProcessorBind.h>
+#include <ipxe/efi/IndustryStandard/PeImage.h>
typedef struct _EFI_DEBUG_SUPPORT_PROTOCOL EFI_DEBUG_SUPPORT_PROTOCOL;
diff --git a/src/include/gpxe/efi/Protocol/DevicePath.h b/src/include/ipxe/efi/Protocol/DevicePath.h
index e847668..4d31008 100644
--- a/src/include/gpxe/efi/Protocol/DevicePath.h
+++ b/src/include/ipxe/efi/Protocol/DevicePath.h
@@ -19,7 +19,7 @@
#ifndef __EFI_DEVICE_PATH_PROTOCOL_H__
#define __EFI_DEVICE_PATH_PROTOCOL_H__
-#include <gpxe/efi/Guid/PcAnsi.h>
+#include <ipxe/efi/Guid/PcAnsi.h>
///
/// Device Path protocol
diff --git a/src/include/gpxe/efi/Protocol/DriverBinding.h b/src/include/ipxe/efi/Protocol/DriverBinding.h
index 510cb7c..2ee7845 100644
--- a/src/include/gpxe/efi/Protocol/DriverBinding.h
+++ b/src/include/ipxe/efi/Protocol/DriverBinding.h
@@ -18,7 +18,7 @@
#ifndef __EFI_DRIVER_BINDING_H__
#define __EFI_DRIVER_BINDING_H__
-#include <gpxe/efi/Protocol/DevicePath.h>
+#include <ipxe/efi/Protocol/DevicePath.h>
///
/// Global ID for the ControllerHandle Driver Protocol
///
diff --git a/src/include/gpxe/efi/Protocol/NetworkInterfaceIdentifier.h b/src/include/ipxe/efi/Protocol/NetworkInterfaceIdentifier.h
index e99ec38..e99ec38 100644
--- a/src/include/gpxe/efi/Protocol/NetworkInterfaceIdentifier.h
+++ b/src/include/ipxe/efi/Protocol/NetworkInterfaceIdentifier.h
diff --git a/src/include/gpxe/efi/Protocol/PciIo.h b/src/include/ipxe/efi/Protocol/PciIo.h
index 5aea5b4..5aea5b4 100644
--- a/src/include/gpxe/efi/Protocol/PciIo.h
+++ b/src/include/ipxe/efi/Protocol/PciIo.h
diff --git a/src/include/gpxe/efi/Protocol/PciRootBridgeIo.h b/src/include/ipxe/efi/Protocol/PciRootBridgeIo.h
index a1150f0..a1150f0 100644
--- a/src/include/gpxe/efi/Protocol/PciRootBridgeIo.h
+++ b/src/include/ipxe/efi/Protocol/PciRootBridgeIo.h
diff --git a/src/include/gpxe/efi/Protocol/SimpleNetwork.h b/src/include/ipxe/efi/Protocol/SimpleNetwork.h
index d3d2afc..d3d2afc 100644
--- a/src/include/gpxe/efi/Protocol/SimpleNetwork.h
+++ b/src/include/ipxe/efi/Protocol/SimpleNetwork.h
diff --git a/src/include/gpxe/efi/Protocol/SimpleTextIn.h b/src/include/ipxe/efi/Protocol/SimpleTextIn.h
index f14f62d..787d8f1 100644
--- a/src/include/gpxe/efi/Protocol/SimpleTextIn.h
+++ b/src/include/ipxe/efi/Protocol/SimpleTextIn.h
@@ -18,7 +18,7 @@
#ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__
#define __SIMPLE_TEXT_IN_PROTOCOL_H__
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID \
{ \
diff --git a/src/include/gpxe/efi/Protocol/SimpleTextOut.h b/src/include/ipxe/efi/Protocol/SimpleTextOut.h
index 426ce81..426ce81 100644
--- a/src/include/gpxe/efi/Protocol/SimpleTextOut.h
+++ b/src/include/ipxe/efi/Protocol/SimpleTextOut.h
diff --git a/src/include/gpxe/efi/Uefi.h b/src/include/ipxe/efi/Uefi.h
index 58ddb11..1e62d2a 100644
--- a/src/include/gpxe/efi/Uefi.h
+++ b/src/include/ipxe/efi/Uefi.h
@@ -20,8 +20,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef __PI_UEFI_H__
#define __PI_UEFI_H__
-#include <gpxe/efi/Uefi/UefiBaseType.h>
-#include <gpxe/efi/Uefi/UefiSpec.h>
+#include <ipxe/efi/Uefi/UefiBaseType.h>
+#include <ipxe/efi/Uefi/UefiSpec.h>
#endif
diff --git a/src/include/gpxe/efi/Uefi/UefiBaseType.h b/src/include/ipxe/efi/Uefi/UefiBaseType.h
index 475ac01..e7d964d 100644
--- a/src/include/gpxe/efi/Uefi/UefiBaseType.h
+++ b/src/include/ipxe/efi/Uefi/UefiBaseType.h
@@ -15,7 +15,7 @@
#ifndef __UEFI_BASETYPE_H__
#define __UEFI_BASETYPE_H__
-#include <gpxe/efi/Base.h>
+#include <ipxe/efi/Base.h>
//
// Basical data type definitions introduced in UEFI.
diff --git a/src/include/gpxe/efi/Uefi/UefiGpt.h b/src/include/ipxe/efi/Uefi/UefiGpt.h
index 92c3035..92c3035 100644
--- a/src/include/gpxe/efi/Uefi/UefiGpt.h
+++ b/src/include/ipxe/efi/Uefi/UefiGpt.h
diff --git a/src/include/gpxe/efi/Uefi/UefiInternalFormRepresentation.h b/src/include/ipxe/efi/Uefi/UefiInternalFormRepresentation.h
index c675517..c675517 100644
--- a/src/include/gpxe/efi/Uefi/UefiInternalFormRepresentation.h
+++ b/src/include/ipxe/efi/Uefi/UefiInternalFormRepresentation.h
diff --git a/src/include/gpxe/efi/Uefi/UefiMultiPhase.h b/src/include/ipxe/efi/Uefi/UefiMultiPhase.h
index 2d1af5e..24cf48e 100644
--- a/src/include/gpxe/efi/Uefi/UefiMultiPhase.h
+++ b/src/include/ipxe/efi/Uefi/UefiMultiPhase.h
@@ -15,7 +15,7 @@
#ifndef __UEFI_MULTIPHASE_H__
#define __UEFI_MULTIPHASE_H__
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
///
/// Enumeration of memory types introduced in UEFI.
diff --git a/src/include/gpxe/efi/Uefi/UefiPxe.h b/src/include/ipxe/efi/Uefi/UefiPxe.h
index bb8ab41..bb8ab41 100644
--- a/src/include/gpxe/efi/Uefi/UefiPxe.h
+++ b/src/include/ipxe/efi/Uefi/UefiPxe.h
diff --git a/src/include/gpxe/efi/Uefi/UefiSpec.h b/src/include/ipxe/efi/Uefi/UefiSpec.h
index 03e7b6c..4d34b19 100644
--- a/src/include/gpxe/efi/Uefi/UefiSpec.h
+++ b/src/include/ipxe/efi/Uefi/UefiSpec.h
@@ -19,11 +19,11 @@
#ifndef __UEFI_SPEC_H__
#define __UEFI_SPEC_H__
-#include <gpxe/efi/Uefi/UefiMultiPhase.h>
+#include <ipxe/efi/Uefi/UefiMultiPhase.h>
-#include <gpxe/efi/Protocol/DevicePath.h>
-#include <gpxe/efi/Protocol/SimpleTextIn.h>
-#include <gpxe/efi/Protocol/SimpleTextOut.h>
+#include <ipxe/efi/Protocol/DevicePath.h>
+#include <ipxe/efi/Protocol/SimpleTextIn.h>
+#include <ipxe/efi/Protocol/SimpleTextOut.h>
///
/// Enumeration of memory allocation.
@@ -1909,8 +1909,8 @@ typedef struct {
#error Unknown Processor Type
#endif
-#include <gpxe/efi/Uefi/UefiPxe.h>
-#include <gpxe/efi/Uefi/UefiGpt.h>
-#include <gpxe/efi/Uefi/UefiInternalFormRepresentation.h>
+#include <ipxe/efi/Uefi/UefiPxe.h>
+#include <ipxe/efi/Uefi/UefiGpt.h>
+#include <ipxe/efi/Uefi/UefiInternalFormRepresentation.h>
#endif
diff --git a/src/include/gpxe/efi/X64/ProcessorBind.h b/src/include/ipxe/efi/X64/ProcessorBind.h
index fe6c413..fe6c413 100644
--- a/src/include/gpxe/efi/X64/ProcessorBind.h
+++ b/src/include/ipxe/efi/X64/ProcessorBind.h
diff --git a/src/include/gpxe/efi/efi.h b/src/include/ipxe/efi/efi.h
index f4459b7..4acbc24 100644
--- a/src/include/gpxe/efi/efi.h
+++ b/src/include/ipxe/efi/efi.h
@@ -6,7 +6,7 @@
* EFI API
*
* The intention is to include near-verbatim copies of the EFI headers
- * required by gPXE. This is achieved using the import.pl script in
+ * required by iPXE. This is achieved using the import.pl script in
* this directory. Run the import script to update the local copies
* of the headers:
*
@@ -16,7 +16,7 @@
* EFI Development Kit.
*
* Note that import.pl will modify any #include lines in each imported
- * header to reflect its new location within the gPXE tree. It will
+ * header to reflect its new location within the iPXE tree. It will
* also tidy up the file by removing carriage return characters and
* trailing whitespace.
*
@@ -37,23 +37,23 @@
#endif
/* Include the top-level EFI header files */
-#include <gpxe/efi/Uefi.h>
-#include <gpxe/efi/PiDxe.h>
+#include <ipxe/efi/Uefi.h>
+#include <ipxe/efi/PiDxe.h>
/* Reset any trailing #pragma pack directives */
#pragma pack(1)
#pragma pack()
-#include <gpxe/tables.h>
-#include <gpxe/uuid.h>
+#include <ipxe/tables.h>
+#include <ipxe/uuid.h>
-/** An EFI protocol used by gPXE */
+/** An EFI protocol used by iPXE */
struct efi_protocol {
/** GUID */
union {
/** EFI protocol GUID */
EFI_GUID guid;
- /** UUID structure understood by gPXE */
+ /** UUID structure understood by iPXE */
union uuid uuid;
} u;
/** Variable containing pointer to protocol structure */
@@ -63,10 +63,10 @@ struct efi_protocol {
/** EFI protocol table */
#define EFI_PROTOCOLS __table ( struct efi_protocol, "efi_protocols" )
-/** Declare an EFI protocol used by gPXE */
+/** Declare an EFI protocol used by iPXE */
#define __efi_protocol __table_entry ( EFI_PROTOCOLS, 01 )
-/** Declare an EFI protocol to be required by gPXE
+/** Declare an EFI protocol to be required by iPXE
*
* @v _protocol EFI protocol name
* @v _ptr Pointer to protocol instance
@@ -79,13 +79,13 @@ struct efi_protocol {
(_ptr) : (_ptr) ) ), \
}
-/** An EFI configuration table used by gPXE */
+/** An EFI configuration table used by iPXE */
struct efi_config_table {
/** GUID */
union {
/** EFI configuration table GUID */
EFI_GUID guid;
- /** UUID structure understood by gPXE */
+ /** UUID structure understood by iPXE */
union uuid uuid;
} u;
/** Variable containing pointer to configuration table */
@@ -98,10 +98,10 @@ struct efi_config_table {
#define EFI_CONFIG_TABLES \
__table ( struct efi_config_table, "efi_config_tables" )
-/** Declare an EFI configuration table used by gPXE */
+/** Declare an EFI configuration table used by iPXE */
#define __efi_config_table __table_entry ( EFI_CONFIG_TABLES, 01 )
-/** Declare an EFI configuration table to be used by gPXE
+/** Declare an EFI configuration table to be used by iPXE
*
* @v _table EFI configuration table name
* @v _ptr Pointer to configuration table
@@ -114,9 +114,9 @@ struct efi_config_table {
.required = (_required), \
}
-/** Convert a gPXE status code to an EFI status code
+/** Convert a iPXE status code to an EFI status code
*
- * FIXME: actually perform some kind of conversion. gPXE error codes
+ * FIXME: actually perform some kind of conversion. iPXE error codes
* will be detected as EFI error codes; both have the top bit set, and
* the success return code is zero for both. Anything that just
* reports a numerical error will be OK, anything attempting to
@@ -125,7 +125,7 @@ struct efi_config_table {
*/
#define RC_TO_EFIRC( rc ) (rc)
-/** Convert an EFI status code to a gPXE status code
+/** Convert an EFI status code to a iPXE status code
*
* FIXME: as above
*/
diff --git a/src/include/gpxe/efi/efi_io.h b/src/include/ipxe/efi/efi_io.h
index 7ad5ffe..2ed96e1 100644
--- a/src/include/gpxe/efi/efi_io.h
+++ b/src/include/ipxe/efi/efi_io.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_IO_H
-#define _GPXE_EFI_IO_H
+#ifndef _IPXE_EFI_IO_H
+#define _IPXE_EFI_IO_H
/** @file
*
- * gPXE I/O API for EFI
+ * iPXE I/O API for EFI
*
* EFI runs with flat physical addressing, so the various mappings
* between virtual addresses, I/O addresses and bus addresses are all
@@ -177,4 +177,4 @@ IOAPI_INLINE ( efi, mb ) ( void ) {
*/
}
-#endif /* _GPXE_EFI_IO_H */
+#endif /* _IPXE_EFI_IO_H */
diff --git a/src/include/gpxe/efi/efi_pci.h b/src/include/ipxe/efi/efi_pci.h
index 59c0eb1..b280d80 100644
--- a/src/include/gpxe/efi/efi_pci.h
+++ b/src/include/ipxe/efi/efi_pci.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_PCI_H
-#define _GPXE_EFI_PCI_H
+#ifndef _IPXE_EFI_PCI_H
+#define _IPXE_EFI_PCI_H
/** @file
*
- * gPXE PCI I/O API for EFI
+ * iPXE PCI I/O API for EFI
*
*/
@@ -145,4 +145,4 @@ PCIAPI_INLINE ( efi, pci_write_config_dword ) ( struct pci_device *pci,
value );
}
-#endif /* _GPXE_EFI_PCI_H */
+#endif /* _IPXE_EFI_PCI_H */
diff --git a/src/include/gpxe/efi/efi_smbios.h b/src/include/ipxe/efi/efi_smbios.h
index 01631e5..7642e5b 100644
--- a/src/include/gpxe/efi/efi_smbios.h
+++ b/src/include/ipxe/efi/efi_smbios.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_SMBIOS_H
-#define _GPXE_EFI_SMBIOS_H
+#ifndef _IPXE_EFI_SMBIOS_H
+#define _IPXE_EFI_SMBIOS_H
/** @file
*
- * gPXE SMBIOS API for EFI
+ * iPXE SMBIOS API for EFI
*
*/
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define SMBIOS_PREFIX_efi __efi_
#endif
-#endif /* _GPXE_EFI_SMBIOS_H */
+#endif /* _IPXE_EFI_SMBIOS_H */
diff --git a/src/include/gpxe/efi/efi_timer.h b/src/include/ipxe/efi/efi_timer.h
index e0531d5..b10543d 100644
--- a/src/include/gpxe/efi/efi_timer.h
+++ b/src/include/ipxe/efi/efi_timer.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_TIMER_H
-#define _GPXE_EFI_TIMER_H
+#ifndef _IPXE_EFI_TIMER_H
+#define _IPXE_EFI_TIMER_H
/** @file
*
- * gPXE timer API for EFI
+ * iPXE timer API for EFI
*
*/
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define TIMER_PREFIX_efi __efi_
#endif
-#endif /* _GPXE_EFI_TIMER_H */
+#endif /* _IPXE_EFI_TIMER_H */
diff --git a/src/include/gpxe/efi/efi_uaccess.h b/src/include/ipxe/efi/efi_uaccess.h
index a6b61c5..dc226a3 100644
--- a/src/include/gpxe/efi/efi_uaccess.h
+++ b/src/include/ipxe/efi/efi_uaccess.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_UACCESS_H
-#define _GPXE_EFI_UACCESS_H
+#ifndef _IPXE_EFI_UACCESS_H
+#define _IPXE_EFI_UACCESS_H
/** @file
*
- * gPXE user access API for EFI
+ * iPXE user access API for EFI
*
* EFI runs with flat physical addressing, so the various mappings
* between virtual addresses, I/O addresses and bus addresses are all
@@ -87,4 +87,4 @@ UACCESS_INLINE ( efi, memchr_user ) ( userptr_t buffer, off_t offset,
return trivial_memchr_user ( buffer, offset, c, len );
}
-#endif /* _GPXE_EFI_UACCESS_H */
+#endif /* _IPXE_EFI_UACCESS_H */
diff --git a/src/include/gpxe/efi/efi_umalloc.h b/src/include/ipxe/efi/efi_umalloc.h
index 0388dd1..911e69a 100644
--- a/src/include/gpxe/efi/efi_umalloc.h
+++ b/src/include/ipxe/efi/efi_umalloc.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_UMALLOC_H
-#define _GPXE_EFI_UMALLOC_H
+#ifndef _IPXE_EFI_UMALLOC_H
+#define _IPXE_EFI_UMALLOC_H
/** @file
*
- * gPXE user memory allocation API for EFI
+ * iPXE user memory allocation API for EFI
*
*/
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define UMALLOC_PREFIX_efi __efi_
#endif
-#endif /* _GPXE_EFI_UMALLOC_H */
+#endif /* _IPXE_EFI_UMALLOC_H */
diff --git a/src/include/gpxe/efi/import.pl b/src/include/ipxe/efi/import.pl
index 1699394..4ea5175 100755
--- a/src/include/gpxe/efi/import.pl
+++ b/src/include/ipxe/efi/import.pl
@@ -8,7 +8,7 @@ use strict;
use warnings;
sub try_import_file {
- my $gpxedir = shift;
+ my $ipxedir = shift;
my $edkdirs = shift;
my $filename = shift;
@@ -16,7 +16,7 @@ sub try_import_file {
return unless $filename =~ /\.h$/;
print "$filename...";
- my $outfile = catfile ( $gpxedir, $filename );
+ my $outfile = catfile ( $ipxedir, $filename );
foreach my $edkdir ( @$edkdirs ) {
my $infile = catfile ( $edkdir, $filename );
if ( -e $infile ) {
@@ -33,7 +33,7 @@ sub try_import_file {
s/\s*$//g;
chomp;
# Update include lines, and record included files
- if ( s/^\#include\s+[<\"](\S+)[>\"]/\#include <gpxe\/efi\/$1>/ ) {
+ if ( s/^\#include\s+[<\"](\S+)[>\"]/\#include <ipxe\/efi\/$1>/ ) {
push @dependencies, $1;
}
print $outfh "$_\n";
@@ -42,9 +42,9 @@ sub try_import_file {
close $infh;
# Recurse to handle any included files that we don't already have
foreach my $dependency ( @dependencies ) {
- if ( ! -e catfile ( $gpxedir, $dependency ) ) {
+ if ( ! -e catfile ( $ipxedir, $dependency ) ) {
print "...following dependency on $dependency\n";
- try_import_file ( $gpxedir, $edkdirs, $dependency );
+ try_import_file ( $ipxedir, $edkdirs, $dependency );
}
}
return;
@@ -61,15 +61,15 @@ die "Directory \"$edktop\" does not appear to contain the EFI EDK2\n"
my $edkdirs = [ catfile ( $edktop, "MdePkg/Include" ),
catfile ( $edktop, "IntelFrameworkPkg/Include" ) ];
-# Identify gPXE EFI includes directory
-my $gpxedir = $FindBin::Bin;
-die "Directory \"$gpxedir\" does not appear to contain the gPXE EFI includes\n"
- unless -e catfile ( $gpxedir, "../../../include/gpxe/efi" );
+# Identify iPXE EFI includes directory
+my $ipxedir = $FindBin::Bin;
+die "Directory \"$ipxedir\" does not appear to contain the iPXE EFI includes\n"
+ unless -e catfile ( $ipxedir, "../../../include/ipxe/efi" );
-print "Importing EFI headers into $gpxedir\nfrom ";
+print "Importing EFI headers into $ipxedir\nfrom ";
print join ( "\n and ", @$edkdirs )."\n";
# Import headers
find ( { wanted => sub {
- try_import_file ( $gpxedir, $edkdirs, abs2rel ( $_, $gpxedir ) );
-}, no_chdir => 1 }, $gpxedir );
+ try_import_file ( $ipxedir, $edkdirs, abs2rel ( $_, $ipxedir ) );
+}, no_chdir => 1 }, $ipxedir );
diff --git a/src/include/gpxe/eisa.h b/src/include/ipxe/eisa.h
index f76e4b9..1588f81 100644
--- a/src/include/gpxe/eisa.h
+++ b/src/include/ipxe/eisa.h
@@ -4,9 +4,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/isa_ids.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
+#include <ipxe/isa_ids.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
/*
* EISA constants
diff --git a/src/include/gpxe/elf.h b/src/include/ipxe/elf.h
index da9d2fc..23160a9 100644
--- a/src/include/gpxe/elf.h
+++ b/src/include/ipxe/elf.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ELF_H
-#define _GPXE_ELF_H
+#ifndef _IPXE_ELF_H
+#define _IPXE_ELF_H
/**
* @file
@@ -14,4 +14,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
extern int elf_load ( struct image *image );
-#endif /* _GPXE_ELF_H */
+#endif /* _IPXE_ELF_H */
diff --git a/src/include/gpxe/errfile.h b/src/include/ipxe/errfile.h
index f2be7c0..736ce46 100644
--- a/src/include/gpxe/errfile.h
+++ b/src/include/ipxe/errfile.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ERRFILE_H
-#define _GPXE_ERRFILE_H
+#ifndef _IPXE_ERRFILE_H
+#define _IPXE_ERRFILE_H
/** @file
*
@@ -208,4 +208,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
/** @} */
-#endif /* _GPXE_ERRFILE_H */
+#endif /* _IPXE_ERRFILE_H */
diff --git a/src/include/gpxe/errortab.h b/src/include/ipxe/errortab.h
index 35765d4..945cde3 100644
--- a/src/include/gpxe/errortab.h
+++ b/src/include/ipxe/errortab.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ERRORTAB_H
-#define _GPXE_ERRORTAB_H
+#ifndef _IPXE_ERRORTAB_H
+#define _IPXE_ERRORTAB_H
/** @file
*
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
struct errortab {
int errno;
@@ -20,4 +20,4 @@ struct errortab {
#define __errortab __table_entry ( ERRORTAB, 01 )
-#endif /* _GPXE_ERRORTAB_H */
+#endif /* _IPXE_ERRORTAB_H */
diff --git a/src/include/gpxe/ethernet.h b/src/include/ipxe/ethernet.h
index 4dfc24d..5799092 100644
--- a/src/include/gpxe/ethernet.h
+++ b/src/include/ipxe/ethernet.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ETHERNET_H
-#define _GPXE_ETHERNET_H
+#ifndef _IPXE_ETHERNET_H
+#define _IPXE_ETHERNET_H
/** @file
*
@@ -18,4 +18,4 @@ extern int eth_mc_hash ( unsigned int af, const void *net_addr,
extern int eth_eth_addr ( const void *ll_addr, void *eth_addr );
extern struct net_device * alloc_etherdev ( size_t priv_size );
-#endif /* _GPXE_ETHERNET_H */
+#endif /* _IPXE_ETHERNET_H */
diff --git a/src/include/gpxe/fakedhcp.h b/src/include/ipxe/fakedhcp.h
index c603bdc..ea06b06 100644
--- a/src/include/gpxe/fakedhcp.h
+++ b/src/include/ipxe/fakedhcp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_FAKEDHCP_H
-#define _GPXE_FAKEDHCP_H
+#ifndef _IPXE_FAKEDHCP_H
+#define _IPXE_FAKEDHCP_H
/** @file
*
@@ -20,4 +20,4 @@ extern int create_fakedhcpack ( struct net_device *netdev,
extern int create_fakepxebsack ( struct net_device *netdev,
void *data, size_t max_len );
-#endif /* _GPXE_FAKEDHCP_H */
+#endif /* _IPXE_FAKEDHCP_H */
diff --git a/src/include/gpxe/features.h b/src/include/ipxe/features.h
index 3443186..b5033a6 100644
--- a/src/include/gpxe/features.h
+++ b/src/include/ipxe/features.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_FEATURES_H
-#define _GPXE_FEATURES_H
+#ifndef _IPXE_FEATURES_H
+#define _IPXE_FEATURES_H
#include <stdint.h>
-#include <gpxe/tables.h>
-#include <gpxe/dhcp.h>
+#include <ipxe/tables.h>
+#include <ipxe/dhcp.h>
/** @file
*
@@ -100,4 +100,4 @@ struct feature {
#define FEATURE_VERSION( ... ) \
DHCP_FEATURE ( DHCP_ENCAPSULATED ( DHCP_EB_VERSION ), __VA_ARGS__ )
-#endif /* _GPXE_FEATURES_H */
+#endif /* _IPXE_FEATURES_H */
diff --git a/src/include/gpxe/filter.h b/src/include/ipxe/filter.h
index 1f59fcc..b23a98d 100644
--- a/src/include/gpxe/filter.h
+++ b/src/include/ipxe/filter.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_FILTER_H
-#define _GPXE_FILTER_H
+#ifndef _IPXE_FILTER_H
+#define _IPXE_FILTER_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stddef.h>
-#include <gpxe/xfer.h>
+#include <ipxe/xfer.h>
/**
* Half of a data transfer filter
@@ -72,4 +72,4 @@ static inline void filter_init ( struct xfer_filter_half *left,
right->other = left;
}
-#endif /* _GPXE_FILTER_H */
+#endif /* _IPXE_FILTER_H */
diff --git a/src/include/gpxe/ftp.h b/src/include/ipxe/ftp.h
index 93194f6..cbab12d 100644
--- a/src/include/gpxe/ftp.h
+++ b/src/include/ipxe/ftp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_FTP_H
-#define _GPXE_FTP_H
+#ifndef _IPXE_FTP_H
+#define _IPXE_FTP_H
/** @file
*
@@ -12,4 +12,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
/** FTP default port */
#define FTP_PORT 21
-#endif /* _GPXE_FTP_H */
+#endif /* _IPXE_FTP_H */
diff --git a/src/include/gpxe/gdbserial.h b/src/include/ipxe/gdbserial.h
index 2613ab4..a3b5617 100644
--- a/src/include/gpxe/gdbserial.h
+++ b/src/include/ipxe/gdbserial.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_GDBSERIAL_H
-#define _GPXE_GDBSERIAL_H
+#ifndef _IPXE_GDBSERIAL_H
+#define _IPXE_GDBSERIAL_H
/** @file
*
@@ -18,4 +18,4 @@ struct gdb_transport;
*/
struct gdb_transport *gdbserial_configure ( void );
-#endif /* _GPXE_GDBSERIAL_H */
+#endif /* _IPXE_GDBSERIAL_H */
diff --git a/src/include/gpxe/gdbstub.h b/src/include/ipxe/gdbstub.h
index 8f9b7c1..3196067 100644
--- a/src/include/gpxe/gdbstub.h
+++ b/src/include/ipxe/gdbstub.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_GDBSTUB_H
-#define _GPXE_GDBSTUB_H
+#ifndef _IPXE_GDBSTUB_H
+#define _IPXE_GDBSTUB_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
#include <gdbmach.h>
/**
@@ -74,4 +74,4 @@ extern void gdbstub_start ( struct gdb_transport *trans );
**/
extern void gdbstub_handler ( int signo, gdbreg_t *regs );
-#endif /* _GPXE_GDBSTUB_H */
+#endif /* _IPXE_GDBSTUB_H */
diff --git a/src/include/gpxe/gdbudp.h b/src/include/ipxe/gdbudp.h
index 5f02faa..db7a451 100644
--- a/src/include/gpxe/gdbudp.h
+++ b/src/include/ipxe/gdbudp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_GDBUDP_H
-#define _GPXE_GDBUDP_H
+#ifndef _IPXE_GDBUDP_H
+#define _IPXE_GDBUDP_H
/** @file
*
@@ -21,4 +21,4 @@ struct gdb_transport;
*/
struct gdb_transport *gdbudp_configure ( const char *name, struct sockaddr_in *addr );
-#endif /* _GPXE_GDBUDP_H */
+#endif /* _IPXE_GDBUDP_H */
diff --git a/src/include/gpxe/hidemem.h b/src/include/ipxe/hidemem.h
index 01b3fc2..ddc9cd8 100644
--- a/src/include/gpxe/hidemem.h
+++ b/src/include/ipxe/hidemem.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_HIDEMEM_H
-#define _GPXE_HIDEMEM_H
+#ifndef _IPXE_HIDEMEM_H
+#define _IPXE_HIDEMEM_H
/**
* @file
@@ -14,4 +14,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
extern void hide_umalloc ( physaddr_t start, physaddr_t end );
-#endif /* _GPXE_HIDEMEM_H */
+#endif /* _IPXE_HIDEMEM_H */
diff --git a/src/include/gpxe/hmac.h b/src/include/ipxe/hmac.h
index cb001b9..d5ec086 100644
--- a/src/include/gpxe/hmac.h
+++ b/src/include/ipxe/hmac.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_HMAC_H
-#define _GPXE_HMAC_H
+#ifndef _IPXE_HMAC_H
+#define _IPXE_HMAC_H
/** @file
*
@@ -8,7 +8,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/crypto.h>
+#include <ipxe/crypto.h>
/**
* Update HMAC
@@ -29,4 +29,4 @@ extern void hmac_init ( struct digest_algorithm *digest, void *digest_ctx,
extern void hmac_final ( struct digest_algorithm *digest, void *digest_ctx,
void *key, size_t *key_len, void *hmac );
-#endif /* _GPXE_HMAC_H */
+#endif /* _IPXE_HMAC_H */
diff --git a/src/include/gpxe/http.h b/src/include/ipxe/http.h
index baa6d83..97014d1 100644
--- a/src/include/gpxe/http.h
+++ b/src/include/ipxe/http.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_HTTP_H
-#define _GPXE_HTTP_H
+#ifndef _IPXE_HTTP_H
+#define _IPXE_HTTP_H
/** @file
*
@@ -20,4 +20,4 @@ extern int http_open_filter ( struct xfer_interface *xfer, struct uri *uri,
int ( * filter ) ( struct xfer_interface *,
struct xfer_interface ** ) );
-#endif /* _GPXE_HTTP_H */
+#endif /* _IPXE_HTTP_H */
diff --git a/src/include/gpxe/i2c.h b/src/include/ipxe/i2c.h
index 87b89d4..c1f5a9b 100644
--- a/src/include/gpxe/i2c.h
+++ b/src/include/ipxe/i2c.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_I2C_H
-#define _GPXE_I2C_H
+#ifndef _IPXE_I2C_H
+#define _IPXE_I2C_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/bitbash.h>
+#include <ipxe/bitbash.h>
/** An I2C device
*
@@ -168,4 +168,4 @@ init_at24c11 ( struct i2c_device *i2cdev ) {
i2cdev->word_addr_len = 0;
}
-#endif /* _GPXE_I2C_H */
+#endif /* _IPXE_I2C_H */
diff --git a/src/include/gpxe/ib_cm.h b/src/include/ipxe/ib_cm.h
index 670fffd..136e494 100644
--- a/src/include/gpxe/ib_cm.h
+++ b/src/include/ipxe/ib_cm.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_CM_H
-#define _GPXE_IB_CM_H
+#ifndef _IPXE_IB_CM_H
+#define _IPXE_IB_CM_H
/** @file
*
@@ -9,8 +9,8 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/infiniband.h>
-#include <gpxe/retry.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/retry.h>
struct ib_mad_transaction;
struct ib_connection;
@@ -69,4 +69,4 @@ extern void ib_destroy_conn ( struct ib_device *ibdev,
struct ib_queue_pair *qp,
struct ib_connection *conn );
-#endif /* _GPXE_IB_CM_H */
+#endif /* _IPXE_IB_CM_H */
diff --git a/src/include/gpxe/ib_cmrc.h b/src/include/ipxe/ib_cmrc.h
index efa741a..c02b15d 100644
--- a/src/include/gpxe/ib_cmrc.h
+++ b/src/include/ipxe/ib_cmrc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_CMRC_H
-#define _GPXE_IB_CMRC_H
+#ifndef _IPXE_IB_CMRC_H
+#define _IPXE_IB_CMRC_H
/** @file
*
@@ -9,12 +9,12 @@
FILE_LICENCE ( BSD2 );
-#include <gpxe/infiniband.h>
-#include <gpxe/xfer.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/xfer.h>
extern int ib_cmrc_open ( struct xfer_interface *xfer,
struct ib_device *ibdev,
struct ib_gid *dgid,
struct ib_gid_half *service_id );
-#endif /* _GPXE_IB_CMRC_H */
+#endif /* _IPXE_IB_CMRC_H */
diff --git a/src/include/gpxe/ib_mad.h b/src/include/ipxe/ib_mad.h
index 8b49718..94f171a 100644
--- a/src/include/gpxe/ib_mad.h
+++ b/src/include/ipxe/ib_mad.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_MAD_H
-#define _GPXE_IB_MAD_H
+#ifndef _IPXE_IB_MAD_H
+#define _IPXE_IB_MAD_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/ib_packet.h>
+#include <ipxe/ib_packet.h>
/*****************************************************************************
*
@@ -558,4 +558,4 @@ union ib_mad {
uint8_t bytes[256];
} __attribute__ (( packed ));
-#endif /* _GPXE_IB_MAD_H */
+#endif /* _IPXE_IB_MAD_H */
diff --git a/src/include/gpxe/ib_mcast.h b/src/include/ipxe/ib_mcast.h
index 74eccd0..86d5709 100644
--- a/src/include/gpxe/ib_mcast.h
+++ b/src/include/ipxe/ib_mcast.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_MCAST_H
-#define _GPXE_IB_MCAST_H
+#ifndef _IPXE_IB_MCAST_H
+#define _IPXE_IB_MCAST_H
/** @file
*
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/infiniband.h>
+#include <ipxe/infiniband.h>
struct ib_mad_transaction;
@@ -45,4 +45,4 @@ extern int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp,
extern void ib_mcast_leave ( struct ib_device *ibdev, struct ib_queue_pair *qp,
struct ib_mc_membership *membership );
-#endif /* _GPXE_IB_MCAST_H */
+#endif /* _IPXE_IB_MCAST_H */
diff --git a/src/include/gpxe/ib_mi.h b/src/include/ipxe/ib_mi.h
index b1cf686..5c5415b 100644
--- a/src/include/gpxe/ib_mi.h
+++ b/src/include/ipxe/ib_mi.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_MI_H
-#define _GPXE_IB_MI_H
+#ifndef _IPXE_IB_MI_H
+#define _IPXE_IB_MI_H
/** @file
*
@@ -9,10 +9,10 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/list.h>
-#include <gpxe/retry.h>
-#include <gpxe/tables.h>
-#include <gpxe/infiniband.h>
+#include <ipxe/list.h>
+#include <ipxe/retry.h>
+#include <ipxe/tables.h>
+#include <ipxe/infiniband.h>
struct ib_mad_interface;
struct ib_mad_transaction;
@@ -132,4 +132,4 @@ extern struct ib_mad_interface * ib_create_mi ( struct ib_device *ibdev,
extern void ib_destroy_mi ( struct ib_device *ibdev,
struct ib_mad_interface *mi );
-#endif /* _GPXE_IB_MI_H */
+#endif /* _IPXE_IB_MI_H */
diff --git a/src/include/gpxe/ib_packet.h b/src/include/ipxe/ib_packet.h
index d468859..0904295 100644
--- a/src/include/gpxe/ib_packet.h
+++ b/src/include/ipxe/ib_packet.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_PACKET_H
-#define _GPXE_IB_PACKET_H
+#ifndef _IPXE_IB_PACKET_H
+#define _IPXE_IB_PACKET_H
/** @file
*
@@ -144,4 +144,4 @@ extern int ib_pull ( struct ib_device *ibdev, struct io_buffer *iobuf,
struct ib_queue_pair **qp, size_t *payload_len,
struct ib_address_vector *av );
-#endif /* _GPXE_IB_PACKET_H */
+#endif /* _IPXE_IB_PACKET_H */
diff --git a/src/include/gpxe/ib_pathrec.h b/src/include/ipxe/ib_pathrec.h
index 5884d53..1fe67f8 100644
--- a/src/include/gpxe/ib_pathrec.h
+++ b/src/include/ipxe/ib_pathrec.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_PATHREC_H
-#define _GPXE_IB_PATHREC_H
+#ifndef _IPXE_IB_PATHREC_H
+#define _IPXE_IB_PATHREC_H
/** @file
*
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/infiniband.h>
+#include <ipxe/infiniband.h>
struct ib_mad_transaction;
struct ib_path;
@@ -73,4 +73,4 @@ extern void ib_destroy_path ( struct ib_device *ibdev,
extern int ib_resolve_path ( struct ib_device *ibdev,
struct ib_address_vector *av );
-#endif /* _GPXE_IB_PATHREC_H */
+#endif /* _IPXE_IB_PATHREC_H */
diff --git a/src/include/gpxe/ib_sma.h b/src/include/ipxe/ib_sma.h
index 78fc672..fa355c6 100644
--- a/src/include/gpxe/ib_sma.h
+++ b/src/include/ipxe/ib_sma.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_SMA_H
-#define _GPXE_IB_SMA_H
+#ifndef _IPXE_IB_SMA_H
+#define _IPXE_IB_SMA_H
/** @file
*
@@ -17,4 +17,4 @@ extern int ib_create_sma ( struct ib_device *ibdev,
extern void ib_destroy_sma ( struct ib_device *ibdev,
struct ib_mad_interface *mi );
-#endif /* _GPXE_IB_SMA_H */
+#endif /* _IPXE_IB_SMA_H */
diff --git a/src/include/gpxe/ib_smc.h b/src/include/ipxe/ib_smc.h
index fdd1c9c..d16a37f 100644
--- a/src/include/gpxe/ib_smc.h
+++ b/src/include/ipxe/ib_smc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_SMC_H
-#define _GPXE_IB_SMC_H
+#ifndef _IPXE_IB_SMC_H
+#define _IPXE_IB_SMC_H
/** @file
*
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/infiniband.h>
+#include <ipxe/infiniband.h>
typedef int ( * ib_local_mad_t ) ( struct ib_device *ibdev,
union ib_mad *mad );
@@ -17,4 +17,4 @@ typedef int ( * ib_local_mad_t ) ( struct ib_device *ibdev,
extern int ib_smc_update ( struct ib_device *ibdev,
ib_local_mad_t local_mad );
-#endif /* _GPXE_IB_SMC_H */
+#endif /* _IPXE_IB_SMC_H */
diff --git a/src/include/gpxe/ib_srp.h b/src/include/ipxe/ib_srp.h
index cf705b3..b773f96 100644
--- a/src/include/gpxe/ib_srp.h
+++ b/src/include/ipxe/ib_srp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_SRP_H
-#define _GPXE_IB_SRP_H
+#ifndef _IPXE_IB_SRP_H
+#define _IPXE_IB_SRP_H
/** @file
*
@@ -10,8 +10,8 @@
FILE_LICENCE ( BSD2 );
#include <stdint.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/srp.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/srp.h>
/** SRP initiator port identifier for Infiniband */
struct ib_srp_initiator_port_id {
@@ -76,4 +76,4 @@ ib_srp_params ( struct srp_device *srp ) {
extern struct srp_transport_type ib_srp_transport;
-#endif /* _GPXE_IB_SRP_H */
+#endif /* _IPXE_IB_SRP_H */
diff --git a/src/include/gpxe/icmp.h b/src/include/ipxe/icmp.h
index bb8fce8..e402ce4 100644
--- a/src/include/gpxe/icmp.h
+++ b/src/include/ipxe/icmp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ICMP_H
-#define _GPXE_ICMP_H
+#ifndef _IPXE_ICMP_H
+#define _IPXE_ICMP_H
/** @file
*
@@ -22,4 +22,4 @@ struct icmp_header {
#define ICMP_ECHO_RESPONSE 0
#define ICMP_ECHO_REQUEST 8
-#endif /* _GPXE_ICMP_H */
+#endif /* _IPXE_ICMP_H */
diff --git a/src/include/gpxe/icmp6.h b/src/include/ipxe/icmp6.h
index e8fd1eb..d2ab3bc 100644
--- a/src/include/gpxe/icmp6.h
+++ b/src/include/ipxe/icmp6.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ICMP6_H
-#define _GPXE_ICMP6_H
+#ifndef _IPXE_ICMP6_H
+#define _IPXE_ICMP6_H
/** @file
*
@@ -9,8 +9,8 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/ip6.h>
-#include <gpxe/ndp.h>
+#include <ipxe/ip6.h>
+#include <ipxe/ndp.h>
#define ICMP6_NSOLICIT 135
#define ICMP6_NADVERT 136
@@ -56,4 +56,4 @@ struct neighbour_advert {
int icmp6_send_solicit ( struct net_device *netdev, struct in6_addr *src, struct in6_addr *dest );
-#endif /* _GPXE_ICMP6_H */
+#endif /* _IPXE_ICMP6_H */
diff --git a/src/include/gpxe/ieee80211.h b/src/include/ipxe/ieee80211.h
index e5b10c3..8f4aa96 100644
--- a/src/include/gpxe/ieee80211.h
+++ b/src/include/ipxe/ieee80211.h
@@ -1,12 +1,12 @@
-#ifndef _GPXE_IEEE80211_H
-#define _GPXE_IEEE80211_H
+#ifndef _IPXE_IEEE80211_H
+#define _IPXE_IEEE80211_H
-#include <gpxe/if_ether.h> /* for ETH_ALEN */
+#include <ipxe/if_ether.h> /* for ETH_ALEN */
#include <endian.h>
/** @file
* Constants and data structures defined in IEEE 802.11, subsetted
- * according to what gPXE knows how to use.
+ * according to what iPXE knows how to use.
*/
FILE_LICENCE(GPL2_OR_LATER);
@@ -199,7 +199,7 @@ FILE_LICENCE(GPL2_OR_LATER);
/** Subtype value for action management frames
*
* Action frames are used to implement spectrum management and QoS
- * features that gPXE currently does not support.
+ * features that iPXE currently does not support.
*/
#define IEEE80211_STYPE_ACTION 0x00D0
@@ -436,7 +436,7 @@ struct ieee80211_cts_or_ack
* @defgroup ieee80211_status 802.11 status codes
*
* These are returned to indicate an immediate denial of
- * authentication or association. In gPXE, the lower 5 bits of the
+ * authentication or association. In iPXE, the lower 5 bits of the
* status code are encoded into the file-unique portion of an error
* code, the ERRFILE portion is always @c ERRFILE_net80211, and the
* POSIX error code is @c ECONNREFUSED for status 0-31 or @c
@@ -496,7 +496,7 @@ struct ieee80211_cts_or_ack
*
* These are returned to indicate the reason for a deauthentication or
* disassociation sent (usually) after authentication or association
- * had succeeded. In gPXE, the lower 5 bits of the reason code are
+ * had succeeded. In iPXE, the lower 5 bits of the reason code are
* encoded into the file-unique portion of an error code, the ERRFILE
* portion is always @c ERRFILE_net80211, and the POSIX error code is
* @c ECONNRESET for reason 0-31 or @c ENETRESET for reason 32-63.
@@ -554,7 +554,7 @@ struct ieee80211_cts_or_ack
* parts it doesn't understand. Each IE contains a two-byte header,
* one byte ID and one byte length, followed by IE-specific data. The
* length does not include the two-byte header. Information elements
- * are required to be sorted by ID, but gPXE does not require that in
+ * are required to be sorted by ID, but iPXE does not require that in
* those it receives.
*
* This group also includes a few inline functions to simplify common
@@ -901,7 +901,7 @@ static inline size_t ieee80211_rsn_size ( int npair, int nauth, int npmkid,
/** 802.11 RSN IE capabilities: Node has conflict between TKIP and WEP
*
- * This is a legacy issue; APs always set it to 0, and gPXE sets it to
+ * This is a legacy issue; APs always set it to 0, and iPXE sets it to
* 0.
*/
#define IEEE80211_RSN_CAPAB_NO_PAIRWISE 0x002
diff --git a/src/include/gpxe/if_arp.h b/src/include/ipxe/if_arp.h
index 932bb3b..fd36e9c 100644
--- a/src/include/gpxe/if_arp.h
+++ b/src/include/ipxe/if_arp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IF_ARP_H
-#define _GPXE_IF_ARP_H
+#ifndef _IPXE_IF_ARP_H
+#define _IPXE_IF_ARP_H
/** @file
*
@@ -99,4 +99,4 @@ static inline void * arp_target_pa ( struct arphdr *arphdr ) {
return ( arp_target_ha ( arphdr ) + arphdr->ar_hln );
}
-#endif /* _GPXE_IF_ARP_H */
+#endif /* _IPXE_IF_ARP_H */
diff --git a/src/include/gpxe/if_ether.h b/src/include/ipxe/if_ether.h
index b96bee0..a526241 100644
--- a/src/include/gpxe/if_ether.h
+++ b/src/include/ipxe/if_ether.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IF_ETHER_H
-#define _GPXE_IF_ETHER_H
+#ifndef _IPXE_IF_ETHER_H
+#define _IPXE_IF_ETHER_H
FILE_LICENCE ( GPL2_OR_LATER );
@@ -33,4 +33,4 @@ struct ethhdr {
uint16_t h_protocol;
} __attribute__ ((packed));
-#endif /* _GPXE_IF_ETHER_H */
+#endif /* _IPXE_IF_ETHER_H */
diff --git a/src/include/gpxe/image.h b/src/include/ipxe/image.h
index 10db8af..abe4a61 100644
--- a/src/include/gpxe/image.h
+++ b/src/include/ipxe/image.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IMAGE_H
-#define _GPXE_IMAGE_H
+#ifndef _IPXE_IMAGE_H
+#define _IPXE_IMAGE_H
/**
* @file
@@ -10,10 +10,10 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/tables.h>
-#include <gpxe/list.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/tables.h>
+#include <ipxe/list.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/refcnt.h>
struct uri;
struct image_type;
@@ -191,4 +191,4 @@ static inline int image_set_name ( struct image *image, const char *name ) {
return 0;
}
-#endif /* _GPXE_IMAGE_H */
+#endif /* _IPXE_IMAGE_H */
diff --git a/src/include/gpxe/in.h b/src/include/ipxe/in.h
index c313717..20f1ce2 100644
--- a/src/include/gpxe/in.h
+++ b/src/include/ipxe/in.h
@@ -1,10 +1,10 @@
-#ifndef _GPXE_IN_H
-#define _GPXE_IN_H
+#ifndef _IPXE_IN_H
+#define _IPXE_IN_H
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/socket.h>
+#include <ipxe/socket.h>
/* Protocol numbers */
@@ -101,4 +101,4 @@ extern char * inet6_ntoa ( struct in_addr in );
*/
-#endif /* _GPXE_IN_H */
+#endif /* _IPXE_IN_H */
diff --git a/src/include/gpxe/infiniband.h b/src/include/ipxe/infiniband.h
index d90b1c1..f2eb57c 100644
--- a/src/include/gpxe/infiniband.h
+++ b/src/include/ipxe/infiniband.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_INFINIBAND_H
-#define _GPXE_INFINIBAND_H
+#ifndef _IPXE_INFINIBAND_H
+#define _IPXE_INFINIBAND_H
/** @file
*
@@ -10,10 +10,10 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/device.h>
-#include <gpxe/ib_packet.h>
-#include <gpxe/ib_mad.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/device.h>
+#include <ipxe/ib_packet.h>
+#include <ipxe/ib_mad.h>
/** Subnet management interface QPN */
#define IB_QPN_SMI 0
@@ -656,4 +656,4 @@ ib_get_ownerdata ( struct ib_device *ibdev ) {
return ibdev->owner_priv;
}
-#endif /* _GPXE_INFINIBAND_H */
+#endif /* _IPXE_INFINIBAND_H */
diff --git a/src/include/gpxe/init.h b/src/include/ipxe/init.h
index a72cba7..10ff869 100644
--- a/src/include/gpxe/init.h
+++ b/src/include/ipxe/init.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_INIT_H
-#define _GPXE_INIT_H
+#ifndef _IPXE_INIT_H
+#define _IPXE_INIT_H
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
/**
* An initialisation function
@@ -34,7 +34,7 @@ struct init_fn {
/** Shutdown flags */
enum shutdown_flags {
- /** Shutdown is in order to exit (return to gPXE's caller) */
+ /** Shutdown is in order to exit (return to iPXE's caller) */
SHUTDOWN_EXIT = 0x0001,
/** Shutdown is in order to boot an OS */
SHUTDOWN_BOOT = 0x0002,
@@ -78,4 +78,4 @@ extern void initialise ( void );
extern void startup ( void );
extern void shutdown ( int flags );
-#endif /* _GPXE_INIT_H */
+#endif /* _IPXE_INIT_H */
diff --git a/src/include/gpxe/interface.h b/src/include/ipxe/interface.h
index 114ebf3..4104105 100644
--- a/src/include/gpxe/interface.h
+++ b/src/include/ipxe/interface.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_INTERFACE_H
-#define _GPXE_INTERFACE_H
+#ifndef _IPXE_INTERFACE_H
+#define _IPXE_INTERFACE_H
/** @file
*
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/refcnt.h>
+#include <ipxe/refcnt.h>
/** An object communication interface */
struct interface {
@@ -55,4 +55,4 @@ intf_put ( struct interface *intf ) {
extern void plug ( struct interface *intf, struct interface *dest );
extern void plug_plug ( struct interface *a, struct interface *b );
-#endif /* _GPXE_INTERFACE_H */
+#endif /* _IPXE_INTERFACE_H */
diff --git a/src/include/gpxe/io.h b/src/include/ipxe/io.h
index 919823d..5bfd899 100644
--- a/src/include/gpxe/io.h
+++ b/src/include/ipxe/io.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_IO_H
-#define _GPXE_IO_H
+#ifndef _IPXE_IO_H
+#define _IPXE_IO_H
/** @file
*
- * gPXE I/O API
+ * iPXE I/O API
*
* The I/O API provides methods for reading from and writing to
* memory-mapped and I/O-mapped devices.
@@ -19,9 +19,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/api.h>
+#include <ipxe/api.h>
#include <config/ioapi.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
/**
* Calculate static inline I/O API function name
@@ -53,7 +53,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
PROVIDE_SINGLE_API_INLINE ( IOAPI_PREFIX_ ## _subsys, _api_func )
/* Include all architecture-independent I/O API headers */
-#include <gpxe/efi/efi_io.h>
+#include <ipxe/efi/efi_io.h>
/* Include all architecture-dependent I/O API headers */
#include <bits/io.h>
@@ -503,4 +503,4 @@ void mb ( void );
#define rmb() mb()
#define wmb() mb()
-#endif /* _GPXE_IO_H */
+#endif /* _IPXE_IO_H */
diff --git a/src/include/gpxe/iobuf.h b/src/include/ipxe/iobuf.h
index 8f05f9e..82c8b88 100644
--- a/src/include/gpxe/iobuf.h
+++ b/src/include/ipxe/iobuf.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IOBUF_H
-#define _GPXE_IOBUF_H
+#ifndef _IPXE_IOBUF_H
+#define _IPXE_IOBUF_H
/** @file
*
@@ -11,7 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
#include <assert.h>
-#include <gpxe/list.h>
+#include <ipxe/list.h>
/**
* I/O buffer alignment
@@ -226,4 +226,4 @@ extern void free_iob ( struct io_buffer *iobuf );
extern void iob_pad ( struct io_buffer *iobuf, size_t min_len );
extern int iob_ensure_headroom ( struct io_buffer *iobuf, size_t len );
-#endif /* _GPXE_IOBUF_H */
+#endif /* _IPXE_IOBUF_H */
diff --git a/src/include/gpxe/ip.h b/src/include/ipxe/ip.h
index 4342a0c..e3445aa 100644
--- a/src/include/gpxe/ip.h
+++ b/src/include/ipxe/ip.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IP_H
-#define _GPXE_IP_H
+#ifndef _IPXE_IP_H
+#define _IPXE_IP_H
/** @file
*
@@ -10,9 +10,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/in.h>
-#include <gpxe/list.h>
-#include <gpxe/retry.h>
+#include <ipxe/in.h>
+#include <ipxe/list.h>
+#include <ipxe/retry.h>
struct io_buffer;
struct net_device;
@@ -94,4 +94,4 @@ extern struct list_head ipv4_miniroutes;
extern struct net_protocol ipv4_protocol;
-#endif /* _GPXE_IP_H */
+#endif /* _IPXE_IP_H */
diff --git a/src/include/gpxe/ip6.h b/src/include/ipxe/ip6.h
index edb2863..70c2fad 100644
--- a/src/include/gpxe/ip6.h
+++ b/src/include/ipxe/ip6.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IP6_H
-#define _GPXE_IP6_H
+#ifndef _IPXE_IP6_H
+#define _IPXE_IP6_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/in.h>
+#include <ipxe/in.h>
/* IP6 constants */
@@ -77,4 +77,4 @@ extern int add_ipv6_address ( struct net_device *netdev,
struct in6_addr gateway );
extern void del_ipv6_address ( struct net_device *netdev );
-#endif /* _GPXE_IP6_H */
+#endif /* _IPXE_IP6_H */
diff --git a/src/include/gpxe/ipoib.h b/src/include/ipxe/ipoib.h
index 1d02f79..31b0c1b 100644
--- a/src/include/gpxe/ipoib.h
+++ b/src/include/ipxe/ipoib.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IPOIB_H
-#define _GPXE_IPOIB_H
+#ifndef _IPXE_IPOIB_H
+#define _IPXE_IPOIB_H
/** @file
*
@@ -8,7 +8,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/infiniband.h>
+#include <ipxe/infiniband.h>
/** IPoIB MAC address length */
#define IPOIB_ALEN 20
@@ -58,4 +58,4 @@ extern int ipoib_probe ( struct ib_device *ibdev );
extern void ipoib_remove ( struct ib_device *ibdev );
extern struct net_device * alloc_ipoibdev ( size_t priv_size );
-#endif /* _GPXE_IPOIB_H */
+#endif /* _IPXE_IPOIB_H */
diff --git a/src/include/gpxe/isa.h b/src/include/ipxe/isa.h
index 63027a5..6d8f761 100644
--- a/src/include/gpxe/isa.h
+++ b/src/include/ipxe/isa.h
@@ -4,9 +4,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/isa_ids.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
+#include <ipxe/isa_ids.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
/** An ISA device */
struct isa_device {
diff --git a/src/include/gpxe/isa_ids.h b/src/include/ipxe/isa_ids.h
index 1faf114..1faf114 100644
--- a/src/include/gpxe/isa_ids.h
+++ b/src/include/ipxe/isa_ids.h
diff --git a/src/include/gpxe/isapnp.h b/src/include/ipxe/isapnp.h
index b58a87e..f2b0b34 100644
--- a/src/include/gpxe/isapnp.h
+++ b/src/include/ipxe/isapnp.h
@@ -39,9 +39,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define ISAPNP_H
#include <stdint.h>
-#include <gpxe/isa_ids.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
+#include <ipxe/isa_ids.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
/*
* ISAPnP constants
diff --git a/src/include/gpxe/iscsi.h b/src/include/ipxe/iscsi.h
index 00717d2..c5e7251 100644
--- a/src/include/gpxe/iscsi.h
+++ b/src/include/ipxe/iscsi.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ISCSI_H
-#define _GPXE_ISCSI_H
+#ifndef _IPXE_ISCSI_H
+#define _IPXE_ISCSI_H
/** @file
*
@@ -10,12 +10,12 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/socket.h>
-#include <gpxe/scsi.h>
-#include <gpxe/chap.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/xfer.h>
-#include <gpxe/process.h>
+#include <ipxe/socket.h>
+#include <ipxe/scsi.h>
+#include <ipxe/chap.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/xfer.h>
+#include <ipxe/process.h>
/** Default iSCSI port */
#define ISCSI_PORT 3260
@@ -675,4 +675,4 @@ extern int iscsi_attach ( struct scsi_device *scsi, const char *root_path );
extern void iscsi_detach ( struct scsi_device *scsi );
extern const char * iscsi_initiator_iqn ( void );
-#endif /* _GPXE_ISCSI_H */
+#endif /* _IPXE_ISCSI_H */
diff --git a/src/include/gpxe/job.h b/src/include/ipxe/job.h
index f1bcada..893a790 100644
--- a/src/include/gpxe/job.h
+++ b/src/include/ipxe/job.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_JOB_H
-#define _GPXE_JOB_H
+#ifndef _IPXE_JOB_H
+#define _IPXE_JOB_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stddef.h>
-#include <gpxe/interface.h>
+#include <ipxe/interface.h>
/** Job progress */
struct job_progress {
@@ -166,4 +166,4 @@ static inline void job_nullify ( struct job_interface *job ) {
job->op = &null_job_ops;
};
-#endif /* _GPXE_JOB_H */
+#endif /* _IPXE_JOB_H */
diff --git a/src/include/gpxe/keys.h b/src/include/ipxe/keys.h
index 25bc9bc..dba65ec 100644
--- a/src/include/gpxe/keys.h
+++ b/src/include/ipxe/keys.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_KEYS_H
-#define _GPXE_KEYS_H
+#ifndef _IPXE_KEYS_H
+#define _IPXE_KEYS_H
/** @file
*
@@ -78,4 +78,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define KEY_BACKSPACE BACKSPACE
#define KEY_ENTER LF
-#endif /* _GPXE_KEYS_H */
+#endif /* _IPXE_KEYS_H */
diff --git a/src/include/gpxe/linebuf.h b/src/include/ipxe/linebuf.h
index cfa2147..706ef25 100644
--- a/src/include/gpxe/linebuf.h
+++ b/src/include/ipxe/linebuf.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_LINEBUF_H
-#define _GPXE_LINEBUF_H
+#ifndef _IPXE_LINEBUF_H
+#define _IPXE_LINEBUF_H
/** @file
*
@@ -27,4 +27,4 @@ extern ssize_t line_buffer ( struct line_buffer *linebuf,
const char *data, size_t len );
extern void empty_line_buffer ( struct line_buffer *linebuf );
-#endif /* _GPXE_LINEBUF_H */
+#endif /* _IPXE_LINEBUF_H */
diff --git a/src/include/gpxe/linux_compat.h b/src/include/ipxe/linux_compat.h
index 577512e..6f6ed97 100644
--- a/src/include/gpxe/linux_compat.h
+++ b/src/include/ipxe/linux_compat.h
@@ -1,12 +1,12 @@
-#ifndef _GPXE_LINUX_COMPAT_H
-#define _GPXE_LINUX_COMPAT_H
+#ifndef _IPXE_LINUX_COMPAT_H
+#define _IPXE_LINUX_COMPAT_H
/** @file
*
* Linux code compatibility
*
* This file exists to ease the building of Linux source code within
- * gPXE. This is intended to facilitate quick testing; it is not
+ * iPXE. This is intended to facilitate quick testing; it is not
* intended to be a substitute for proper porting.
*/
@@ -16,7 +16,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <errno.h>
#include <stdio.h>
#include <byteswap.h>
-#include <gpxe/bitops.h>
+#include <ipxe/bitops.h>
#define __init
#define __exit
@@ -24,4 +24,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define __exitdata
#define printk printf
-#endif /* _GPXE_LINUX_COMPAT_H */
+#endif /* _IPXE_LINUX_COMPAT_H */
diff --git a/src/include/gpxe/list.h b/src/include/ipxe/list.h
index 22ba201..743a3e2 100644
--- a/src/include/gpxe/list.h
+++ b/src/include/ipxe/list.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_LIST_H
-#define _GPXE_LIST_H
+#ifndef _IPXE_LIST_H
+#define _IPXE_LIST_H
/** @file
*
@@ -177,4 +177,4 @@ static inline int list_empty ( const struct list_head *head ) {
pos = tmp, \
tmp = list_entry ( tmp->member.next, typeof ( *tmp ), member ) )
-#endif /* _GPXE_LIST_H */
+#endif /* _IPXE_LIST_H */
diff --git a/src/include/gpxe/login_ui.h b/src/include/ipxe/login_ui.h
index 4196f7b..01e5479 100644
--- a/src/include/gpxe/login_ui.h
+++ b/src/include/ipxe/login_ui.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_LOGIN_UI_H
-#define _GPXE_LOGIN_UI_H
+#ifndef _IPXE_LOGIN_UI_H
+#define _IPXE_LOGIN_UI_H
/** @file
*
@@ -11,4 +11,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
extern int login_ui ( void );
-#endif /* _GPXE_LOGIN_UI_H */
+#endif /* _IPXE_LOGIN_UI_H */
diff --git a/src/include/gpxe/malloc.h b/src/include/ipxe/malloc.h
index c02a866..a1b656c 100644
--- a/src/include/gpxe/malloc.h
+++ b/src/include/ipxe/malloc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_MALLOC_H
-#define _GPXE_MALLOC_H
+#ifndef _IPXE_MALLOC_H
+#define _IPXE_MALLOC_H
#include <stdint.h>
@@ -13,7 +13,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
/*
* Prototypes for the standard functions (malloc() et al) are in
- * stdlib.h. Include <gpxe/malloc.h> only if you need the
+ * stdlib.h. Include <ipxe/malloc.h> only if you need the
* non-standard functions, such as malloc_dma().
*
*/
@@ -56,4 +56,4 @@ static inline void free_dma ( void *ptr, size_t size ) {
free_memblock ( ptr, size );
}
-#endif /* _GPXE_MALLOC_H */
+#endif /* _IPXE_MALLOC_H */
diff --git a/src/include/gpxe/mca.h b/src/include/ipxe/mca.h
index da9d73e..79543c1 100644
--- a/src/include/gpxe/mca.h
+++ b/src/include/ipxe/mca.h
@@ -10,9 +10,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
#ifndef MCA_H
#define MCA_H
-#include <gpxe/isa_ids.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
+#include <ipxe/isa_ids.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
/*
* MCA constants
diff --git a/src/include/gpxe/md5.h b/src/include/ipxe/md5.h
index 03d65c1..c3dfeb7 100644
--- a/src/include/gpxe/md5.h
+++ b/src/include/ipxe/md5.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_MD5_H
-#define _GPXE_MD5_H
+#ifndef _IPXE_MD5_H
+#define _IPXE_MD5_H
FILE_LICENCE ( GPL2_OR_LATER );
@@ -21,4 +21,4 @@ struct md5_ctx {
extern struct digest_algorithm md5_algorithm;
-#endif /* _GPXE_MD5_H */
+#endif /* _IPXE_MD5_H */
diff --git a/src/include/gpxe/memmap.h b/src/include/ipxe/memmap.h
index dc5bec3..cfd3fe9 100644
--- a/src/include/gpxe/memmap.h
+++ b/src/include/ipxe/memmap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_MEMMAP_H
-#define _GPXE_MEMMAP_H
+#ifndef _IPXE_MEMMAP_H
+#define _IPXE_MEMMAP_H
#include <stdint.h>
@@ -33,4 +33,4 @@ struct memory_map {
extern void get_memmap ( struct memory_map *memmap );
-#endif /* _GPXE_MEMMAP_H */
+#endif /* _IPXE_MEMMAP_H */
diff --git a/src/include/gpxe/monojob.h b/src/include/ipxe/monojob.h
index 35ff4fd..b2f3dfd 100644
--- a/src/include/gpxe/monojob.h
+++ b/src/include/ipxe/monojob.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_MONOJOB_H
-#define _GPXE_MONOJOB_H
+#ifndef _IPXE_MONOJOB_H
+#define _IPXE_MONOJOB_H
/** @file
*
@@ -14,4 +14,4 @@ struct job_interface;
extern struct job_interface monojob;
extern int monojob_wait ( const char *string );
-#endif /* _GPXE_MONOJOB_H */
+#endif /* _IPXE_MONOJOB_H */
diff --git a/src/include/gpxe/nap.h b/src/include/ipxe/nap.h
index 6c2e40c..90bd958 100644
--- a/src/include/gpxe/nap.h
+++ b/src/include/ipxe/nap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_NAP_H
-#define _GPXE_NAP_H
+#ifndef _IPXE_NAP_H
+#define _IPXE_NAP_H
/** @file
*
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/api.h>
+#include <ipxe/api.h>
#include <config/nap.h>
/**
@@ -42,7 +42,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
PROVIDE_SINGLE_API_INLINE ( NAP_PREFIX_ ## _subsys, _api_func )
/* Include all architecture-independent I/O API headers */
-#include <gpxe/null_nap.h>
+#include <ipxe/null_nap.h>
/* Include all architecture-dependent I/O API headers */
#include <bits/nap.h>
@@ -53,4 +53,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
*/
void cpu_nap ( void );
-#endif /* _GPXE_NAP_H */
+#endif /* _IPXE_NAP_H */
diff --git a/src/include/gpxe/ndp.h b/src/include/ipxe/ndp.h
index db32b0c..42bb2fe 100644
--- a/src/include/gpxe/ndp.h
+++ b/src/include/ipxe/ndp.h
@@ -1,12 +1,12 @@
#include <stdint.h>
#include <byteswap.h>
#include <string.h>
-#include <gpxe/icmp6.h>
-#include <gpxe/ip6.h>
-#include <gpxe/in.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/tcpip.h>
+#include <ipxe/icmp6.h>
+#include <ipxe/ip6.h>
+#include <ipxe/in.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/tcpip.h>
#define NDP_STATE_INVALID 0
#define NDP_STATE_INCOMPLETE 1
diff --git a/src/include/gpxe/net80211.h b/src/include/ipxe/net80211.h
index 027e091..d70eb7c 100644
--- a/src/include/gpxe/net80211.h
+++ b/src/include/ipxe/net80211.h
@@ -1,15 +1,15 @@
-#ifndef _GPXE_NET80211_H
-#define _GPXE_NET80211_H
+#ifndef _IPXE_NET80211_H
+#define _IPXE_NET80211_H
-#include <gpxe/process.h>
-#include <gpxe/ieee80211.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/rc80211.h>
+#include <ipxe/process.h>
+#include <ipxe/ieee80211.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/rc80211.h>
/** @file
*
- * The gPXE 802.11 MAC layer.
+ * The iPXE 802.11 MAC layer.
*/
/*
@@ -156,7 +156,7 @@ enum net80211_crypto_alg {
* There exists one known attack on TKIP, that allows one to
* send between 7 and 15 arbitrary short data packets on a
* QoS-enabled network given about an hour of data
- * gathering. Since gPXE does not support QoS for 802.11
+ * gathering. Since iPXE does not support QoS for 802.11
* networks, this is not a threat to us. The only other method
* is a brute-force passphrase attack.
*/
@@ -680,7 +680,7 @@ struct net80211_handshaker
/** Interface to an 802.11 cryptosystem
*
* Cryptosystems define a net80211_crypto structure statically, using
- * a gPXE linker table to make it available to the 802.11 layer. When
+ * a iPXE linker table to make it available to the 802.11 layer. When
* the cryptosystem needs to be used, the 802.11 code will allocate a
* copy of the static definition plus whatever space the algorithm has
* requested for private state, and point net80211_device::crypto or
@@ -902,7 +902,7 @@ struct net80211_device
* defined) explaining why it canceled an association after it
* had originally OK'ed it. Status and reason codes serve
* similar functions, but they use separate error message
- * tables. A gPXE-formatted return status code (negative) is
+ * tables. A iPXE-formatted return status code (negative) is
* placed in @c assoc_rc.
*
* If the failure to associate is indicated by a status code,
@@ -1058,7 +1058,7 @@ struct net80211_wlan
/** The human-readable ESSID (network name)
*
* Although the 802.11 SSID field is generally not
- * NUL-terminated, the gPXE code adds an extra NUL (and
+ * NUL-terminated, the iPXE code adds an extra NUL (and
* expects one in this structure) for convenience.
*/
char essid[IEEE80211_MAX_SSID_LEN+1];
diff --git a/src/include/gpxe/netdevice.h b/src/include/ipxe/netdevice.h
index 97bf168..f829327 100644
--- a/src/include/gpxe/netdevice.h
+++ b/src/include/ipxe/netdevice.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_NETDEVICE_H
-#define _GPXE_NETDEVICE_H
+#ifndef _IPXE_NETDEVICE_H
+#define _IPXE_NETDEVICE_H
/** @file
*
@@ -10,10 +10,10 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/list.h>
-#include <gpxe/tables.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/settings.h>
+#include <ipxe/list.h>
+#include <ipxe/tables.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/settings.h>
struct io_buffer;
struct net_device;
@@ -554,4 +554,4 @@ static inline void netdev_tx_complete_next ( struct net_device *netdev ) {
netdev_tx_complete_next_err ( netdev, 0 );
}
-#endif /* _GPXE_NETDEVICE_H */
+#endif /* _IPXE_NETDEVICE_H */
diff --git a/src/include/gpxe/null_nap.h b/src/include/ipxe/null_nap.h
index 0f46eaa..0c0704b 100644
--- a/src/include/gpxe/null_nap.h
+++ b/src/include/ipxe/null_nap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_NULL_NAP_H
-#define _GPXE_NULL_NAP_H
+#ifndef _IPXE_NULL_NAP_H
+#define _IPXE_NULL_NAP_H
/** @file
*
@@ -20,4 +20,4 @@ NAP_INLINE ( null, cpu_nap ) ( void ) {
/* Do nothing */
}
-#endif /* _GPXE_NULL_NAP_H */
+#endif /* _IPXE_NULL_NAP_H */
diff --git a/src/include/gpxe/nvo.h b/src/include/ipxe/nvo.h
index c965070..0a0222b 100644
--- a/src/include/gpxe/nvo.h
+++ b/src/include/ipxe/nvo.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_NVO_H
-#define _GPXE_NVO_H
+#ifndef _IPXE_NVO_H
+#define _IPXE_NVO_H
/** @file
*
@@ -10,8 +10,8 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/dhcpopts.h>
-#include <gpxe/settings.h>
+#include <ipxe/dhcpopts.h>
+#include <ipxe/settings.h>
struct nvs_device;
struct refcnt;
@@ -52,4 +52,4 @@ extern void nvo_init ( struct nvo_block *nvo, struct nvs_device *nvs,
extern int register_nvo ( struct nvo_block *nvo, struct settings *parent );
extern void unregister_nvo ( struct nvo_block *nvo );
-#endif /* _GPXE_NVO_H */
+#endif /* _IPXE_NVO_H */
diff --git a/src/include/gpxe/nvs.h b/src/include/ipxe/nvs.h
index 5c90c65..4733123 100644
--- a/src/include/gpxe/nvs.h
+++ b/src/include/ipxe/nvs.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_NVS_H
-#define _GPXE_NVS_H
+#ifndef _IPXE_NVS_H
+#define _IPXE_NVS_H
/** @file
*
@@ -65,4 +65,4 @@ extern int nvs_read ( struct nvs_device *nvs, unsigned int address,
extern int nvs_write ( struct nvs_device *nvs, unsigned int address,
const void *data, size_t len );
-#endif /* _GPXE_NVS_H */
+#endif /* _IPXE_NVS_H */
diff --git a/src/include/gpxe/open.h b/src/include/ipxe/open.h
index ebf754d..04e37e0 100644
--- a/src/include/gpxe/open.h
+++ b/src/include/ipxe/open.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_OPEN_H
-#define _GPXE_OPEN_H
+#ifndef _IPXE_OPEN_H
+#define _IPXE_OPEN_H
/** @file
*
@@ -10,8 +10,8 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdarg.h>
-#include <gpxe/tables.h>
-#include <gpxe/socket.h>
+#include <ipxe/tables.h>
+#include <ipxe/socket.h>
struct xfer_interface;
struct uri;
@@ -102,4 +102,4 @@ extern int xfer_open ( struct xfer_interface *xfer, int type, ... );
extern int xfer_vreopen ( struct xfer_interface *xfer, int type,
va_list args );
-#endif /* _GPXE_OPEN_H */
+#endif /* _IPXE_OPEN_H */
diff --git a/src/include/gpxe/pci.h b/src/include/ipxe/pci.h
index 8bcf1e0..60ac8bf 100644
--- a/src/include/gpxe/pci.h
+++ b/src/include/ipxe/pci.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PCI_H
-#define _GPXE_PCI_H
+#ifndef _IPXE_PCI_H
+#define _IPXE_PCI_H
/*
* Support for NE2000 PCI clones added David Monro June 1997
@@ -19,9 +19,9 @@
FILE_LICENCE ( GPL2_ONLY );
#include <stdint.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
-#include <gpxe/pci_io.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
+#include <ipxe/pci_io.h>
#include "pci_ids.h"
/*
@@ -399,4 +399,4 @@ static inline void * pci_get_drvdata ( struct pci_device *pci ) {
return pci->priv;
}
-#endif /* _GPXE_PCI_H */
+#endif /* _IPXE_PCI_H */
diff --git a/src/include/gpxe/pci_ids.h b/src/include/ipxe/pci_ids.h
index 4207013..25c7782 100644
--- a/src/include/gpxe/pci_ids.h
+++ b/src/include/ipxe/pci_ids.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PCI_IDS_H
-#define _GPXE_PCI_IDS_H
+#ifndef _IPXE_PCI_IDS_H
+#define _IPXE_PCI_IDS_H
/*
* PCI Class, Vendor and Device IDs
@@ -348,4 +348,4 @@ FILE_LICENCE ( GPL2_ONLY );
#define PCI_VENDOR_ID_TIGERJET 0xe159
#define PCI_VENDOR_ID_ARK 0xedd8
-#endif /* _GPXE_PCI_IDS_H */
+#endif /* _IPXE_PCI_IDS_H */
diff --git a/src/include/gpxe/pci_io.h b/src/include/ipxe/pci_io.h
index 8b2729a..1188090 100644
--- a/src/include/gpxe/pci_io.h
+++ b/src/include/ipxe/pci_io.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PCI_IO_H
-#define _GPXE_PCI_IO_H
+#ifndef _IPXE_PCI_IO_H
+#define _IPXE_PCI_IO_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/api.h>
+#include <ipxe/api.h>
#include <config/ioapi.h>
/**
@@ -43,7 +43,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
PROVIDE_SINGLE_API_INLINE ( PCIAPI_PREFIX_ ## _subsys, _api_func )
/* Include all architecture-independent I/O API headers */
-#include <gpxe/efi/efi_pci.h>
+#include <ipxe/efi/efi_pci.h>
/* Include all architecture-dependent I/O API headers */
#include <bits/pci_io.h>
@@ -121,4 +121,4 @@ int pci_write_config_word ( struct pci_device *pci, unsigned int where,
int pci_write_config_dword ( struct pci_device *pci, unsigned int where,
uint32_t value );
-#endif /* _GPXE_PCI_IO_H */
+#endif /* _IPXE_PCI_IO_H */
diff --git a/src/include/gpxe/pcibackup.h b/src/include/ipxe/pcibackup.h
index 3d295c0..b9f55cf 100644
--- a/src/include/gpxe/pcibackup.h
+++ b/src/include/ipxe/pcibackup.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PCIBACKUP_H
-#define _GPXE_PCIBACKUP_H
+#ifndef _IPXE_PCIBACKUP_H
+#define _IPXE_PCIBACKUP_H
/** @file
*
@@ -30,4 +30,4 @@ extern void pci_restore ( struct pci_device *pci,
struct pci_config_backup *backup,
const uint8_t *exclude );
-#endif /* _GPXE_PCIBACKUP_H */
+#endif /* _IPXE_PCIBACKUP_H */
diff --git a/src/include/gpxe/posix_io.h b/src/include/ipxe/posix_io.h
index 3063dff..11f3bb5 100644
--- a/src/include/gpxe/posix_io.h
+++ b/src/include/ipxe/posix_io.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_POSIX_IO_H
-#define _GPXE_POSIX_IO_H
+#ifndef _IPXE_POSIX_IO_H
+#define _IPXE_POSIX_IO_H
/** @file
*
@@ -10,7 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
/** Minimum file descriptor that will ever be allocated */
#define POSIX_FD_MIN ( 1 )
@@ -84,4 +84,4 @@ static inline ssize_t read ( int fd, void *buf, size_t len ) {
return read_user ( fd, virt_to_user ( buf ), 0, len );
}
-#endif /* _GPXE_POSIX_IO_H */
+#endif /* _IPXE_POSIX_IO_H */
diff --git a/src/include/gpxe/process.h b/src/include/ipxe/process.h
index 944858d..7cd5b91 100644
--- a/src/include/gpxe/process.h
+++ b/src/include/ipxe/process.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PROCESS_H
-#define _GPXE_PROCESS_H
+#ifndef _IPXE_PROCESS_H
+#define _IPXE_PROCESS_H
/** @file
*
@@ -9,9 +9,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/list.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/tables.h>
+#include <ipxe/list.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/tables.h>
/** A process */
struct process {
@@ -77,4 +77,4 @@ process_init ( struct process *process,
*/
#define __permanent_process __table_entry ( PERMANENT_PROCESSES, 01 )
-#endif /* _GPXE_PROCESS_H */
+#endif /* _IPXE_PROCESS_H */
diff --git a/src/include/gpxe/profile.h b/src/include/ipxe/profile.h
index a5bdd3a..60dd53a 100644
--- a/src/include/gpxe/profile.h
+++ b/src/include/ipxe/profile.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PROFILE_H
-#define _GPXE_PROFILE_H
+#ifndef _IPXE_PROFILE_H
+#define _IPXE_PROFILE_H
/** @file
*
@@ -77,4 +77,4 @@ simple_profile ( void ) {
return profile ( &simple_profiler );
}
-#endif /* _GPXE_PROFILE_H */
+#endif /* _IPXE_PROFILE_H */
diff --git a/src/include/gpxe/ramdisk.h b/src/include/ipxe/ramdisk.h
index 31a1d99..012ac73 100644
--- a/src/include/gpxe/ramdisk.h
+++ b/src/include/ipxe/ramdisk.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RAMDISK_H
-#define _GPXE_RAMDISK_H
+#ifndef _IPXE_RAMDISK_H
+#define _IPXE_RAMDISK_H
/**
* @file
@@ -10,8 +10,8 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/uaccess.h>
-#include <gpxe/blockdev.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/blockdev.h>
struct ramdisk {
struct block_device blockdev;
@@ -21,4 +21,4 @@ struct ramdisk {
extern int init_ramdisk ( struct ramdisk *ramdisk, userptr_t data, size_t len,
unsigned int blksize );
-#endif /* _GPXE_RAMDISK_H */
+#endif /* _IPXE_RAMDISK_H */
diff --git a/src/include/gpxe/rarp.h b/src/include/ipxe/rarp.h
index 7ade831..7edbe21 100644
--- a/src/include/gpxe/rarp.h
+++ b/src/include/ipxe/rarp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RARP_H
-#define _GPXE_RARP_H
+#ifndef _IPXE_RARP_H
+#define _IPXE_RARP_H
/** @file
*
@@ -13,4 +13,4 @@ struct net_protocol;
extern struct net_protocol rarp_protocol;
-#endif /* _GPXE_RARP_H */
+#endif /* _IPXE_RARP_H */
diff --git a/src/include/gpxe/rc80211.h b/src/include/ipxe/rc80211.h
index 0856896..eac6bc9 100644
--- a/src/include/gpxe/rc80211.h
+++ b/src/include/ipxe/rc80211.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RC80211_H
-#define _GPXE_RC80211_H
+#ifndef _IPXE_RC80211_H
+#define _IPXE_RC80211_H
/** @file
*
@@ -16,4 +16,4 @@ void rc80211_update_tx ( struct net80211_device *dev, int retries, int rc );
void rc80211_update_rx ( struct net80211_device *dev, int retry, u16 rate );
void rc80211_free ( struct rc80211_ctx *ctx );
-#endif /* _GPXE_RC80211_H */
+#endif /* _IPXE_RC80211_H */
diff --git a/src/include/gpxe/refcnt.h b/src/include/ipxe/refcnt.h
index e56f1d3..4b02322 100644
--- a/src/include/gpxe/refcnt.h
+++ b/src/include/ipxe/refcnt.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_REFCNT_H
-#define _GPXE_REFCNT_H
+#ifndef _IPXE_REFCNT_H
+#define _IPXE_REFCNT_H
/** @file
*
@@ -43,4 +43,4 @@ struct refcnt {
extern struct refcnt * ref_get ( struct refcnt *refcnt );
extern void ref_put ( struct refcnt *refcnt );
-#endif /* _GPXE_REFCNT_H */
+#endif /* _IPXE_REFCNT_H */
diff --git a/src/include/gpxe/resolv.h b/src/include/ipxe/resolv.h
index 33bb098..c7d6199 100644
--- a/src/include/gpxe/resolv.h
+++ b/src/include/ipxe/resolv.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RESOLV_H
-#define _GPXE_RESOLV_H
+#ifndef _IPXE_RESOLV_H
+#define _IPXE_RESOLV_H
/** @file
*
@@ -9,10 +9,10 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/refcnt.h>
-#include <gpxe/interface.h>
-#include <gpxe/tables.h>
-#include <gpxe/socket.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/interface.h>
+#include <ipxe/tables.h>
+#include <ipxe/socket.h>
struct resolv_interface;
@@ -167,4 +167,4 @@ extern struct resolv_interface null_resolv;
extern int resolv ( struct resolv_interface *resolv, const char *name,
struct sockaddr *sa );
-#endif /* _GPXE_RESOLV_H */
+#endif /* _IPXE_RESOLV_H */
diff --git a/src/include/gpxe/retry.h b/src/include/ipxe/retry.h
index ada0204..370a599 100644
--- a/src/include/gpxe/retry.h
+++ b/src/include/ipxe/retry.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RETRY_H
-#define _GPXE_RETRY_H
+#ifndef _IPXE_RETRY_H
+#define _IPXE_RETRY_H
/** @file
*
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/list.h>
+#include <ipxe/list.h>
/** Default timeout value */
#define DEFAULT_MIN_TIMEOUT ( TICKS_PER_SEC / 4 )
@@ -78,4 +78,4 @@ timer_running ( struct retry_timer *timer ) {
return ( timer->running );
}
-#endif /* _GPXE_RETRY_H */
+#endif /* _IPXE_RETRY_H */
diff --git a/src/include/gpxe/rotate.h b/src/include/ipxe/rotate.h
index 0371c57..745d84e 100644
--- a/src/include/gpxe/rotate.h
+++ b/src/include/ipxe/rotate.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ROTATE_H
-#define _GPXE_ROTATE_H
+#ifndef _IPXE_ROTATE_H
+#define _IPXE_ROTATE_H
/** @file
*
@@ -26,4 +26,4 @@ static inline uint64_t ror64 ( uint64_t data, unsigned int rotation ) {
return ( ( data >> rotation ) | ( data << ( 64 - rotation ) ) );
}
-#endif /* _GPXE_ROTATE_H */
+#endif /* _IPXE_ROTATE_H */
diff --git a/src/include/gpxe/rsa.h b/src/include/ipxe/rsa.h
index 5052ad4..a080f9f 100644
--- a/src/include/gpxe/rsa.h
+++ b/src/include/ipxe/rsa.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RSA_H
-#define _GPXE_RSA_H
+#ifndef _IPXE_RSA_H
+#define _IPXE_RSA_H
FILE_LICENCE ( GPL2_OR_LATER );
@@ -9,4 +9,4 @@ extern struct pubkey_algorithm rsa_algorithm;
#include "crypto/axtls/crypto.h"
-#endif /* _GPXE_RSA_H */
+#endif /* _IPXE_RSA_H */
diff --git a/src/include/gpxe/sanboot.h b/src/include/ipxe/sanboot.h
index fd06316..d27452c 100644
--- a/src/include/gpxe/sanboot.h
+++ b/src/include/ipxe/sanboot.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_SANBOOT_H
-#define _GPXE_SANBOOT_H
+#ifndef _IPXE_SANBOOT_H
+#define _IPXE_SANBOOT_H
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
struct sanboot_protocol {
const char *prefix;
@@ -17,4 +17,4 @@ struct sanboot_protocol {
extern int keep_san ( void );
-#endif /* _GPXE_SANBOOT_H */
+#endif /* _IPXE_SANBOOT_H */
diff --git a/src/include/gpxe/scsi.h b/src/include/ipxe/scsi.h
index 9741697..b56ab75 100644
--- a/src/include/gpxe/scsi.h
+++ b/src/include/ipxe/scsi.h
@@ -1,10 +1,10 @@
-#ifndef _GPXE_SCSI_H
-#define _GPXE_SCSI_H
+#ifndef _IPXE_SCSI_H
+#define _IPXE_SCSI_H
#include <stdint.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/refcnt.h>
/** @file
*
@@ -278,4 +278,4 @@ extern int scsi_detached_command ( struct scsi_device *scsi,
extern int init_scsidev ( struct scsi_device *scsi );
extern int scsi_parse_lun ( const char *lun_string, struct scsi_lun *lun );
-#endif /* _GPXE_SCSI_H */
+#endif /* _IPXE_SCSI_H */
diff --git a/src/include/gpxe/sec80211.h b/src/include/ipxe/sec80211.h
index 502ebf7..5ac96de 100644
--- a/src/include/gpxe/sec80211.h
+++ b/src/include/ipxe/sec80211.h
@@ -16,12 +16,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef _GPXE_SEC80211_H
-#define _GPXE_SEC80211_H
+#ifndef _IPXE_SEC80211_H
+#define _IPXE_SEC80211_H
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/net80211.h>
+#include <ipxe/net80211.h>
#include <errno.h>
/** @file
@@ -79,5 +79,5 @@ u32 sec80211_rsn_get_akm_desc ( enum net80211_security_proto secprot,
int rsnie );
enum net80211_crypto_alg sec80211_rsn_get_net80211_crypt ( u32 desc );
-#endif /* _GPXE_SEC80211_H */
+#endif /* _IPXE_SEC80211_H */
diff --git a/src/include/gpxe/segment.h b/src/include/ipxe/segment.h
index 5b59c54..37bed0e 100644
--- a/src/include/gpxe/segment.h
+++ b/src/include/ipxe/segment.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SEGMENT_H
-#define _GPXE_SEGMENT_H
+#ifndef _IPXE_SEGMENT_H
+#define _IPXE_SEGMENT_H
/**
* @file
@@ -10,8 +10,8 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
extern int prep_segment ( userptr_t segment, size_t filesz, size_t memsz );
-#endif /* _GPXE_SEGMENT_H */
+#endif /* _IPXE_SEGMENT_H */
diff --git a/src/include/gpxe/serial.h b/src/include/ipxe/serial.h
index a72ca7e..c16e56a 100644
--- a/src/include/gpxe/serial.h
+++ b/src/include/ipxe/serial.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SERIAL_H
-#define _GPXE_SERIAL_H
+#ifndef _IPXE_SERIAL_H
+#define _IPXE_SERIAL_H
/** @file
*
@@ -13,4 +13,4 @@ extern void serial_putc ( int ch );
extern int serial_getc ( void );
extern int serial_ischar ( void );
-#endif /* _GPXE_SERIAL_H */
+#endif /* _IPXE_SERIAL_H */
diff --git a/src/include/gpxe/settings.h b/src/include/ipxe/settings.h
index efefe73..1be1cf2 100644
--- a/src/include/gpxe/settings.h
+++ b/src/include/ipxe/settings.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SETTINGS_H
-#define _GPXE_SETTINGS_H
+#ifndef _IPXE_SETTINGS_H
+#define _IPXE_SETTINGS_H
/** @file
*
@@ -10,9 +10,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/tables.h>
-#include <gpxe/list.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/tables.h>
+#include <ipxe/list.h>
+#include <ipxe/refcnt.h>
struct settings;
struct in_addr;
@@ -332,4 +332,4 @@ static inline int setting_exists ( struct settings *settings,
return ( fetch_setting_len ( settings, setting ) >= 0 );
}
-#endif /* _GPXE_SETTINGS_H */
+#endif /* _IPXE_SETTINGS_H */
diff --git a/src/include/gpxe/settings_ui.h b/src/include/ipxe/settings_ui.h
index a82d733..5f7be30 100644
--- a/src/include/gpxe/settings_ui.h
+++ b/src/include/ipxe/settings_ui.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SETTINGS_UI_H
-#define _GPXE_SETTINGS_UI_H
+#ifndef _IPXE_SETTINGS_UI_H
+#define _IPXE_SETTINGS_UI_H
/** @file
*
@@ -13,4 +13,4 @@ struct settings;
extern int settings_ui ( struct settings *settings ) __nonnull;
-#endif /* _GPXE_SETTINGS_UI_H */
+#endif /* _IPXE_SETTINGS_UI_H */
diff --git a/src/include/gpxe/sha1.h b/src/include/ipxe/sha1.h
index c203d99..9b6f551 100644
--- a/src/include/gpxe/sha1.h
+++ b/src/include/ipxe/sha1.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SHA1_H
-#define _GPXE_SHA1_H
+#ifndef _IPXE_SHA1_H
+#define _IPXE_SHA1_H
FILE_LICENCE ( GPL2_OR_LATER );
@@ -21,4 +21,4 @@ void pbkdf2_sha1 ( const void *passphrase, size_t pass_len,
const void *salt, size_t salt_len,
int iterations, void *key, size_t key_len );
-#endif /* _GPXE_SHA1_H */
+#endif /* _IPXE_SHA1_H */
diff --git a/src/include/gpxe/shell.h b/src/include/ipxe/shell.h
index a65a344..635de24 100644
--- a/src/include/gpxe/shell.h
+++ b/src/include/ipxe/shell.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SHELL_H
-#define _GPXE_SHELL_H
+#ifndef _IPXE_SHELL_H
+#define _IPXE_SHELL_H
/** @file
*
@@ -11,4 +11,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
extern void shell ( void );
-#endif /* _GPXE_SHELL_H */
+#endif /* _IPXE_SHELL_H */
diff --git a/src/include/gpxe/shell_banner.h b/src/include/ipxe/shell_banner.h
index 28482be..d03fcba 100644
--- a/src/include/gpxe/shell_banner.h
+++ b/src/include/ipxe/shell_banner.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SHELL_BANNER_H
-#define _GPXE_SHELL_BANNER_H
+#ifndef _IPXE_SHELL_BANNER_H
+#define _IPXE_SHELL_BANNER_H
/** @file
*
@@ -11,4 +11,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
extern int shell_banner ( void );
-#endif /* _GPXE_SHELL_BANNER_H */
+#endif /* _IPXE_SHELL_BANNER_H */
diff --git a/src/include/gpxe/smbios.h b/src/include/ipxe/smbios.h
index 4df25c3..dc34bbe 100644
--- a/src/include/gpxe/smbios.h
+++ b/src/include/ipxe/smbios.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SMBIOS_H
-#define _GPXE_SMBIOS_H
+#ifndef _IPXE_SMBIOS_H
+#define _IPXE_SMBIOS_H
/** @file
*
@@ -10,9 +10,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/api.h>
+#include <ipxe/api.h>
#include <config/general.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
/**
* Provide an SMBIOS API implementation
@@ -25,7 +25,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
PROVIDE_SINGLE_API ( SMBIOS_PREFIX_ ## _subsys, _api_func, _func )
/* Include all architecture-independent SMBIOS API headers */
-#include <gpxe/efi/efi_smbios.h>
+#include <ipxe/efi/efi_smbios.h>
/* Include all architecture-dependent SMBIOS API headers */
#include <bits/smbios.h>
@@ -158,4 +158,4 @@ extern int read_smbios_string ( struct smbios_structure *structure,
unsigned int index,
void *data, size_t len );
-#endif /* _GPXE_SMBIOS_H */
+#endif /* _IPXE_SMBIOS_H */
diff --git a/src/include/gpxe/socket.h b/src/include/ipxe/socket.h
index 9ea0db9..ea2972a 100644
--- a/src/include/gpxe/socket.h
+++ b/src/include/ipxe/socket.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SOCKET_H
-#define _GPXE_SOCKET_H
+#ifndef _IPXE_SOCKET_H
+#define _IPXE_SOCKET_H
/** @file
*
@@ -98,4 +98,4 @@ struct sockaddr {
char pad[ SA_LEN - sizeof ( sa_family_t ) ];
} __attribute__ (( may_alias ));
-#endif /* _GPXE_SOCKET_H */
+#endif /* _IPXE_SOCKET_H */
diff --git a/src/include/gpxe/spi.h b/src/include/ipxe/spi.h
index 8e4a676..d92d1ae 100644
--- a/src/include/gpxe/spi.h
+++ b/src/include/ipxe/spi.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SPI_H
-#define _GPXE_SPI_H
+#ifndef _IPXE_SPI_H
+#define _IPXE_SPI_H
/** @file
*
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/nvs.h>
+#include <ipxe/nvs.h>
/**
* @defgroup spicmds SPI commands
@@ -255,4 +255,4 @@ init_mc25xx640 ( struct spi_device *device ) {
/** @} */
-#endif /* _GPXE_SPI_H */
+#endif /* _IPXE_SPI_H */
diff --git a/src/include/gpxe/spi_bit.h b/src/include/ipxe/spi_bit.h
index 8bd2519..9cfa7b8 100644
--- a/src/include/gpxe/spi_bit.h
+++ b/src/include/ipxe/spi_bit.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SPI_BIT_H
-#define _GPXE_SPI_BIT_H
+#ifndef _IPXE_SPI_BIT_H
+#define _IPXE_SPI_BIT_H
/** @file
*
@@ -9,8 +9,8 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/spi.h>
-#include <gpxe/bitbash.h>
+#include <ipxe/spi.h>
+#include <ipxe/bitbash.h>
/** A bit-bashing SPI bus */
struct spi_bit_basher {
@@ -60,4 +60,4 @@ enum {
extern void init_spi_bit_basher ( struct spi_bit_basher *spibit );
-#endif /* _GPXE_SPI_BIT_H */
+#endif /* _IPXE_SPI_BIT_H */
diff --git a/src/include/gpxe/srp.h b/src/include/ipxe/srp.h
index 85f39b9..7c0ff4c 100644
--- a/src/include/gpxe/srp.h
+++ b/src/include/ipxe/srp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SRP_H
-#define _GPXE_SRP_H
+#ifndef _IPXE_SRP_H
+#define _IPXE_SRP_H
/** @file
*
@@ -11,9 +11,9 @@ FILE_LICENCE ( BSD2 );
#include <stdint.h>
#include <byteswap.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/xfer.h>
-#include <gpxe/scsi.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/xfer.h>
+#include <ipxe/scsi.h>
/*****************************************************************************
*
@@ -865,4 +865,4 @@ enum srp_state {
extern int srp_attach ( struct scsi_device *scsi, const char *root_path );
extern void srp_detach ( struct scsi_device *scsi );
-#endif /* _GPXE_SRP_H */
+#endif /* _IPXE_SRP_H */
diff --git a/src/include/gpxe/tables.h b/src/include/ipxe/tables.h
index 7dfced8..130486c 100644
--- a/src/include/gpxe/tables.h
+++ b/src/include/ipxe/tables.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_TABLES_H
-#define _GPXE_TABLES_H
+#ifndef _IPXE_TABLES_H
+#define _IPXE_TABLES_H
FILE_LICENCE ( GPL2_OR_LATER );
@@ -431,4 +431,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
#endif /* __ICC */
-#endif /* _GPXE_TABLES_H */
+#endif /* _IPXE_TABLES_H */
diff --git a/src/include/gpxe/tcp.h b/src/include/ipxe/tcp.h
index 7ae7eab..f834cc3 100644
--- a/src/include/gpxe/tcp.h
+++ b/src/include/ipxe/tcp.h
@@ -1,17 +1,17 @@
-#ifndef _GPXE_TCP_H
-#define _GPXE_TCP_H
+#ifndef _IPXE_TCP_H
+#define _IPXE_TCP_H
/** @file
*
* TCP protocol
*
- * This file defines the gPXE TCP API.
+ * This file defines the iPXE TCP API.
*
*/
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/tcpip.h>
+#include <ipxe/tcpip.h>
/**
* A TCP header
@@ -315,4 +315,4 @@ struct tcp_options {
extern struct tcpip_protocol tcp_protocol;
-#endif /* _GPXE_TCP_H */
+#endif /* _IPXE_TCP_H */
diff --git a/src/include/gpxe/tcpip.h b/src/include/ipxe/tcpip.h
index f71d7d6..cdf554e 100644
--- a/src/include/gpxe/tcpip.h
+++ b/src/include/ipxe/tcpip.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_TCPIP_H
-#define _GPXE_TCPIP_H
+#ifndef _IPXE_TCPIP_H
+#define _IPXE_TCPIP_H
/** @file
*
@@ -10,9 +10,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/socket.h>
-#include <gpxe/in.h>
-#include <gpxe/tables.h>
+#include <ipxe/socket.h>
+#include <ipxe/in.h>
+#include <ipxe/tables.h>
struct io_buffer;
struct net_device;
@@ -125,4 +125,4 @@ extern uint16_t tcpip_continue_chksum ( uint16_t partial,
const void *data, size_t len );
extern uint16_t tcpip_chksum ( const void *data, size_t len );
-#endif /* _GPXE_TCPIP_H */
+#endif /* _IPXE_TCPIP_H */
diff --git a/src/include/gpxe/tftp.h b/src/include/ipxe/tftp.h
index c57bb25..38be0d4 100644
--- a/src/include/gpxe/tftp.h
+++ b/src/include/ipxe/tftp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_TFTP_H
-#define _GPXE_TFTP_H
+#ifndef _IPXE_TFTP_H
+#define _IPXE_TFTP_H
/** @file
*
@@ -82,4 +82,4 @@ union tftp_any {
extern void tftp_set_request_blksize ( unsigned int blksize );
-#endif /* _GPXE_TFTP_H */
+#endif /* _IPXE_TFTP_H */
diff --git a/src/include/gpxe/threewire.h b/src/include/ipxe/threewire.h
index e23284a..135ef56 100644
--- a/src/include/gpxe/threewire.h
+++ b/src/include/ipxe/threewire.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_THREEWIRE_H
-#define _GPXE_THREEWIRE_H
+#ifndef _IPXE_THREEWIRE_H
+#define _IPXE_THREEWIRE_H
/** @file
*
@@ -12,7 +12,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/spi.h>
+#include <ipxe/spi.h>
#include <limits.h>
/**
@@ -102,4 +102,4 @@ init_at93c66 ( struct spi_device *device, unsigned int organisation ) {
/** @} */
-#endif /* _GPXE_THREEWIRE_H */
+#endif /* _IPXE_THREEWIRE_H */
diff --git a/src/include/gpxe/timer.h b/src/include/ipxe/timer.h
index 86722dc..d59122f 100644
--- a/src/include/gpxe/timer.h
+++ b/src/include/ipxe/timer.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_TIMER_H
-#define _GPXE_TIMER_H
+#ifndef _IPXE_TIMER_H
+#define _IPXE_TIMER_H
/** @file
*
- * gPXE timer API
+ * iPXE timer API
*
* The timer API provides udelay() for fixed delays, and currticks()
* for a monotonically increasing tick counter.
@@ -11,7 +11,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/api.h>
+#include <ipxe/api.h>
#include <config/timer.h>
/**
@@ -44,7 +44,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
PROVIDE_SINGLE_API_INLINE ( TIMER_PREFIX_ ## _subsys, _api_func )
/* Include all architecture-independent I/O API headers */
-#include <gpxe/efi/efi_timer.h>
+#include <ipxe/efi/efi_timer.h>
/* Include all architecture-dependent I/O API headers */
#include <bits/timer.h>
@@ -73,4 +73,4 @@ unsigned long ticks_per_sec ( void );
/** Number of ticks per second */
#define TICKS_PER_SEC ( ticks_per_sec() )
-#endif /* _GPXE_TIMER_H */
+#endif /* _IPXE_TIMER_H */
diff --git a/src/include/gpxe/tls.h b/src/include/ipxe/tls.h
index e2da046..2cc36dd 100644
--- a/src/include/gpxe/tls.h
+++ b/src/include/ipxe/tls.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_TLS_H
-#define _GPXE_TLS_H
+#ifndef _IPXE_TLS_H
+#define _IPXE_TLS_H
/**
* @file
@@ -10,13 +10,13 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/filter.h>
-#include <gpxe/process.h>
-#include <gpxe/crypto.h>
-#include <gpxe/md5.h>
-#include <gpxe/sha1.h>
-#include <gpxe/x509.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/filter.h>
+#include <ipxe/process.h>
+#include <ipxe/crypto.h>
+#include <ipxe/md5.h>
+#include <ipxe/sha1.h>
+#include <ipxe/x509.h>
/** A TLS header */
struct tls_header {
@@ -184,4 +184,4 @@ struct tls_session {
extern int add_tls ( struct xfer_interface *xfer,
struct xfer_interface **next );
-#endif /* _GPXE_TLS_H */
+#endif /* _IPXE_TLS_H */
diff --git a/src/include/gpxe/uaccess.h b/src/include/ipxe/uaccess.h
index 5a8f292..7d4ab9c 100644
--- a/src/include/gpxe/uaccess.h
+++ b/src/include/ipxe/uaccess.h
@@ -1,12 +1,12 @@
-#ifndef _GPXE_UACCESS_H
-#define _GPXE_UACCESS_H
+#ifndef _IPXE_UACCESS_H
+#define _IPXE_UACCESS_H
/**
* @file
*
* Access to external ("user") memory
*
- * gPXE often needs to transfer data between internal and external
+ * iPXE often needs to transfer data between internal and external
* buffers. On i386, the external buffers may require access via a
* different segment, and the buffer address cannot be encoded into a
* simple void * pointer. The @c userptr_t type encapsulates the
@@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
#include <string.h>
-#include <gpxe/api.h>
+#include <ipxe/api.h>
#include <config/ioapi.h>
/**
@@ -188,7 +188,7 @@ trivial_memchr_user ( userptr_t buffer, off_t offset, int c, size_t len ) {
PROVIDE_SINGLE_API_INLINE ( UACCESS_PREFIX_ ## _subsys, _api_func )
/* Include all architecture-independent user access API headers */
-#include <gpxe/efi/efi_uaccess.h>
+#include <ipxe/efi/efi_uaccess.h>
/* Include all architecture-dependent user access API headers */
#include <bits/uaccess.h>
@@ -341,4 +341,4 @@ size_t strlen_user ( userptr_t userptr, off_t offset );
*/
off_t memchr_user ( userptr_t userptr, off_t offset, int c, size_t len );
-#endif /* _GPXE_UACCESS_H */
+#endif /* _IPXE_UACCESS_H */
diff --git a/src/include/gpxe/udp.h b/src/include/ipxe/udp.h
index 670c5e5..5e55c5e 100644
--- a/src/include/gpxe/udp.h
+++ b/src/include/ipxe/udp.h
@@ -1,20 +1,20 @@
-#ifndef _GPXE_UDP_H
-#define _GPXE_UDP_H
+#ifndef _IPXE_UDP_H
+#define _IPXE_UDP_H
/** @file
*
* UDP protocol
*
- * This file defines the gPXE UDP API.
+ * This file defines the iPXE UDP API.
*
*/
FILE_LICENCE ( GPL2_OR_LATER );
#include <stddef.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/if_ether.h>
struct xfer_interface;
@@ -44,5 +44,5 @@ extern int udp_open_promisc ( struct xfer_interface *xfer );
extern int udp_open ( struct xfer_interface *xfer, struct sockaddr *peer,
struct sockaddr *local );
-#endif /* _GPXE_UDP_H */
+#endif /* _IPXE_UDP_H */
diff --git a/src/include/gpxe/umalloc.h b/src/include/ipxe/umalloc.h
index b0e5564..4afa0c9 100644
--- a/src/include/gpxe/umalloc.h
+++ b/src/include/ipxe/umalloc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_UMALLOC_H
-#define _GPXE_UMALLOC_H
+#ifndef _IPXE_UMALLOC_H
+#define _IPXE_UMALLOC_H
/**
* @file
@@ -10,9 +10,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/api.h>
+#include <ipxe/api.h>
#include <config/umalloc.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
/**
* Provide a user memory allocation API implementation
@@ -25,7 +25,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
PROVIDE_SINGLE_API ( UMALLOC_PREFIX_ ## _subsys, _api_func, _func )
/* Include all architecture-independent I/O API headers */
-#include <gpxe/efi/efi_umalloc.h>
+#include <ipxe/efi/efi_umalloc.h>
/* Include all architecture-dependent I/O API headers */
#include <bits/umalloc.h>
@@ -65,4 +65,4 @@ static inline __always_inline void ufree ( userptr_t userptr ) {
urealloc ( userptr, 0 );
}
-#endif /* _GPXE_UMALLOC_H */
+#endif /* _IPXE_UMALLOC_H */
diff --git a/src/include/gpxe/uri.h b/src/include/ipxe/uri.h
index 405d0ce..cb0898e 100644
--- a/src/include/gpxe/uri.h
+++ b/src/include/ipxe/uri.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_URI_H
-#define _GPXE_URI_H
+#ifndef _IPXE_URI_H
+#define _IPXE_URI_H
/** @file
*
@@ -11,7 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <stddef.h>
#include <stdlib.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/refcnt.h>
/** A Uniform Resource Identifier
*
@@ -26,9 +26,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
*
* Some examples are probably helpful:
*
- * http://www.etherboot.org/wiki :
+ * http://www.ipxe.org/wiki :
*
- * scheme = "http", host = "www.etherboot.org", path = "/wiki"
+ * scheme = "http", host = "www.ipxe.org", path = "/wiki"
*
* /var/lib/tftpboot :
*
@@ -179,4 +179,4 @@ extern size_t uri_encode ( const char *raw_string, char *buf, ssize_t len,
int field );
extern size_t uri_decode ( const char *encoded_string, char *buf, ssize_t len );
-#endif /* _GPXE_URI_H */
+#endif /* _IPXE_URI_H */
diff --git a/src/include/gpxe/uuid.h b/src/include/ipxe/uuid.h
index 019cd05..2f3c224 100644
--- a/src/include/gpxe/uuid.h
+++ b/src/include/ipxe/uuid.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_UUID_H
-#define _GPXE_UUID_H
+#ifndef _IPXE_UUID_H
+#define _IPXE_UUID_H
/** @file
*
@@ -30,4 +30,4 @@ union uuid {
extern char * uuid_ntoa ( union uuid *uuid );
-#endif /* _GPXE_UUID_H */
+#endif /* _IPXE_UUID_H */
diff --git a/src/include/gpxe/virtio-pci.h b/src/include/ipxe/virtio-pci.h
index f0c17e8..f0c17e8 100644
--- a/src/include/gpxe/virtio-pci.h
+++ b/src/include/ipxe/virtio-pci.h
diff --git a/src/include/gpxe/virtio-ring.h b/src/include/ipxe/virtio-ring.h
index e96dd37..e96dd37 100644
--- a/src/include/gpxe/virtio-ring.h
+++ b/src/include/ipxe/virtio-ring.h
diff --git a/src/include/gpxe/vsprintf.h b/src/include/ipxe/vsprintf.h
index ee860a5..c48c97a 100644
--- a/src/include/gpxe/vsprintf.h
+++ b/src/include/ipxe/vsprintf.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_VSPRINTF_H
-#define _GPXE_VSPRINTF_H
+#ifndef _IPXE_VSPRINTF_H
+#define _IPXE_VSPRINTF_H
/** @file
*
@@ -71,4 +71,4 @@ extern int vssnprintf ( char *buf, ssize_t ssize, const char *fmt,
extern int __attribute__ (( format ( printf, 3, 4 ) ))
ssnprintf ( char *buf, ssize_t ssize, const char *fmt, ... );
-#endif /* _GPXE_VSPRINTF_H */
+#endif /* _IPXE_VSPRINTF_H */
diff --git a/src/include/gpxe/wpa.h b/src/include/ipxe/wpa.h
index a7f19d7..2934228 100644
--- a/src/include/gpxe/wpa.h
+++ b/src/include/ipxe/wpa.h
@@ -16,11 +16,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef _GPXE_WPA_H
-#define _GPXE_WPA_H
+#ifndef _IPXE_WPA_H
+#define _IPXE_WPA_H
-#include <gpxe/ieee80211.h>
-#include <gpxe/list.h>
+#include <ipxe/ieee80211.h>
+#include <ipxe/list.h>
FILE_LICENCE ( GPL2_OR_LATER );
@@ -500,4 +500,4 @@ int wpa_start ( struct net80211_device *dev, struct wpa_common_ctx *ctx,
const void *pmk, size_t pmk_len );
void wpa_stop ( struct net80211_device *dev );
-#endif /* _GPXE_WPA_H */
+#endif /* _IPXE_WPA_H */
diff --git a/src/include/gpxe/x509.h b/src/include/ipxe/x509.h
index 1b9d9aa..37c5a4e 100644
--- a/src/include/gpxe/x509.h
+++ b/src/include/ipxe/x509.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_X509_H
-#define _GPXE_X509_H
+#ifndef _IPXE_X509_H
+#define _IPXE_X509_H
/** @file
*
@@ -38,4 +38,4 @@ x509_free_rsa_public_key ( struct x509_rsa_public_key *rsa_pubkey ) {
extern int x509_rsa_public_key ( const struct asn1_cursor *certificate,
struct x509_rsa_public_key *rsa_pubkey );
-#endif /* _GPXE_X509_H */
+#endif /* _IPXE_X509_H */
diff --git a/src/include/gpxe/xfer.h b/src/include/ipxe/xfer.h
index edd3703..ad41e93 100644
--- a/src/include/gpxe/xfer.h
+++ b/src/include/ipxe/xfer.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_XFER_H
-#define _GPXE_XFER_H
+#ifndef _IPXE_XFER_H
+#define _IPXE_XFER_H
/** @file
*
@@ -11,8 +11,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <stddef.h>
#include <stdarg.h>
-#include <gpxe/interface.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/interface.h>
+#include <ipxe/iobuf.h>
struct xfer_interface;
struct xfer_metadata;
@@ -274,4 +274,4 @@ static inline void xfer_nullify ( struct xfer_interface *xfer ) {
xfer->op = &null_xfer_ops;
};
-#endif /* _GPXE_XFER_H */
+#endif /* _IPXE_XFER_H */
diff --git a/src/include/mii.h b/src/include/mii.h
index 3b735d9..2baff2f 100644
--- a/src/include/mii.h
+++ b/src/include/mii.h
@@ -140,7 +140,7 @@ FILE_LICENCE ( GPL2_ONLY );
#define LPA_1000FULL 0x0800 /* Link partner 1000BASE-T full duplex */
#define LPA_1000HALF 0x0400 /* Link partner 1000BASE-T half duplex */
-#include <gpxe/netdevice.h>
+#include <ipxe/netdevice.h>
struct mii_if_info {
int phy_id;
diff --git a/src/include/nic.h b/src/include/nic.h
index c808972..d5375bd 100644
--- a/src/include/nic.h
+++ b/src/include/nic.h
@@ -14,12 +14,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <string.h>
#include <stdio.h>
#include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/isapnp.h>
-#include <gpxe/isa.h>
-#include <gpxe/eisa.h>
-#include <gpxe/mca.h>
-#include <gpxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/isapnp.h>
+#include <ipxe/isa.h>
+#include <ipxe/eisa.h>
+#include <ipxe/mca.h>
+#include <ipxe/io.h>
typedef enum {
DISABLE = 0,
diff --git a/src/include/unistd.h b/src/include/unistd.h
index ef94694..3a50a25 100644
--- a/src/include/unistd.h
+++ b/src/include/unistd.h
@@ -24,7 +24,7 @@ extern int execv ( const char *command, char * const argv[] );
} )
/* Pick up udelay() */
-#include <gpxe/timer.h>
+#include <ipxe/timer.h>
/*
* sleep() prototype is defined by POSIX.1. usleep() prototype is
diff --git a/src/include/usr/autoboot.h b/src/include/usr/autoboot.h
index a918020..70c1adf 100644
--- a/src/include/usr/autoboot.h
+++ b/src/include/usr/autoboot.h
@@ -9,7 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
-#include <gpxe/in.h>
+#include <ipxe/in.h>
struct net_device;
extern int shutdown_exit_flags;