ソースを参照

[build] Rename gPXE to iPXE

Access to the gpxe.org and etherboot.org domains and associated
resources has been revoked by the registrant of the domain.  Work
around this problem by renaming project from gPXE to iPXE, and
updating URLs to match.

Also update README, LOG and COPYRIGHTS to remove obsolete information.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 14年前
コミット
8406115834
100個のファイルの変更349行の追加417行の削除
  1. 9
    23
      COPYRIGHTS
  2. 0
    12
      LOG
  3. 4
    49
      README
  4. 5
    5
      contrib/errcode/README
  5. 1
    1
      contrib/errcode/build_errcodedb.py
  6. 3
    3
      contrib/errcode/errcode.php
  7. 3
    0
      contrib/errcode/errcodedb.py
  8. バイナリ
      contrib/errcode/errcodedb.pyc
  9. 4
    4
      contrib/errcode/gpxebot.py
  10. 11
    11
      contrib/rom-o-matic/README
  11. 4
    4
      contrib/rom-o-matic/bottom.php
  12. 6
    6
      contrib/rom-o-matic/build.php
  13. 1
    1
      contrib/rom-o-matic/directions.php
  14. 1
    1
      contrib/rom-o-matic/doc/IMAGE_SCRIPT.html
  15. 1
    1
      contrib/rom-o-matic/flag-table.php
  16. 6
    6
      contrib/rom-o-matic/globals.php
  17. 1
    1
      contrib/rom-o-matic/top.php
  18. 9
    9
      contrib/rom-o-matic/utils.php
  19. 5
    5
      src/Makefile
  20. 3
    3
      src/Makefile.housekeeping
  21. 2
    2
      src/arch/i386/core/gdbmach.c
  22. 1
    1
      src/arch/i386/core/pic8259.c
  23. 2
    2
      src/arch/i386/core/rdtsc_timer.c
  24. 2
    2
      src/arch/i386/core/relocate.c
  25. 2
    2
      src/arch/i386/core/timer2.c
  26. 2
    2
      src/arch/i386/core/video_subr.c
  27. 3
    3
      src/arch/i386/core/x86_io.c
  28. 1
    1
      src/arch/i386/drivers/net/undi.c
  29. 1
    1
      src/arch/i386/drivers/net/undiload.c
  30. 5
    5
      src/arch/i386/drivers/net/undinet.c
  31. 2
    2
      src/arch/i386/drivers/net/undionly.c
  32. 1
    1
      src/arch/i386/firmware/pcbios/basemem.c
  33. 1
    1
      src/arch/i386/firmware/pcbios/bios_console.c
  34. 2
    2
      src/arch/i386/firmware/pcbios/gateA20.c
  35. 6
    6
      src/arch/i386/firmware/pcbios/hidemem.c
  36. 1
    1
      src/arch/i386/firmware/pcbios/memmap.c
  37. 2
    2
      src/arch/i386/hci/commands/pxe_cmd.c
  38. 7
    7
      src/arch/i386/image/bzimage.c
  39. 5
    5
      src/arch/i386/image/com32.c
  40. 5
    5
      src/arch/i386/image/comboot.c
  41. 4
    4
      src/arch/i386/image/elfboot.c
  42. 5
    5
      src/arch/i386/image/eltorito.c
  43. 8
    8
      src/arch/i386/image/multiboot.c
  44. 7
    7
      src/arch/i386/image/nbi.c
  45. 6
    6
      src/arch/i386/image/pxe_image.c
  46. 1
    1
      src/arch/i386/include/bits/io.h
  47. 2
    2
      src/arch/i386/include/bits/nap.h
  48. 1
    1
      src/arch/i386/include/bits/smbios.h
  49. 2
    2
      src/arch/i386/include/bits/timer.h
  50. 1
    1
      src/arch/i386/include/bits/umalloc.h
  51. 2
    2
      src/arch/i386/include/bzimage.h
  52. 1
    1
      src/arch/i386/include/comboot.h
  53. 1
    1
      src/arch/i386/include/int13.h
  54. 5
    5
      src/arch/i386/include/ipxe/abft.h
  55. 3
    3
      src/arch/i386/include/ipxe/bios_nap.h
  56. 3
    3
      src/arch/i386/include/ipxe/bios_smbios.h
  57. 4
    4
      src/arch/i386/include/ipxe/bios_timer.h
  58. 8
    8
      src/arch/i386/include/ipxe/ibft.h
  59. 3
    3
      src/arch/i386/include/ipxe/memtop_umalloc.h
  60. 3
    3
      src/arch/i386/include/ipxe/rdtsc_timer.h
  61. 10
    10
      src/arch/i386/include/ipxe/sbft.h
  62. 3
    3
      src/arch/i386/include/ipxe/timer2.h
  63. 4
    4
      src/arch/i386/include/ipxe/x86_io.h
  64. 1
    1
      src/arch/i386/include/pxe.h
  65. 1
    1
      src/arch/i386/include/realmode.h
  66. 1
    1
      src/arch/i386/include/undi.h
  67. 5
    5
      src/arch/i386/interface/pcbios/abft.c
  68. 5
    5
      src/arch/i386/interface/pcbios/aoeboot.c
  69. 1
    1
      src/arch/i386/interface/pcbios/bios_nap.c
  70. 2
    2
      src/arch/i386/interface/pcbios/bios_smbios.c
  71. 1
    1
      src/arch/i386/interface/pcbios/bios_timer.c
  72. 3
    3
      src/arch/i386/interface/pcbios/ib_srpboot.c
  73. 11
    11
      src/arch/i386/interface/pcbios/ibft.c
  74. 3
    3
      src/arch/i386/interface/pcbios/int13.c
  75. 4
    4
      src/arch/i386/interface/pcbios/iscsiboot.c
  76. 4
    4
      src/arch/i386/interface/pcbios/keepsan.c
  77. 4
    4
      src/arch/i386/interface/pcbios/memtop_umalloc.c
  78. 1
    1
      src/arch/i386/interface/pcbios/pcibios.c
  79. 7
    7
      src/arch/i386/interface/pcbios/sbft.c
  80. 2
    2
      src/arch/i386/interface/pxe/pxe_call.c
  81. 1
    1
      src/arch/i386/interface/pxe/pxe_errors.c
  82. 5
    5
      src/arch/i386/interface/pxe/pxe_file.c
  83. 1
    1
      src/arch/i386/interface/pxe/pxe_loader.c
  84. 8
    8
      src/arch/i386/interface/pxe/pxe_preboot.c
  85. 6
    6
      src/arch/i386/interface/pxe/pxe_tftp.c
  86. 4
    4
      src/arch/i386/interface/pxe/pxe_udp.c
  87. 8
    8
      src/arch/i386/interface/pxe/pxe_undi.c
  88. 1
    1
      src/arch/i386/interface/pxeparent/pxeparent.c
  89. 2
    2
      src/arch/i386/interface/pxeparent/pxeparent_dhcp.c
  90. 1
    1
      src/arch/i386/interface/syslinux/com32_call.c
  91. 1
    1
      src/arch/i386/interface/syslinux/com32_wrapper.S
  92. 11
    11
      src/arch/i386/interface/syslinux/comboot_call.c
  93. 4
    4
      src/arch/i386/interface/syslinux/comboot_resolv.c
  94. 2
    2
      src/arch/i386/prefix/dskprefix.S
  95. 3
    3
      src/arch/i386/prefix/hdprefix.S
  96. 4
    4
      src/arch/i386/prefix/lkrnprefix.S
  97. 2
    2
      src/arch/i386/prefix/nbiprefix.S
  98. 5
    5
      src/arch/i386/prefix/pxeprefix.S
  99. 7
    7
      src/arch/i386/prefix/romprefix.S
  100. 0
    0
      src/arch/x86/core/pcidirect.c

+ 9
- 23
COPYRIGHTS ファイルの表示

@@ -1,26 +1,12 @@
1
+In general iPXE files are licensed under the GPL.  For historical
2
+reasons, individual files may contain their own licence declarations.
3
+Most builds of iPXE do not contain all iPXE code (in particular, most
4
+builds will include only one driver), and so the overall licence can
5
+vary depending on what target you are building.
1 6
 
2
-In general gPXE files are licensed under the GPL.  GPLed files are in
3
-general either from Linux or have been explicitly put under GPL by the
4
-authors.  The license for a file is usually documented at the top of
5
-the file.  
7
+The resultant applicable licence(s) for any particular build can be
8
+determined by using "make bin/xxxxxxx.yyy.licence"; for example:
6 9
 
7
-A few files are inherited from FreeBSD netboot and therefore can be
8
-used under BSD or GPL.  Documented in this file are some of the
9
-non-GPL'ed files.  If the internal documentation for a file disagrees
10
-with what is documented in this file, the internal documentation for
11
-the file shall be override this file.
12
-
13
-File					Copyright status
14
-
15
-src/core/misc.c				BSD
16
-src/drivers/net/3c509.c			BSD
17
-src/drivers/net/3c509.h			BSD
18
-src/drivers/net/3c595.c			BSD
19
-src/drivers/net/3c595.h			BSD
20
-src/drivers/net/3c90x.c			Open Source
21
-src/drivers/net/epic100.c		None
22
-src/drivers/net/epic100.h		None
23
-src/drivers/net/ns8390.c		BSD
24
-src/drivers/net/ns8390.h		BSD
25
-src/arch/i386/include/bits/string.h	None
10
+  make bin/rtl8139.rom.licence
26 11
 
12
+to determine the resultant licence(s) for the build bin/rtl8139.rom

+ 0
- 12
LOG ファイルの表示

@@ -1,12 +0,0 @@
1
-gPXE LOG file
2
-
3
-+ Development for gPXE was moved from SourceForge CVS to a git
4
-  repository on git.etherboot.org in the first half of the year 2007.
5
-
6
-+ The gitweb interface for gPXE is available at:
7
-
8
-    http://git.etherboot.org/?p=gpxe.git
9
-
10
-+ The gitweb interface largely obsoletes the LOG file that used to be
11
-  distributed with Etherboot.
12
-

+ 4
- 49
README ファイルの表示

@@ -1,53 +1,8 @@
1
-gPXE README File
1
+iPXE README File
2 2
 
3
-gPXE is an implementation of the PXE specification for network
4
-booting, with extensions to allow additional features such as booting
5
-via HTTP, iSCSI, and AoE.  
6
-
7
-In generally, gPXE is compatible with the industry-standard PXE
8
-specification, and also supports Etherboot .nbi file loading and some
9
-additional protocols and features.
10
-
11
-For more detailed information about gPXE, please visit our project
12
-website at: http://etherboot.org/
13
-
14
-BUILDING gPXE IMAGE FROM SOURCE
15
-
16
-If you don't want to install development tools, and have access to the
17
-Web, you can get gPXE and Etherboot ROM images made on demand from
18
-http://rom-o-matic.net/
19
-
20
-If you would like to compile gPXE images from source, here are some tips.
21
-
22
-We normally compile gPXE images on x86, 32-bit Linux machines. It is
23
-possible to also use x86-64 machines. We use gcc compiler options to
24
-create 32-bit output.
25
-
26
-It is important to have the necessary software  packages installed.  A gcc-based
27
-toolchain is required.
28
-
29
-The following packages (at least) are required:
30
-
31
-  - a gcc tool chain (gcc 3.x or gcc 4.x)
32
-  - binutils
33
-  - perl
34
-  - syslinux
35
-  - mtools
36
-  
37
-To test your environment, cd to the "src" directory and type:
3
+Quick start guide:
38 4
 
5
+   cd src
39 6
    make
40 7
 
41
-You should see a lot of output, and when it stops, the "bin" directory
42
-should be populated with gPXE images and object files.
43
-
44
-To learn more about what to build and how to use gPXE, please visit our
45
-project website at http://etherboot.org/ , particularly the "howto" section.
46
-
47
-CONTACTING US
48
-
49
-Pointers to our project mailing lists are on http://etherboot.org/
50
-
51
-Real-time help is often available on IRC on the #etherboot channel of
52
-irc.freenode.net.
53
-
8
+For any more detailed instructions, see http://ipxe.org

+ 5
- 5
contrib/errcode/README ファイルの表示

@@ -1,6 +1,6 @@
1
-Error Code Lookup for gPXE
1
+Error Code Lookup for iPXE
2 2
 ==========================
3
-This program looks up gPXE error codes so you can locate the line of source
3
+This program looks up iPXE error codes so you can locate the line of source
4 4
 code which produced the error.
5 5
 
6 6
 Setup
@@ -8,11 +8,11 @@ Setup
8 8
 You must run:
9 9
 ./build_errcodedb.py >errcodedb.py
10 10
 
11
-This extracts error code definitions from the gPXE source code and produces a
11
+This extracts error code definitions from the iPXE source code and produces a
12 12
 "database" which is used by the main program.
13 13
 
14 14
 Once you have done this errcode.py and errcodedb.py are the only files you
15
-need.  They are now independent of the gPXE source code and can be moved
15
+need.  They are now independent of the iPXE source code and can be moved
16 16
 anywhere.
17 17
 
18 18
 [OPTIONAL]
@@ -21,7 +21,7 @@ $ERRCODE_PATH to the errcode.py script.  Then move errcode.php to a location
21 21
 visible from your web server.
22 22
 
23 23
 [OPTIONAL]
24
-A simple IRC bot is provided.  Edit gpxebot.py to fill in the IRC details.
24
+A simple IRC bot is provided.  Edit ipxebot.py to fill in the IRC details.
25 25
 
26 26
 Usage
27 27
 -----

+ 1
- 1
contrib/errcode/build_errcodedb.py ファイルの表示

@@ -18,7 +18,7 @@ import sys
18 18
 import re
19 19
 
20 20
 pxenv_status_files = ('../../src/include/errno.h', )
21
-errfile_files = ('../../src/include/gpxe/errfile.h',
21
+errfile_files = ('../../src/include/ipxe/errfile.h',
22 22
             '../../src/arch/i386/include/bits/errfile.h')
23 23
 posix_errno_files = ('../../src/include/errno.h', )
24 24
 

+ 3
- 3
contrib/errcode/errcode.php ファイルの表示

@@ -23,7 +23,7 @@ $ERRCODE_PATH = './errcode.py';
23 23
 
24 24
 <html>
25 25
     <head>
26
-        <title>gPXE Error Code Lookup</title>
26
+        <title>iPXE Error Code Lookup</title>
27 27
         <style>
28 28
             body, pre, div, form, p, h2, b, tt {
29 29
                 padding: 0;
@@ -73,10 +73,10 @@ if (!empty($_REQUEST['e']) && preg_match('/^(0x)?[0-9a-f]{8}$/', $_REQUEST['e'])
73 73
             <p>
74 74
             Firefox users can right-click on the <b>Error code</b>
75 75
             text box and select <b>Add a Keyword for this Search...</b>.
76
-            Set <b>name</b> to <tt>gPXE Error Code Lookup</tt> and
76
+            Set <b>name</b> to <tt>iPXE Error Code Lookup</tt> and
77 77
             <b>keyword</b> to <tt>gxpe</tt>  Then you can look up error
78 78
             codes by typing something like the following in your address
79
-            bar: <tt>gpxe 0x3c018003</tt>
79
+            bar: <tt>ipxe 0x3c018003</tt>
80 80
             <p>
81 81
         </div>
82 82
     </body>

+ 3
- 0
contrib/errcode/errcodedb.py ファイルの表示

@@ -0,0 +1,3 @@
1
+pxenv_status = {0: 'PXENV_STATUS_SUCCESS', 1: 'PXENV_STATUS_FAILURE', 2: 'PXENV_STATUS_BAD_FUNC', 3: 'PXENV_STATUS_UNSUPPORTED', 4: 'PXENV_STATUS_KEEP_UNDI', 5: 'PXENV_STATUS_KEEP_ALL', 6: 'PXENV_STATUS_OUT_OF_RESOURCES', 17: 'PXENV_STATUS_ARP_TIMEOUT', 107: 'PXENV_STATUS_UNDI_TRANSMIT_ERROR', 24: 'PXENV_STATUS_UDP_CLOSED', 25: 'PXENV_STATUS_UDP_OPEN', 26: 'PXENV_STATUS_TFTP_CLOSED', 27: 'PXENV_STATUS_TFTP_OPEN', 160: 'PXENV_STATUS_BINL_CANCELED_BY_KEYSTROKE', 161: 'PXENV_STATUS_BINL_NO_PXE_SERVER', 162: 'PXENV_STATUS_NOT_AVAILABLE_IN_PMODE', 163: 'PXENV_STATUS_NOT_AVAILABLE_IN_RMODE', 36: 'PXENV_STATUS_BIS_SHUTDOWN_FAILURE', 37: 'PXENV_STATUS_BIS_GBOA_FAILURE', 38: 'PXENV_STATUS_BIS_FREE_FAILURE', 48: 'PXENV_STATUS_TFTP_CANNOT_ARP_ADDRESS', 40: 'PXENV_STATUS_BIS_BAD_CKSUM', 176: 'PXENV_STATUS_BUSD_DEVICE_NOT_SUPPORTED', 50: 'PXENV_STATUS_TFTP_OPEN_TIMEOUT', 51: 'PXENV_STATUS_TFTP_UNKNOWN_OPCODE', 53: 'PXENV_STATUS_TFTP_READ_TIMEOUT', 54: 'PXENV_STATUS_TFTP_ERROR_OPCODE', 56: 'PXENV_STATUS_TFTP_CANNOT_OPEN_CONNECTION', 57: 'PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION', 58: 'PXENV_STATUS_TFTP_TOO_MANY_PACKAGES', 59: 'PXENV_STATUS_TFTP_FILE_NOT_FOUND', 35: 'PXENV_STATUS_BIS_INIT_FAILURE', 61: 'PXENV_STATUS_TFTP_NO_MCAST_ADDRESS', 62: 'PXENV_STATUS_TFTP_NO_FILESIZE', 63: 'PXENV_STATUS_TFTP_INVALID_PACKET_SIZE', 192: 'PXENV_STATUS_LOADER_NO_FREE_BASE_MEMORY', 193: 'PXENV_STATUS_LOADER_NO_BC_ROMID', 194: 'PXENV_STATUS_LOADER_BAD_BC_ROMID', 195: 'PXENV_STATUS_LOADER_BAD_BC_RUNTIME_IMAGE', 196: 'PXENV_STATUS_LOADER_NO_UNDI_ROMID', 197: 'PXENV_STATUS_LOADER_BAD_UNDI_ROMID', 198: 'PXENV_STATUS_LOADER_BAD_UNDI_DRIVER_IMAGE', 32: 'PXENV_STATUS_MCOPY_PROBLEM', 200: 'PXENV_STATUS_LOADER_NO_PXE_STRUCT', 201: 'PXENV_STATUS_LOADER_NO_PXENV_STRUCT', 202: 'PXENV_STATUS_LOADER_UNDI_START', 203: 'PXENV_STATUS_LOADER_BC_START', 34: 'PXENV_STATUS_BIS_VALIDATE_FAILURE', 81: 'PXENV_STATUS_DHCP_TIMEOUT', 82: 'PXENV_STATUS_DHCP_NO_IP_ADDRESS', 83: 'PXENV_STATUS_DHCP_NO_BOOTFILE_NAME', 84: 'PXENV_STATUS_DHCP_BAD_IP_ADDRESS', 105: 'PXENV_STATUS_UNDI_ERROR_SETTING_ISR', 96: 'PXENV_STATUS_UNDI_INVALID_FUNCTION', 97: 'PXENV_STATUS_UNDI_MEDIATEST_FAILED', 98: 'PXENV_STATUS_UNDI_CANNOT_INIT_NIC_FOR_MCAST', 99: 'PXENV_STATUS_UNDI_CANNOT_INITIALIZE_NIC', 100: 'PXENV_STATUS_UNDI_CANNOT_INITIALIZE_PHY', 101: 'PXENV_STATUS_UNDI_CANNOT_READ_CONFIG_DATA', 102: 'PXENV_STATUS_UNDI_CANNOT_READ_INIT_DATA', 103: 'PXENV_STATUS_UNDI_BAD_MAC_ADDRESS', 104: 'PXENV_STATUS_UNDI_BAD_EEPROM_CHECKSUM', 60: 'PXENV_STATUS_TFTP_ACCESS_VIOLATION', 106: 'PXENV_STATUS_UNDI_INVALID_STATE', 39: 'PXENV_STATUS_BIS_GSI_FAILURE', 108: 'PXENV_STATUS_UNDI_INVALID_PARAMETER', 116: 'PXENV_STATUS_BSTRAP_PROMPT_MENU', 118: 'PXENV_STATUS_BSTRAP_MCAST_ADDR', 119: 'PXENV_STATUS_BSTRAP_MISSING_LIST', 120: 'PXENV_STATUS_BSTRAP_NO_RESPONSE', 121: 'PXENV_STATUS_BSTRAP_FILE_TOO_BIG', 33: 'PXENV_STATUS_BIS_INTEGRITY_FAILURE'}
2
+errfile = {1024: 'ERRFILE_ARCH', 1: 'ERRFILE_CORE', 1026: 'ERRFILE_timer_rdtsc', 3: 'ERRFILE_NET', 4: 'ERRFILE_IMAGE', 1025: 'ERRFILE_memtop_umalloc', 9: 'ERRFILE_downloader', 1034: 'ERRFILE_timer_bios', 11: 'ERRFILE_arp', 12: 'ERRFILE_elf', 2: 'ERRFILE_eisa', 15: 'ERRFILE_chap', 1041: 'ERRFILE_pnpbios', 18: 'ERRFILE_isapnp', 1043: 'ERRFILE_undinet', 20: 'ERRFILE_script', 17: 'ERRFILE_exec', 23: 'ERRFILE_aoeboot', 1049: 'ERRFILE_bios_smbios', 538: 'ERRFILE_tulip', 27: 'ERRFILE_ethernet', 28: 'ERRFILE_segment', 410: 'ERRFILE_amd8111e', 31: 'ERRFILE_autoboot', 33: 'ERRFILE_iobuf', 546: 'ERRFILE_via_rhine', 1059: 'ERRFILE_undirom', 36: 'ERRFILE_efi_image', 39: 'ERRFILE_dhcpmgmt', 1065: 'ERRFILE_int13', 554: 'ERRFILE_via_velocity', 43: 'ERRFILE_ipv4', 44: 'ERRFILE_embedded', 47: 'ERRFILE_imgmgmt', 49: 'ERRFILE_linebuf', 562: 'ERRFILE_w89c840', 51: 'ERRFILE_ipv6', 1076: 'ERRFILE_elfboot', 55: 'ERRFILE_pxe_tftp', 57: 'ERRFILE_monojob', 570: 'ERRFILE_ipoib', 59: 'ERRFILE_ndp', 1084: 'ERRFILE_comboot', 522: 'ERRFILE_sundance', 63: 'ERRFILE_pxe_udp', 19: 'ERRFILE_dhcpopts', 65: 'ERRFILE_nvo', 578: 'ERRFILE_e1000', 67: 'ERRFILE_netdevice', 1092: 'ERRFILE_com32', 71: 'ERRFILE_axtls_aes', 1036: 'ERRFILE_bzimage', 586: 'ERRFILE_e1000_hw', 75: 'ERRFILE_nullnet', 1100: 'ERRFILE_comboot_resolv', 906: 'ERRFILE_arbel', 79: 'ERRFILE_cipher', 81: 'ERRFILE_posix_io', 594: 'ERRFILE_mtnic', 83: 'ERRFILE_tcp', 1108: 'ERRFILE_comboot_call', 87: 'ERRFILE_image_cmd', 89: 'ERRFILE_resolv', 602: 'ERRFILE_phantom', 91: 'ERRFILE_ftp', 95: 'ERRFILE_uri_test', 97: 'ERRFILE_settings', 610: 'ERRFILE_ne2k_isa', 99: 'ERRFILE_http', 103: 'ERRFILE_ibft', 105: 'ERRFILE_vsprintf', 618: 'ERRFILE_b44', 107: 'ERRFILE_iscsi', 530: 'ERRFILE_tlan', 111: 'ERRFILE_tls', 113: 'ERRFILE_xfer', 626: 'ERRFILE_rtl818x', 115: 'ERRFILE_tcpip', 119: 'ERRFILE_ifmgmt', 121: 'ERRFILE_bitmap', 634: 'ERRFILE_sky2', 123: 'ERRFILE_udp', 1044: 'ERRFILE_eltorito', 127: 'ERRFILE_iscsiboot', 1027: 'ERRFILE_undi', 642: 'ERRFILE_ath5k', 131: 'ERRFILE_dhcp', 135: 'ERRFILE_efi_pci', 650: 'ERRFILE_atl1e', 139: 'ERRFILE_dns', 143: 'ERRFILE_efi_snp', 146: 'ERRFILE_i2c_bit', 147: 'ERRFILE_tftp', 151: 'ERRFILE_smbios', 154: 'ERRFILE_spi_bit', 155: 'ERRFILE_infiniband', 26: 'ERRFILE_mca', 1028: 'ERRFILE_bootsector', 159: 'ERRFILE_smbios_settings', 674: 'ERRFILE_skge', 1051: 'ERRFILE_undionly', 167: 'ERRFILE_efi_smbios', 1052: 'ERRFILE_multiboot', 171: 'ERRFILE_dhcppkt', 175: 'ERRFILE_pxemenu', 179: 'ERRFILE_slam', 183: 'ERRFILE_x509', 187: 'ERRFILE_ib_sma', 191: 'ERRFILE_login_ui', 195: 'ERRFILE_ib_packet', 211: 'ERRFILE_ib_qset', 1057: 'ERRFILE_biosint', 203: 'ERRFILE_icmp', 34: 'ERRFILE_pci', 207: 'ERRFILE_iwmgmt', 35: 'ERRFILE_icmpv6', 898: 'ERRFILE_scsi', 7: 'ERRFILE_OTHER', 1060: 'ERRFILE_nbi', 219: 'ERRFILE_ib_gma', 227: 'ERRFILE_ib_pathrec', 235: 'ERRFILE_ib_mcast', 243: 'ERRFILE_ib_cm', 25: 'ERRFILE_hw', 41: 'ERRFILE_job', 251: 'ERRFILE_net80211', 258: 'ERRFILE_3c509', 259: 'ERRFILE_ib_mi', 1068: 'ERRFILE_pxe_image', 266: 'ERRFILE_bnx2', 267: 'ERRFILE_ib_cmrc', 130: 'ERRFILE_nvs', 274: 'ERRFILE_cs89x0', 275: 'ERRFILE_ib_srp', 282: 'ERRFILE_eepro', 283: 'ERRFILE_sec80211', 290: 'ERRFILE_etherfabric', 291: 'ERRFILE_wep', 1073: 'ERRFILE_pxeparent', 298: 'ERRFILE_legacy', 299: 'ERRFILE_eapol', 306: 'ERRFILE_natsemi', 10: 'ERRFILE_isa', 307: 'ERRFILE_wpa', 1033: 'ERRFILE_memmap', 658: 'ERRFILE_sis190', 314: 'ERRFILE_pnic', 315: 'ERRFILE_wpa_psk', 138: 'ERRFILE_spi', 322: 'ERRFILE_prism2_pci', 323: 'ERRFILE_wpa_tkip', 330: 'ERRFILE_prism2_plx', 331: 'ERRFILE_wpa_ccmp', 338: 'ERRFILE_rtl8139', 346: 'ERRFILE_smc9000', 199: 'ERRFILE_ib_srpboot', 354: 'ERRFILE_tg3', 362: 'ERRFILE_3c509_eisa', 402: 'ERRFILE_3c90x', 1035: 'ERRFILE_undiload', 370: 'ERRFILE_3c515', 378: 'ERRFILE_3c529', 386: 'ERRFILE_3c595', 394: 'ERRFILE_3c5x9', 914: 'ERRFILE_hermon', 922: 'ERRFILE_linda', 514: 'ERRFILE_sis900', 666: 'ERRFILE_myri10ge', 930: 'ERRFILE_ata', 938: 'ERRFILE_srp', 434: 'ERRFILE_dmfe', 73: 'ERRFILE_open', 450: 'ERRFILE_eepro100', 458: 'ERRFILE_epic100', 418: 'ERRFILE_davicom', 466: 'ERRFILE_forcedeth', 163: 'ERRFILE_netdev_settings', 474: 'ERRFILE_mtd80x', 482: 'ERRFILE_ns83820', 490: 'ERRFILE_ns8390', 498: 'ERRFILE_pcnet32', 506: 'ERRFILE_r8169', 426: 'ERRFILE_depca'}
3
+posix_errno = {0: 'ENOERR', 1: 'E2BIG', 2: 'EACCES', 3: 'EADDRINUSE', 4: 'EADDRNOTAVAIL', 5: 'EAFNOSUPPORT', 6: 'EAGAIN', 7: 'EALREADY', 8: 'EBADF', 9: 'EBADMSG', 10: 'EBUSY', 11: 'ECANCELED', 12: 'ECHILD', 13: 'ECONNABORTED', 14: 'ECONNREFUSED', 15: 'ECONNRESET', 16: 'EDEADLK', 17: 'EDESTADDRREQ', 18: 'EDOM', 19: 'EDQUOT', 20: 'EEXIST', 21: 'EFAULT', 22: 'EFBIG', 23: 'EHOSTUNREACH', 24: 'EIDRM', 25: 'EILSEQ', 26: 'EINPROGRESS', 27: 'EINTR', 28: 'EINVAL', 29: 'EIO', 30: 'EISCONN', 31: 'EISDIR', 32: 'ELOOP', 33: 'EMFILE', 34: 'EMLINK', 35: 'EMSGSIZE', 36: 'EMULTIHOP', 37: 'ENAMETOOLONG', 38: 'ENETDOWN', 39: 'ENETRESET', 40: 'ENETUNREACH', 41: 'ENFILE', 42: 'ENOBUFS', 43: 'ENODATA', 44: 'ENODEV', 45: 'ENOENT', 46: 'ENOEXEC', 47: 'ENOLCK', 48: 'ENOLINK', 49: 'ENOMEM', 50: 'ENOMSG', 51: 'ENOPROTOOPT', 52: 'ENOSPC', 53: 'ENOSR', 54: 'ENOSTR', 55: 'ENOSYS', 56: 'ENOTCONN', 57: 'ENOTDIR', 58: 'ENOTEMPTY', 59: 'ENOTSOCK', 60: 'ENOTSUP', 61: 'ENOTTY', 62: 'ENXIO', 63: 'EOPNOTSUPP', 64: 'EOVERFLOW', 65: 'EPERM', 66: 'EPIPE', 67: 'EPROTO', 68: 'EPROTONOSUPPORT', 69: 'EPROTOTYPE', 70: 'ERANGE', 71: 'EROFS', 72: 'ESPIPE', 73: 'ESRCH', 74: 'ESTALE', 75: 'ETIME', 76: 'ETIMEDOUT', 77: 'ETXTBSY', 78: 'EWOULDBLOCK', 79: 'EXDEV'}

バイナリ
contrib/errcode/errcodedb.pyc ファイルの表示


+ 4
- 4
contrib/errcode/gpxebot.py ファイルの表示

@@ -20,11 +20,11 @@ import errcode
20 20
 
21 21
 HOST = 'irc.freenode.net'
22 22
 PORT = 6667
23
-NICK = 'gpxebot'
23
+NICK = 'ipxebot'
24 24
 CHAN = '#etherboot'
25 25
 NICKSERV_PASSWORD = None
26
-IDENT = 'gpxebot'
27
-REALNAME = 'gPXE bot'
26
+IDENT = 'ipxebot'
27
+REALNAME = 'iPXE bot'
28 28
 
29 29
 ERRCODE_RE = re.compile(r'(errcode|Error)\s+((0x)?[0-9a-fA-F]{8})')
30 30
 
@@ -59,7 +59,7 @@ def privmsg(_, target, msg):
59 59
         except ValueError:
60 60
             pass
61 61
     if msg.find('help') > -1:
62
-        pmsg(replyto, 'I look up gPXE error codes.  Message me like this:')
62
+        pmsg(replyto, 'I look up iPXE error codes.  Message me like this:')
63 63
         pmsg(replyto, 'errcode 0x12345678  OR  Error 0x12345678')
64 64
 
65 65
 def add_handler(command, handler, nargs):

+ 11
- 11
contrib/rom-o-matic/README ファイルの表示

@@ -1,30 +1,30 @@
1
-ROM-o-matic web interface for building gPXE ROMs
1
+ROM-o-matic web interface for building iPXE ROMs
2 2
 ------------------------------------------------
3 3
 
4
-This web application generates gPXE images and sends them to a web
4
+This web application generates iPXE images and sends them to a web
5 5
 browser.
6 6
 
7
-Available as part of the gPXE source code distribution, which can be
7
+Available as part of the iPXE source code distribution, which can be
8 8
 downlaoded from http://etherboot.org/
9 9
 
10 10
 Author:  Marty Connor <mdc@etherboot.org>
11 11
 License: GPLv2
12
-Support: http://etherboot.org/mailman/listinfo/gpxe
13
-         Please send support questions to the gPXE mailing list
12
+Support: http://etherboot.org/mailman/listinfo/ipxe
13
+         Please send support questions to the iPXE mailing list
14 14
 
15 15
 System Requirements
16 16
 -------------------
17 17
 - Apache web server
18 18
 - PHP 4+
19
-- Tools required to build gPXE installed on the server
19
+- Tools required to build iPXE installed on the server
20 20
   - gcc, mtools, syslinux, perl, etc.
21 21
 
22 22
 Setup
23 23
 -----
24 24
 As distributed, it is expected that the rom-o-matic source code
25
-directory is in the contrib directory of a gPXE source distribution.
25
+directory is in the contrib directory of a iPXE source distribution.
26 26
 
27
-The easiest way to do this is to simply put a gPXE source distribution
27
+The easiest way to do this is to simply put a iPXE source distribution
28 28
 in a web server accessible directory.
29 29
 
30 30
 If this is not the case, you will need to either edit the file
@@ -41,11 +41,11 @@ containing the following lines:
41 41
 $src_dir = "../../src";
42 42
 ?>
43 43
 
44
-Then change the line beginning "$src_dir = " to the path of your gPXE
44
+Then change the line beginning "$src_dir = " to the path of your iPXE
45 45
 source code tree.
46 46
 
47 47
 To make build times shorter, before you run rom-o-matic for the first time
48
-you should cd to the gpxe "src" directory and enter the following
48
+you should cd to the ipxe "src" directory and enter the following
49 49
 commands:
50 50
 
51 51
   $ make
@@ -58,5 +58,5 @@ Running rom-o-matic from a web browser
58 58
 --------------------------------------
59 59
 Enter a URL like:
60 60
 
61
-   http://example.com/gpxe-1.x.x/contrib/rom-o-matic
61
+   http://example.com/ipxe-1.x.x/contrib/rom-o-matic
62 62
 

+ 4
- 4
contrib/rom-o-matic/bottom.php ファイルの表示

@@ -26,25 +26,25 @@ Resources:
26 26
 </h4>
27 27
 <ul>
28 28
   <li>
29
-    Source code for gPXE images is available at
29
+    Source code for iPXE images is available at
30 30
     <a href="http://etherboot.org/wiki/download" target="_blank">
31 31
     http://etherboot.org/wiki/download</a>
32 32
     <br><br>
33 33
   </li>
34 34
   <li>
35
-    For general information about using gPXE, please visit the
35
+    For general information about using iPXE, please visit the
36 36
     <a href="http://www.etherboot.org/" target="_blank">
37 37
     Etherboot Project Home Page</a>
38 38
     <br><br>
39 39
   </li>
40 40
   <li>
41
-    For Email-based support for gPXE please join
41
+    For Email-based support for iPXE please join
42 42
     <a href="http://etherboot.org/wiki/mailinglists" target="_blank">
43 43
     Etherboot Project mailing lists.</a>
44 44
     <br><br>
45 45
   </li>
46 46
   <li>
47
-    For real-time online gPXE support via IRC please visit the
47
+    For real-time online iPXE support via IRC please visit the
48 48
     <a href="irc://irc.freenode.net/%23etherboot"> #etherboot channel
49 49
     of irc.freenode.net</a>.
50 50
     <br><br>

+ 6
- 6
contrib/rom-o-matic/build.php ファイルの表示

@@ -158,19 +158,19 @@ $build_dir = mktempcopy ( "$src_dir", "/tmp", "MDCROM" );
158 158
 $config_dir = $build_dir . "/config";
159 159
 
160 160
 // Write config files with supplied flags
161
-write_gpxe_config_files ( $config_dir, $flags );
161
+write_ipxe_config_files ( $config_dir, $flags );
162 162
 
163 163
 // Handle a possible embedded script
164 164
 $emb_script_cmd = "";
165 165
 $embedded_script = isset ( $_POST['embedded_script'] ) ? $_POST['embedded_script'] : "";
166 166
 if ( $embedded_script != "" ) {
167
-    $emb_script_path = "$build_dir" . "/script0.gpxe";
167
+    $emb_script_path = "$build_dir" . "/script0.ipxe";
168 168
 
169
-	if ( substr ( $embedded_script, 0, 5 ) != "#!gpxe" ) {
170
-		$embedded_script = "#!gpxe\n" . $embedded_script;
169
+	if ( substr ( $embedded_script, 0, 5 ) != "#!ipxe" ) {
170
+		$embedded_script = "#!ipxe\n" . $embedded_script;
171 171
 	}
172 172
 
173
-    // gPXE 0.9.7 doesn't like '\r\n" in the shebang...
173
+    // iPXE 0.9.7 doesn't like '\r\n" in the shebang...
174 174
     $embedded_script = str_replace ( "\r\n", "\n", $embedded_script );
175 175
 
176 176
     write_file_from_string ( $emb_script_path, $embedded_script );
@@ -239,7 +239,7 @@ if ( $status == 0 ) {
239 239
             // Delete build directory as soon as it is not needed
240 240
             rm_build_dir ();
241 241
 
242
-            $output_filename = "gpxe-${version}-${nic}.${fmt_extension}";
242
+            $output_filename = "ipxe-${version}-${nic}.${fmt_extension}";
243 243
 
244 244
             // Try to force IE to handle downloading right.
245 245
             Header ( "Cache-control: private");

+ 1
- 1
contrib/rom-o-matic/directions.php ファイルの表示

@@ -55,7 +55,7 @@
55 55
           above.<br><br>
56 56
         </li>
57 57
         <li>
58
-          gPXE does not support all possible PCI IDs for supported
58
+          iPXE does not support all possible PCI IDs for supported
59 59
           NICs.
60 60
           <br><br>
61 61
         </li>

+ 1
- 1
contrib/rom-o-matic/doc/IMAGE_SCRIPT.html ファイルの表示

@@ -1 +1 @@
1
-gPXE script image support
1
+iPXE script image support

+ 1
- 1
contrib/rom-o-matic/flag-table.php ファイルの表示

@@ -59,7 +59,7 @@ $flag_table = array (
59 59
 	   "flag" => "PRODUCT_SHORT_NAME",
60 60
 	   "hide_from_user" => "yes",
61 61
 	   "type" => "string",
62
-	   "value" => "gPXE",
62
+	   "value" => "iPXE",
63 63
 	   "cfgsec" => "general"
64 64
 	   ),
65 65
 

+ 6
- 6
contrib/rom-o-matic/globals.php ファイルの表示

@@ -19,10 +19,10 @@
19 19
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 20
  */
21 21
 
22
-// Directory containing gPXE source code tree
22
+// Directory containing iPXE source code tree
23 23
 $src_dir = "../../src";
24 24
 
25
-// Compute gPXE version based on source tree
25
+// Compute iPXE version based on source tree
26 26
 exec ( "make -C '$src_dir' version 2>&1", $make_output, $status );
27 27
 $version = ( $status == 0 && count ( $make_output  ) > 1 )
28 28
            ? trim ( $make_output[count ( $make_output ) - 2] )
@@ -36,10 +36,10 @@ $top_inc = "top.php";
36 36
 $bottom_inc = "bottom.php";
37 37
 
38 38
 // Descriptive strings
39
-$header_title = "ROM-o-matic for gPXE $version";
40
-$html_tagline = "ROM-o-matic dynamically generates gPXE images";
41
-$html_title   = "ROM-o-matic for gPXE $version";
42
-$description  = "a dynamic gPXE image generator";
39
+$header_title = "ROM-o-matic for iPXE $version";
40
+$html_tagline = "ROM-o-matic dynamically generates iPXE images";
41
+$html_title   = "ROM-o-matic for iPXE $version";
42
+$description  = "a dynamic iPXE image generator";
43 43
 
44 44
 // For emacs:
45 45
 // Local variables:

+ 1
- 1
contrib/rom-o-matic/top.php ファイルの表示

@@ -26,7 +26,7 @@
26 26
 <html>
27 27
 <head>
28 28
   <link rev="made" href="mailto:<? echo "${webmaster_email}" ?>">
29
-  <meta name="keywords" content="rom, etherboot, gpxe, open source, rom-o-matic.net">
29
+  <meta name="keywords" content="rom, etherboot, ipxe, open source, rom-o-matic.net">
30 30
   <title><? echo $header_title ?></title>
31 31
   <meta name="description" content="<? echo $description ?>">
32 32
 </head>

+ 9
- 9
contrib/rom-o-matic/utils.php ファイルの表示

@@ -19,7 +19,7 @@
19 19
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 20
  */
21 21
 
22
-// Include table of user-configurable gPXE options
22
+// Include table of user-configurable iPXE options
23 23
 require_once "flag-table.php";
24 24
 
25 25
 // Include user-shadowable globals
@@ -103,7 +103,7 @@ function curDirURL ()
103 103
 /**
104 104
  * Extract NIC families and associated ROM PCI IDs from the src/bin/NIC file.
105 105
  *
106
- * $src_dir must contain the path of the gPXE src directory for this build
106
+ * $src_dir must contain the path of the iPXE src directory for this build
107 107
  *
108 108
  * @return array[0] array $new_nics
109 109
  * @return array[1] array $roms
@@ -161,7 +161,7 @@ function parse_nic_file ()
161 161
 
162 162
     // add special cases to the top
163 163
 
164
-	$new_nics = array ( "all-drivers" => "gpxe",
164
+	$new_nics = array ( "all-drivers" => "ipxe",
165 165
 						"undionly" => "undionly",
166 166
 						"undi" => "undi",
167 167
     );
@@ -363,9 +363,9 @@ function get_flags ()
363 363
 }
364 364
 
365 365
 /**
366
- * Output given value in appropriate format for gPXE config file
366
+ * Output given value in appropriate format for iPXE config file
367 367
  *
368
- * gPXE config/*.h files use C pre-processor syntax.  Output the given
368
+ * iPXE config/*.h files use C pre-processor syntax.  Output the given
369 369
  * compile option in a format appropriate to its type
370 370
  *
371 371
  * @param string $key   index into $flag_table for given compile option
@@ -429,7 +429,7 @@ function echo_flags ( $flags )
429 429
 
430 430
         } else {
431 431
 
432
-            // Flag (gPXE compile option) should be displayed to user
432
+            // Flag (iPXE compile option) should be displayed to user
433 433
 
434 434
             if ( $type == "header" ) {
435 435
 
@@ -535,9 +535,9 @@ function mktempcopy ( $src, $dst, $prefix )
535 535
 }
536 536
 
537 537
 /**
538
- * Write gPXE config files based on value of given flags
538
+ * Write iPXE config files based on value of given flags
539 539
  *
540
- * gPXE compile options are stored in src/config/*.h .
540
+ * iPXE compile options are stored in src/config/*.h .
541 541
  * We write out a config file for each set of options.
542 542
  *
543 543
  * @param string $config_dir directory to write .h files to
@@ -545,7 +545,7 @@ function mktempcopy ( $src, $dst, $prefix )
545 545
  *
546 546
  * @return void
547 547
  */
548
-function write_gpxe_config_files ( $config_dir, $flags )
548
+function write_ipxe_config_files ( $config_dir, $flags )
549 549
 {
550 550
     global $flag_table;
551 551
 

+ 5
- 5
src/Makefile ファイルの表示

@@ -93,22 +93,22 @@ INCDIRS		+= include .
93 93
 # Default build target: build the most common targets and print out a
94 94
 # helpfully suggestive message
95 95
 #
96
-all : bin/blib.a bin/gpxe.dsk bin/gpxe.iso bin/gpxe.usb bin/undionly.kpxe
96
+all : bin/blib.a bin/ipxe.dsk bin/ipxe.iso bin/ipxe.usb bin/undionly.kpxe
97 97
 	@$(ECHO) '==========================================================='
98 98
 	@$(ECHO)
99 99
 	@$(ECHO) 'To create a bootable floppy, type'
100
-	@$(ECHO) '    cat bin/gpxe.dsk > /dev/fd0'
100
+	@$(ECHO) '    cat bin/ipxe.dsk > /dev/fd0'
101 101
 	@$(ECHO) 'where /dev/fd0 is your floppy drive.  This will erase any'
102 102
 	@$(ECHO) 'data already on the disk.'
103 103
 	@$(ECHO)
104 104
 	@$(ECHO) 'To create a bootable USB key, type'
105
-	@$(ECHO) '    cat bin/gpxe.usb > /dev/sdX'
105
+	@$(ECHO) '    cat bin/ipxe.usb > /dev/sdX'
106 106
 	@$(ECHO) 'where /dev/sdX is your USB key, and is *not* a real hard'
107 107
 	@$(ECHO) 'disk on your system.  This will erase any data already on'
108 108
 	@$(ECHO) 'the USB key.'
109 109
 	@$(ECHO)
110 110
 	@$(ECHO) 'To create a bootable CD-ROM, burn the ISO image '
111
-	@$(ECHO) 'bin/gpxe.iso to a blank CD-ROM.'
111
+	@$(ECHO) 'bin/ipxe.iso to a blank CD-ROM.'
112 112
 	@$(ECHO)
113 113
 	@$(ECHO) 'These images contain drivers for all supported cards.  You'
114 114
 	@$(ECHO) 'can build more customised images, and ROM images, using'
@@ -140,7 +140,7 @@ CFLAGS		+= -DVERSION_MAJOR=$(VERSION_MAJOR) \
140 140
 		   -DVERSION_MINOR=$(VERSION_MINOR) \
141 141
 		   -DVERSION_PATCH=$(VERSION_PATCH) \
142 142
 		   -DVERSION=\"$(VERSION)\"
143
-IDENT		= '$(@F) $(VERSION) (GPL) etherboot.org'
143
+IDENT		= '$(@F) $(VERSION) (GPL) ipxe.org'
144 144
 version :
145 145
 	@$(ECHO) $(VERSION)
146 146
 

+ 3
- 3
src/Makefile.housekeeping ファイルの表示

@@ -569,7 +569,7 @@ CLEANUP		+= $(BIN)/NIC	# Doesn't match the $(BIN)/*.* pattern
569 569
 # TGT_ROM_NAME : the ROM name (e.g. "dfe538")
570 570
 # TGT_MEDIA    : the media type (e.g. "rom")
571 571
 #
572
-DRIVERS_gpxe	= $(DRIVERS)
572
+DRIVERS_ipxe	= $(DRIVERS)
573 573
 CARD_DRIVER	= $(firstword $(DRIVER_$(1)) $(1))
574 574
 TGT_ELEMENTS	= $(subst --, ,$(firstword $(subst ., ,$(notdir $@))))
575 575
 TGT_PREFIX	= $(word 2,$(subst ., ,$(notdir $@)))
@@ -851,9 +851,9 @@ allall: allroms allzroms allpxes allisos alldsks
851 851
 allroms allzroms : all%s : $(foreach ROM,$(ROMS),$(BIN)/$(ROM).%)
852 852
 allpxes allisos alldsks : all%s : $(foreach DRIVER,$(DRIVERS),$(BIN)/$(DRIVER).%)
853 853
 
854
-# Alias for gpxe.%
854
+# Alias for ipxe.%
855 855
 #
856
-$(BIN)/etherboot.% : $(BIN)/gpxe.%
856
+$(BIN)/etherboot.% : $(BIN)/ipxe.%
857 857
 	ln -sf $(notdir $<) $@
858 858
 
859 859
 endif # defined(BIN)

+ 2
- 2
src/arch/i386/core/gdbmach.c ファイルの表示

@@ -19,8 +19,8 @@
19 19
 #include <stddef.h>
20 20
 #include <stdio.h>
21 21
 #include <assert.h>
22
-#include <gpxe/uaccess.h>
23
-#include <gpxe/gdbstub.h>
22
+#include <ipxe/uaccess.h>
23
+#include <ipxe/gdbstub.h>
24 24
 #include <gdbmach.h>
25 25
 
26 26
 /** @file

+ 1
- 1
src/arch/i386/core/pic8259.c ファイルの表示

@@ -18,7 +18,7 @@
18 18
 
19 19
 FILE_LICENCE ( GPL2_OR_LATER );
20 20
 
21
-#include <gpxe/io.h>
21
+#include <ipxe/io.h>
22 22
 #include <pic8259.h>
23 23
 
24 24
 /** @file

+ 2
- 2
src/arch/i386/core/rdtsc_timer.c ファイルの表示

@@ -25,8 +25,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
25 25
  */
26 26
 
27 27
 #include <assert.h>
28
-#include <gpxe/timer.h>
29
-#include <gpxe/timer2.h>
28
+#include <ipxe/timer.h>
29
+#include <ipxe/timer2.h>
30 30
 
31 31
 /**
32 32
  * Number of TSC ticks per microsecond

+ 2
- 2
src/arch/i386/core/relocate.c ファイルの表示

@@ -1,6 +1,6 @@
1
-#include <gpxe/io.h>
1
+#include <ipxe/io.h>
2 2
 #include <registers.h>
3
-#include <gpxe/memmap.h>
3
+#include <ipxe/memmap.h>
4 4
 
5 5
 /*
6 6
  * Originally by Eric Biederman

+ 2
- 2
src/arch/i386/core/timer2.c ファイルの表示

@@ -14,8 +14,8 @@
14 14
 FILE_LICENCE ( GPL2_OR_LATER );
15 15
 
16 16
 #include <stddef.h>
17
-#include <gpxe/timer2.h>
18
-#include <gpxe/io.h>
17
+#include <ipxe/timer2.h>
18
+#include <ipxe/io.h>
19 19
 
20 20
 /* Timers tick over at this rate */
21 21
 #define TIMER2_TICKS_PER_SEC	1193180U

+ 2
- 2
src/arch/i386/core/video_subr.c ファイルの表示

@@ -7,9 +7,9 @@
7 7
 
8 8
 #include "stddef.h"
9 9
 #include "string.h"
10
-#include <gpxe/io.h>
10
+#include <ipxe/io.h>
11 11
 #include "console.h"
12
-#include <gpxe/init.h>
12
+#include <ipxe/init.h>
13 13
 #include "vga.h"
14 14
 
15 15
 struct console_driver vga_console;

+ 3
- 3
src/arch/i386/core/x86_io.c ファイルの表示

@@ -18,12 +18,12 @@
18 18
 
19 19
 FILE_LICENCE ( GPL2_OR_LATER );
20 20
 
21
-#include <gpxe/io.h>
22
-#include <gpxe/x86_io.h>
21
+#include <ipxe/io.h>
22
+#include <ipxe/x86_io.h>
23 23
 
24 24
 /** @file
25 25
  *
26
- * gPXE I/O API for x86
26
+ * iPXE I/O API for x86
27 27
  *
28 28
  */
29 29
 

+ 1
- 1
src/arch/i386/drivers/net/undi.c ファイルの表示

@@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
22 22
 #include <stdlib.h>
23 23
 #include <stdio.h>
24 24
 #include <string.h>
25
-#include <gpxe/pci.h>
25
+#include <ipxe/pci.h>
26 26
 #include <undi.h>
27 27
 #include <undirom.h>
28 28
 #include <undiload.h>

+ 1
- 1
src/arch/i386/drivers/net/undiload.c ファイルの表示

@@ -26,7 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
26 26
 #include <bios.h>
27 27
 #include <pnpbios.h>
28 28
 #include <basemem.h>
29
-#include <gpxe/pci.h>
29
+#include <ipxe/pci.h>
30 30
 #include <undi.h>
31 31
 #include <undirom.h>
32 32
 #include <undiload.h>

+ 5
- 5
src/arch/i386/drivers/net/undinet.c ファイルの表示

@@ -25,11 +25,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
25 25
 #include <biosint.h>
26 26
 #include <pnpbios.h>
27 27
 #include <basemem_packet.h>
28
-#include <gpxe/io.h>
29
-#include <gpxe/iobuf.h>
30
-#include <gpxe/netdevice.h>
31
-#include <gpxe/if_ether.h>
32
-#include <gpxe/ethernet.h>
28
+#include <ipxe/io.h>
29
+#include <ipxe/iobuf.h>
30
+#include <ipxe/netdevice.h>
31
+#include <ipxe/if_ether.h>
32
+#include <ipxe/ethernet.h>
33 33
 #include <undi.h>
34 34
 #include <undinet.h>
35 35
 #include <pxeparent.h>

+ 2
- 2
src/arch/i386/drivers/net/undionly.c ファイルの表示

@@ -21,8 +21,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
21 21
 #include <stdint.h>
22 22
 #include <stdlib.h>
23 23
 #include <string.h>
24
-#include <gpxe/device.h>
25
-#include <gpxe/init.h>
24
+#include <ipxe/device.h>
25
+#include <ipxe/init.h>
26 26
 #include <undi.h>
27 27
 #include <undinet.h>
28 28
 #include <undipreload.h>

+ 1
- 1
src/arch/i386/firmware/pcbios/basemem.c ファイルの表示

@@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
22 22
 #include <realmode.h>
23 23
 #include <bios.h>
24 24
 #include <basemem.h>
25
-#include <gpxe/hidemem.h>
25
+#include <ipxe/hidemem.h>
26 26
 
27 27
 /** @file
28 28
  *

+ 1
- 1
src/arch/i386/firmware/pcbios/bios_console.c ファイルの表示

@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
21 21
 #include <assert.h>
22 22
 #include <realmode.h>
23 23
 #include <console.h>
24
-#include <gpxe/ansiesc.h>
24
+#include <ipxe/ansiesc.h>
25 25
 
26 26
 #define ATTR_BOLD		0x08
27 27
 

+ 2
- 2
src/arch/i386/firmware/pcbios/gateA20.c ファイルの表示

@@ -3,8 +3,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
3 3
 #include <stdio.h>
4 4
 #include <realmode.h>
5 5
 #include <bios.h>
6
-#include <gpxe/io.h>
7
-#include <gpxe/timer.h>
6
+#include <ipxe/io.h>
7
+#include <ipxe/timer.h>
8 8
 
9 9
 #define K_RDWR		0x60		/* keyboard data & cmds (read/write) */
10 10
 #define K_STATUS	0x64		/* keyboard status */

+ 6
- 6
src/arch/i386/firmware/pcbios/hidemem.c ファイルの表示

@@ -22,9 +22,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
22 22
 #include <biosint.h>
23 23
 #include <basemem.h>
24 24
 #include <fakee820.h>
25
-#include <gpxe/init.h>
26
-#include <gpxe/memmap.h>
27
-#include <gpxe/hidemem.h>
25
+#include <ipxe/init.h>
26
+#include <ipxe/memmap.h>
27
+#include <ipxe/hidemem.h>
28 28
 
29 29
 /** Set to true if you want to test a fake E820 map */
30 30
 #define FAKE_E820 0
@@ -33,7 +33,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
33 33
 #define ALIGN_HIDDEN 4096   /* 4kB page alignment should be enough */
34 34
 
35 35
 /**
36
- * A hidden region of gPXE
36
+ * A hidden region of iPXE
37 37
  *
38 38
  * This represents a region that will be edited out of the system's
39 39
  * memory map.
@@ -138,7 +138,7 @@ static void hide_etherboot ( void ) {
138 138
 	unsigned int fbms;
139 139
 
140 140
 	/* Dump memory map before mangling */
141
-	DBG ( "Hiding gPXE from system memory map\n" );
141
+	DBG ( "Hiding iPXE from system memory map\n" );
142 142
 	get_memmap ( &memmap );
143 143
 
144 144
 	/* Hook in fake E820 map, if we're testing one */
@@ -178,7 +178,7 @@ static void hide_etherboot ( void ) {
178 178
 			      &int15_vector );
179 179
 
180 180
 	/* Dump memory map after mangling */
181
-	DBG ( "Hidden gPXE from system memory map\n" );
181
+	DBG ( "Hidden iPXE from system memory map\n" );
182 182
 	get_memmap ( &memmap );
183 183
 }
184 184
 

+ 1
- 1
src/arch/i386/firmware/pcbios/memmap.c ファイルの表示

@@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
23 23
 #include <realmode.h>
24 24
 #include <bios.h>
25 25
 #include <memsizes.h>
26
-#include <gpxe/memmap.h>
26
+#include <ipxe/memmap.h>
27 27
 
28 28
 /**
29 29
  * @file

+ 2
- 2
src/arch/i386/hci/commands/pxe_cmd.c ファイルの表示

@@ -1,5 +1,5 @@
1
-#include <gpxe/netdevice.h>
2
-#include <gpxe/command.h>
1
+#include <ipxe/netdevice.h>
2
+#include <ipxe/command.h>
3 3
 #include <hci/ifmgmt_cmd.h>
4 4
 #include <pxe_call.h>
5 5
 

+ 7
- 7
src/arch/i386/image/bzimage.c ファイルの表示

@@ -32,12 +32,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
32 32
 #include <assert.h>
33 33
 #include <realmode.h>
34 34
 #include <bzimage.h>
35
-#include <gpxe/uaccess.h>
36
-#include <gpxe/image.h>
37
-#include <gpxe/segment.h>
38
-#include <gpxe/init.h>
39
-#include <gpxe/cpio.h>
40
-#include <gpxe/features.h>
35
+#include <ipxe/uaccess.h>
36
+#include <ipxe/image.h>
37
+#include <ipxe/segment.h>
38
+#include <ipxe/init.h>
39
+#include <ipxe/cpio.h>
40
+#include <ipxe/features.h>
41 41
 
42 42
 FEATURE ( FEATURE_IMAGE, "bzImage", DHCP_EB_FEATURE_BZIMAGE, 1 );
43 43
 
@@ -201,7 +201,7 @@ static void bzimage_update_header ( struct image *image,
201 201
 
202 202
 	/* Set loader type */
203 203
 	if ( bzimg->version >= 0x0200 )
204
-		bzimg->bzhdr.type_of_loader = BZI_LOADER_TYPE_GPXE;
204
+		bzimg->bzhdr.type_of_loader = BZI_LOADER_TYPE_IPXE;
205 205
 
206 206
 	/* Set heap end pointer */
207 207
 	if ( bzimg->version >= 0x0201 ) {

+ 5
- 5
src/arch/i386/image/com32.c ファイルの表示

@@ -34,11 +34,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
34 34
 #include <realmode.h>
35 35
 #include <basemem.h>
36 36
 #include <comboot.h>
37
-#include <gpxe/uaccess.h>
38
-#include <gpxe/image.h>
39
-#include <gpxe/segment.h>
40
-#include <gpxe/init.h>
41
-#include <gpxe/memmap.h>
37
+#include <ipxe/uaccess.h>
38
+#include <ipxe/image.h>
39
+#include <ipxe/segment.h>
40
+#include <ipxe/init.h>
41
+#include <ipxe/memmap.h>
42 42
 
43 43
 struct image_type com32_image_type __image_type ( PROBE_NORMAL );
44 44
 

+ 5
- 5
src/arch/i386/image/comboot.c ファイルの表示

@@ -34,11 +34,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
34 34
 #include <realmode.h>
35 35
 #include <basemem.h>
36 36
 #include <comboot.h>
37
-#include <gpxe/uaccess.h>
38
-#include <gpxe/image.h>
39
-#include <gpxe/segment.h>
40
-#include <gpxe/init.h>
41
-#include <gpxe/features.h>
37
+#include <ipxe/uaccess.h>
38
+#include <ipxe/image.h>
39
+#include <ipxe/segment.h>
40
+#include <ipxe/init.h>
41
+#include <ipxe/features.h>
42 42
 
43 43
 FEATURE ( FEATURE_IMAGE, "COMBOOT", DHCP_EB_FEATURE_COMBOOT, 1 );
44 44
 

+ 4
- 4
src/arch/i386/image/elfboot.c ファイルの表示

@@ -20,10 +20,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
20 20
 
21 21
 #include <errno.h>
22 22
 #include <elf.h>
23
-#include <gpxe/image.h>
24
-#include <gpxe/elf.h>
25
-#include <gpxe/features.h>
26
-#include <gpxe/init.h>
23
+#include <ipxe/image.h>
24
+#include <ipxe/elf.h>
25
+#include <ipxe/features.h>
26
+#include <ipxe/init.h>
27 27
 
28 28
 /**
29 29
  * @file

+ 5
- 5
src/arch/i386/image/eltorito.c ファイルの表示

@@ -31,11 +31,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
31 31
 #include <realmode.h>
32 32
 #include <bootsector.h>
33 33
 #include <int13.h>
34
-#include <gpxe/uaccess.h>
35
-#include <gpxe/image.h>
36
-#include <gpxe/segment.h>
37
-#include <gpxe/ramdisk.h>
38
-#include <gpxe/init.h>
34
+#include <ipxe/uaccess.h>
35
+#include <ipxe/image.h>
36
+#include <ipxe/segment.h>
37
+#include <ipxe/ramdisk.h>
38
+#include <ipxe/init.h>
39 39
 
40 40
 #define ISO9660_BLKSIZE 2048
41 41
 #define ELTORITO_VOL_DESC_OFFSET ( 17 * ISO9660_BLKSIZE )

+ 8
- 8
src/arch/i386/image/multiboot.c ファイルの表示

@@ -30,13 +30,13 @@ FILE_LICENCE ( GPL2_OR_LATER );
30 30
 #include <assert.h>
31 31
 #include <realmode.h>
32 32
 #include <multiboot.h>
33
-#include <gpxe/uaccess.h>
34
-#include <gpxe/image.h>
35
-#include <gpxe/segment.h>
36
-#include <gpxe/memmap.h>
37
-#include <gpxe/elf.h>
38
-#include <gpxe/init.h>
39
-#include <gpxe/features.h>
33
+#include <ipxe/uaccess.h>
34
+#include <ipxe/image.h>
35
+#include <ipxe/segment.h>
36
+#include <ipxe/memmap.h>
37
+#include <ipxe/elf.h>
38
+#include <ipxe/init.h>
39
+#include <ipxe/features.h>
40 40
 
41 41
 FEATURE ( FEATURE_IMAGE, "Multiboot", DHCP_EB_FEATURE_MULTIBOOT, 1 );
42 42
 
@@ -242,7 +242,7 @@ static struct multiboot_info __bss16 ( mbinfo );
242 242
 #define mbinfo __use_data16 ( mbinfo )
243 243
 
244 244
 /** The multiboot bootloader name */
245
-static char __data16_array ( mb_bootloader_name, [] ) = "gPXE " VERSION;
245
+static char __data16_array ( mb_bootloader_name, [] ) = "iPXE " VERSION;
246 246
 #define mb_bootloader_name __use_data16 ( mb_bootloader_name )
247 247
 
248 248
 /** The multiboot memory map */

+ 7
- 7
src/arch/i386/image/nbi.c ファイルの表示

@@ -4,13 +4,13 @@
4 4
 #include <gateA20.h>
5 5
 #include <memsizes.h>
6 6
 #include <basemem_packet.h>
7
-#include <gpxe/uaccess.h>
8
-#include <gpxe/segment.h>
9
-#include <gpxe/init.h>
10
-#include <gpxe/netdevice.h>
11
-#include <gpxe/fakedhcp.h>
12
-#include <gpxe/image.h>
13
-#include <gpxe/features.h>
7
+#include <ipxe/uaccess.h>
8
+#include <ipxe/segment.h>
9
+#include <ipxe/init.h>
10
+#include <ipxe/netdevice.h>
11
+#include <ipxe/fakedhcp.h>
12
+#include <ipxe/image.h>
13
+#include <ipxe/features.h>
14 14
 
15 15
 /** @file
16 16
  *

+ 6
- 6
src/arch/i386/image/pxe_image.c ファイルの表示

@@ -27,11 +27,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
27 27
 
28 28
 #include <pxe.h>
29 29
 #include <pxe_call.h>
30
-#include <gpxe/uaccess.h>
31
-#include <gpxe/image.h>
32
-#include <gpxe/segment.h>
33
-#include <gpxe/netdevice.h>
34
-#include <gpxe/features.h>
30
+#include <ipxe/uaccess.h>
31
+#include <ipxe/image.h>
32
+#include <ipxe/segment.h>
33
+#include <ipxe/netdevice.h>
34
+#include <ipxe/features.h>
35 35
 
36 36
 FEATURE ( FEATURE_IMAGE, "PXE", DHCP_EB_FEATURE_PXE, 1 );
37 37
 
@@ -87,7 +87,7 @@ int pxe_load ( struct image *image ) {
87 87
 		return -ENOEXEC;
88 88
 
89 89
 	/* Rejecting zero-length images is also useful, since these
90
-	 * end up looking to the user like bugs in gPXE.
90
+	 * end up looking to the user like bugs in iPXE.
91 91
 	 */
92 92
 	if ( ! filesz )
93 93
 		return -ENOEXEC;

+ 1
- 1
src/arch/i386/include/bits/io.h ファイルの表示

@@ -9,6 +9,6 @@
9 9
 
10 10
 FILE_LICENCE ( GPL2_OR_LATER );
11 11
 
12
-#include <gpxe/x86_io.h>
12
+#include <ipxe/x86_io.h>
13 13
 
14 14
 #endif /* _BITS_IO_H */

+ 2
- 2
src/arch/i386/include/bits/nap.h ファイルの表示

@@ -9,7 +9,7 @@
9 9
 
10 10
 FILE_LICENCE ( GPL2_OR_LATER );
11 11
 
12
-#include <gpxe/bios_nap.h>
13
-#include <gpxe/efi/efix86_nap.h>
12
+#include <ipxe/bios_nap.h>
13
+#include <ipxe/efi/efix86_nap.h>
14 14
 
15 15
 #endif /* _BITS_MAP_H */

+ 1
- 1
src/arch/i386/include/bits/smbios.h ファイルの表示

@@ -9,6 +9,6 @@
9 9
 
10 10
 FILE_LICENCE ( GPL2_OR_LATER );
11 11
 
12
-#include <gpxe/bios_smbios.h>
12
+#include <ipxe/bios_smbios.h>
13 13
 
14 14
 #endif /* _BITS_SMBIOS_H */

+ 2
- 2
src/arch/i386/include/bits/timer.h ファイルの表示

@@ -9,7 +9,7 @@
9 9
 
10 10
 FILE_LICENCE ( GPL2_OR_LATER );
11 11
 
12
-#include <gpxe/bios_timer.h>
13
-#include <gpxe/rdtsc_timer.h>
12
+#include <ipxe/bios_timer.h>
13
+#include <ipxe/rdtsc_timer.h>
14 14
 
15 15
 #endif /* _BITS_TIMER_H */

+ 1
- 1
src/arch/i386/include/bits/umalloc.h ファイルの表示

@@ -9,6 +9,6 @@
9 9
 
10 10
 FILE_LICENCE ( GPL2_OR_LATER );
11 11
 
12
-#include <gpxe/memtop_umalloc.h>
12
+#include <ipxe/memtop_umalloc.h>
13 13
 
14 14
 #endif /* _BITS_UMALLOC_H */

+ 2
- 2
src/arch/i386/include/bzimage.h ファイルの表示

@@ -86,11 +86,11 @@ struct bzimage_header {
86 86
 /** bzImage boot loader identifier for Etherboot */
87 87
 #define BZI_LOADER_TYPE_ETHERBOOT 0x40
88 88
 
89
-/** bzImage boot loader identifier for gPXE
89
+/** bzImage boot loader identifier for iPXE
90 90
  *
91 91
  * We advertise ourselves as Etherboot version 6.
92 92
  */
93
-#define BZI_LOADER_TYPE_GPXE ( BZI_LOADER_TYPE_ETHERBOOT | 0x06 )
93
+#define BZI_LOADER_TYPE_IPXE ( BZI_LOADER_TYPE_ETHERBOOT | 0x06 )
94 94
 
95 95
 /** bzImage "load high" flag */
96 96
 #define BZI_LOAD_HIGH 0x01

+ 1
- 1
src/arch/i386/include/comboot.h ファイルの表示

@@ -11,7 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <setjmp.h>
14
-#include <gpxe/in.h>
14
+#include <ipxe/in.h>
15 15
 
16 16
 /** Segment used for COMBOOT PSP and image */
17 17
 #define COMBOOT_PSP_SEG 0x07C0

+ 1
- 1
src/arch/i386/include/int13.h ファイルの表示

@@ -10,7 +10,7 @@
10 10
 FILE_LICENCE ( GPL2_OR_LATER );
11 11
 
12 12
 #include <stdint.h>
13
-#include <gpxe/list.h>
13
+#include <ipxe/list.h>
14 14
 #include <realmode.h>
15 15
 
16 16
 struct block_device;

src/arch/i386/include/gpxe/abft.h → src/arch/i386/include/ipxe/abft.h ファイルの表示

@@ -1,5 +1,5 @@
1
-#ifndef _GPXE_ABFT_H
2
-#define _GPXE_ABFT_H
1
+#ifndef _IPXE_ABFT_H
2
+#define _IPXE_ABFT_H
3 3
 
4 4
 /** @file
5 5
  *
@@ -10,8 +10,8 @@
10 10
 FILE_LICENCE ( GPL2_OR_LATER );
11 11
 
12 12
 #include <stdint.h>
13
-#include <gpxe/acpi.h>
14
-#include <gpxe/if_ether.h>
13
+#include <ipxe/acpi.h>
14
+#include <ipxe/if_ether.h>
15 15
 
16 16
 /** AoE boot firmware table signature */
17 17
 #define ABFT_SIG "aBFT"
@@ -34,4 +34,4 @@ struct abft_table {
34 34
 
35 35
 extern void abft_fill_data ( struct aoe_session *aoe );
36 36
 
37
-#endif /* _GPXE_ABFT_H */
37
+#endif /* _IPXE_ABFT_H */

src/arch/i386/include/gpxe/bios_nap.h → src/arch/i386/include/ipxe/bios_nap.h ファイルの表示

@@ -1,5 +1,5 @@
1
-#ifndef _GPXE_BIOS_NAP_H
2
-#define _GPXE_BIOS_NAP_H
1
+#ifndef _IPXE_BIOS_NAP_H
2
+#define _IPXE_BIOS_NAP_H
3 3
 
4 4
 /** @file
5 5
  *
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
15 15
 #define NAP_PREFIX_pcbios __pcbios_
16 16
 #endif
17 17
 
18
-#endif /* _GPXE_BIOS_NAP_H */
18
+#endif /* _IPXE_BIOS_NAP_H */

src/arch/i386/include/gpxe/bios_smbios.h → src/arch/i386/include/ipxe/bios_smbios.h ファイルの表示

@@ -1,5 +1,5 @@
1
-#ifndef _GPXE_BIOS_SMBIOS_H
2
-#define _GPXE_BIOS_SMBIOS_H
1
+#ifndef _IPXE_BIOS_SMBIOS_H
2
+#define _IPXE_BIOS_SMBIOS_H
3 3
 
4 4
 /** @file
5 5
  *
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
15 15
 #define SMBIOS_PREFIX_pcbios __pcbios_
16 16
 #endif
17 17
 
18
-#endif /* _GPXE_BIOS_SMBIOS_H */
18
+#endif /* _IPXE_BIOS_SMBIOS_H */

src/arch/i386/include/gpxe/bios_timer.h → src/arch/i386/include/ipxe/bios_timer.h ファイルの表示

@@ -1,5 +1,5 @@
1
-#ifndef _GPXE_BIOS_TIMER_H
2
-#define _GPXE_BIOS_TIMER_H
1
+#ifndef _IPXE_BIOS_TIMER_H
2
+#define _IPXE_BIOS_TIMER_H
3 3
 
4 4
 /** @file
5 5
  *
@@ -15,7 +15,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
15 15
 #define TIMER_PREFIX_pcbios __pcbios_
16 16
 #endif
17 17
 
18
-#include <gpxe/timer2.h>
18
+#include <ipxe/timer2.h>
19 19
 
20 20
 /**
21 21
  * Delay for a fixed number of microseconds
@@ -41,4 +41,4 @@ TIMER_INLINE ( pcbios, ticks_per_sec ) ( void ) {
41 41
 	return 18;
42 42
 }
43 43
 
44
-#endif /* _GPXE_BIOS_TIMER_H */
44
+#endif /* _IPXE_BIOS_TIMER_H */

src/arch/i386/include/gpxe/ibft.h → src/arch/i386/include/ipxe/ibft.h ファイルの表示

@@ -1,5 +1,5 @@
1
-#ifndef _GPXE_IBFT_H
2
-#define _GPXE_IBFT_H
1
+#ifndef _IPXE_IBFT_H
2
+#define _IPXE_IBFT_H
3 3
 
4 4
 /*
5 5
  * Copyright Fen Systems Ltd. 2007.  Portions of this code are derived
@@ -42,8 +42,8 @@ FILE_LICENCE ( BSD2 );
42 42
  */
43 43
 
44 44
 #include <stdint.h>
45
-#include <gpxe/acpi.h>
46
-#include <gpxe/in.h>
45
+#include <ipxe/acpi.h>
46
+#include <ipxe/in.h>
47 47
 
48 48
 /** iSCSI Boot Firmware Table signature */
49 49
 #define IBFT_SIG "iBFT"
@@ -273,14 +273,14 @@ struct ibft_string_block {
273 273
 	unsigned int offset;
274 274
 };
275 275
 
276
-/** Amount of space reserved for strings in a gPXE iBFT */
276
+/** Amount of space reserved for strings in a iPXE iBFT */
277 277
 #define IBFT_STRINGS_SIZE 384
278 278
 
279 279
 /**
280
- * An iBFT created by gPXE
280
+ * An iBFT created by iPXE
281 281
  *
282 282
  */
283
-struct gpxe_ibft {
283
+struct ipxe_ibft {
284 284
 	/** The fixed section */
285 285
 	struct ibft_table table;
286 286
 	/** The Initiator section */
@@ -299,4 +299,4 @@ struct iscsi_session;
299 299
 extern int ibft_fill_data ( struct net_device *netdev,
300 300
 			    struct iscsi_session *iscsi );
301 301
 
302
-#endif /* _GPXE_IBFT_H */
302
+#endif /* _IPXE_IBFT_H */

src/arch/i386/include/gpxe/memtop_umalloc.h → src/arch/i386/include/ipxe/memtop_umalloc.h ファイルの表示

@@ -1,5 +1,5 @@
1
-#ifndef _GPXE_MEMTOP_UMALLOC_H
2
-#define _GPXE_MEMTOP_UMALLOC_H
1
+#ifndef _IPXE_MEMTOP_UMALLOC_H
2
+#define _IPXE_MEMTOP_UMALLOC_H
3 3
 
4 4
 /** @file
5 5
  *
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
15 15
 #define UMALLOC_PREFIX_memtop __memtop_
16 16
 #endif
17 17
 
18
-#endif /* _GPXE_MEMTOP_UMALLOC_H */
18
+#endif /* _IPXE_MEMTOP_UMALLOC_H */

src/arch/i386/include/gpxe/rdtsc_timer.h → src/arch/i386/include/ipxe/rdtsc_timer.h ファイルの表示

@@ -1,5 +1,5 @@
1
-#ifndef _GPXE_RDTSC_TIMER_H
2
-#define _GPXE_RDTSC_TIMER_H
1
+#ifndef _IPXE_RDTSC_TIMER_H
2
+#define _IPXE_RDTSC_TIMER_H
3 3
 
4 4
 /** @file
5 5
  *
@@ -36,4 +36,4 @@ TIMER_INLINE ( rdtsc, currticks ) ( void ) {
36 36
 	return ticks;
37 37
 }
38 38
 
39
-#endif /* _GPXE_RDTSC_TIMER_H */
39
+#endif /* _IPXE_RDTSC_TIMER_H */

src/arch/i386/include/gpxe/sbft.h → src/arch/i386/include/ipxe/sbft.h ファイルの表示

@@ -1,5 +1,5 @@
1
-#ifndef _GPXE_SBFT_H
2
-#define _GPXE_SBFT_H
1
+#ifndef _IPXE_SBFT_H
2
+#define _IPXE_SBFT_H
3 3
 
4 4
 /*
5 5
  * Copyright (C) 2009 Fen Systems Ltd <mbrown@fensystems.co.uk>.
@@ -40,15 +40,15 @@ FILE_LICENCE ( BSD2 );
40 40
  * The working draft specification for the SRP boot firmware table can
41 41
  * be found at
42 42
  *
43
- *   http://etherboot.org/wiki/srp/sbft
43
+ *   http://ipxe.org/wiki/srp/sbft
44 44
  *
45 45
  */
46 46
 
47 47
 #include <stdint.h>
48
-#include <gpxe/acpi.h>
49
-#include <gpxe/scsi.h>
50
-#include <gpxe/srp.h>
51
-#include <gpxe/ib_srp.h>
48
+#include <ipxe/acpi.h>
49
+#include <ipxe/scsi.h>
50
+#include <ipxe/srp.h>
51
+#include <ipxe/ib_srp.h>
52 52
 
53 53
 /** SRP Boot Firmware Table signature */
54 54
 #define SBFT_SIG "sBFT"
@@ -105,9 +105,9 @@ struct sbft_ib_subtable {
105 105
 } __attribute__ (( packed ));
106 106
 
107 107
 /**
108
- * An sBFT created by gPXE
108
+ * An sBFT created by iPXE
109 109
  */
110
-struct gpxe_sbft {
110
+struct ipxe_sbft {
111 111
 	/** The table header */
112 112
 	struct sbft_table table;
113 113
 	/** The SCSI subtable */
@@ -122,4 +122,4 @@ struct srp_device;
122 122
 
123 123
 extern int sbft_fill_data ( struct srp_device *srp );
124 124
 
125
-#endif /* _GPXE_SBFT_H */
125
+#endif /* _IPXE_SBFT_H */

src/arch/i386/include/gpxe/timer2.h → src/arch/i386/include/ipxe/timer2.h ファイルの表示

@@ -1,5 +1,5 @@
1
-#ifndef _GPXE_TIMER2_H
2
-#define _GPXE_TIMER2_H
1
+#ifndef _IPXE_TIMER2_H
2
+#define _IPXE_TIMER2_H
3 3
 
4 4
 /** @file
5 5
  *
@@ -11,4 +11,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
11 11
 
12 12
 extern void timer2_udelay ( unsigned long usecs );
13 13
 
14
-#endif /* _GPXE_TIMER2_H */
14
+#endif /* _IPXE_TIMER2_H */

src/arch/i386/include/gpxe/x86_io.h → src/arch/i386/include/ipxe/x86_io.h ファイルの表示

@@ -1,9 +1,9 @@
1
-#ifndef _GPXE_X86_IO_H
2
-#define _GPXE_X86_IO_H
1
+#ifndef _IPXE_X86_IO_H
2
+#define _IPXE_X86_IO_H
3 3
 
4 4
 /** @file
5 5
  *
6
- * gPXE I/O API for x86
6
+ * iPXE I/O API for x86
7 7
  *
8 8
  * i386 uses direct pointer dereferences for accesses to memory-mapped
9 9
  * I/O space, and the inX/outX instructions for accesses to
@@ -150,4 +150,4 @@ IOAPI_INLINE ( x86, mb ) ( void ) {
150 150
 	__asm__ __volatile__ ( "lock; addl $0, 0(%%esp)" : : : "memory" );
151 151
 }
152 152
 
153
-#endif /* _GPXE_X86_IO_H */
153
+#endif /* _IPXE_X86_IO_H */

+ 1
- 1
src/arch/i386/include/pxe.h ファイルの表示

@@ -5,7 +5,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
5 5
 
6 6
 #include "pxe_types.h"
7 7
 #include "pxe_api.h"
8
-#include <gpxe/device.h>
8
+#include <ipxe/device.h>
9 9
 
10 10
 /* Parameter block for pxenv_unknown() */
11 11
 struct s_PXENV_UNKNOWN {

+ 1
- 1
src/arch/i386/include/realmode.h ファイルの表示

@@ -3,7 +3,7 @@
3 3
 
4 4
 #include <stdint.h>
5 5
 #include <registers.h>
6
-#include <gpxe/uaccess.h>
6
+#include <ipxe/uaccess.h>
7 7
 
8 8
 /*
9 9
  * Data structures and type definitions

+ 1
- 1
src/arch/i386/include/undi.h ファイルの表示

@@ -11,7 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
11 11
 
12 12
 #ifndef ASSEMBLY
13 13
 
14
-#include <gpxe/device.h>
14
+#include <ipxe/device.h>
15 15
 #include <pxe_types.h>
16 16
 
17 17
 /** An UNDI device

+ 5
- 5
src/arch/i386/interface/pcbios/abft.c ファイルの表示

@@ -19,9 +19,9 @@
19 19
 FILE_LICENCE ( GPL2_OR_LATER );
20 20
 
21 21
 #include <realmode.h>
22
-#include <gpxe/aoe.h>
23
-#include <gpxe/netdevice.h>
24
-#include <gpxe/abft.h>
22
+#include <ipxe/aoe.h>
23
+#include <ipxe/netdevice.h>
24
+#include <ipxe/abft.h>
25 25
 
26 26
 /** @file
27 27
  *
@@ -30,7 +30,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
30 30
  */
31 31
 
32 32
 #define abftab __use_data16 ( abftab )
33
-/** The aBFT used by gPXE */
33
+/** The aBFT used by iPXE */
34 34
 struct abft_table __data16 ( abftab ) __attribute__ (( aligned ( 16 ) )) = {
35 35
 	/* ACPI header */
36 36
 	.acpi = {
@@ -38,7 +38,7 @@ struct abft_table __data16 ( abftab ) __attribute__ (( aligned ( 16 ) )) = {
38 38
 		.length = sizeof ( abftab ),
39 39
 		.revision = 1,
40 40
 		.oem_id = "FENSYS",
41
-		.oem_table_id = "gPXE",
41
+		.oem_table_id = "iPXE",
42 42
 	},
43 43
 };
44 44
 

+ 5
- 5
src/arch/i386/interface/pcbios/aoeboot.c ファイルの表示

@@ -3,11 +3,11 @@
3 3
 #include <stdlib.h>
4 4
 #include <stdio.h>
5 5
 #include <errno.h>
6
-#include <gpxe/aoe.h>
7
-#include <gpxe/ata.h>
8
-#include <gpxe/netdevice.h>
9
-#include <gpxe/sanboot.h>
10
-#include <gpxe/abft.h>
6
+#include <ipxe/aoe.h>
7
+#include <ipxe/ata.h>
8
+#include <ipxe/netdevice.h>
9
+#include <ipxe/sanboot.h>
10
+#include <ipxe/abft.h>
11 11
 #include <int13.h>
12 12
 
13 13
 FILE_LICENCE ( GPL2_OR_LATER );

+ 1
- 1
src/arch/i386/interface/pcbios/bios_nap.c ファイルの表示

@@ -1,4 +1,4 @@
1
-#include <gpxe/nap.h>
1
+#include <ipxe/nap.h>
2 2
 #include <realmode.h>
3 3
 
4 4
 FILE_LICENCE ( GPL2_OR_LATER );

+ 2
- 2
src/arch/i386/interface/pcbios/bios_smbios.c ファイルの表示

@@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
22 22
 #include <string.h>
23 23
 #include <errno.h>
24 24
 #include <assert.h>
25
-#include <gpxe/uaccess.h>
26
-#include <gpxe/smbios.h>
25
+#include <ipxe/uaccess.h>
26
+#include <ipxe/smbios.h>
27 27
 #include <realmode.h>
28 28
 #include <pnpbios.h>
29 29
 

+ 1
- 1
src/arch/i386/interface/pcbios/bios_timer.c ファイルの表示

@@ -24,7 +24,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
24 24
  *
25 25
  */
26 26
 
27
-#include <gpxe/timer.h>
27
+#include <ipxe/timer.h>
28 28
 #include <realmode.h>
29 29
 #include <bios.h>
30 30
 

+ 3
- 3
src/arch/i386/interface/pcbios/ib_srpboot.c ファイルの表示

@@ -3,10 +3,10 @@
3 3
 #include <stdlib.h>
4 4
 #include <stdio.h>
5 5
 #include <errno.h>
6
-#include <gpxe/sanboot.h>
6
+#include <ipxe/sanboot.h>
7 7
 #include <int13.h>
8
-#include <gpxe/srp.h>
9
-#include <gpxe/sbft.h>
8
+#include <ipxe/srp.h>
9
+#include <ipxe/sbft.h>
10 10
 
11 11
 FILE_LICENCE ( GPL2_OR_LATER );
12 12
 

+ 11
- 11
src/arch/i386/interface/pcbios/ibft.c ファイルの表示

@@ -33,14 +33,14 @@ FILE_LICENCE ( BSD2 );
33 33
 #include <errno.h>
34 34
 #include <byteswap.h>
35 35
 #include <realmode.h>
36
-#include <gpxe/pci.h>
37
-#include <gpxe/acpi.h>
38
-#include <gpxe/in.h>
39
-#include <gpxe/netdevice.h>
40
-#include <gpxe/ethernet.h>
41
-#include <gpxe/dhcp.h>
42
-#include <gpxe/iscsi.h>
43
-#include <gpxe/ibft.h>
36
+#include <ipxe/pci.h>
37
+#include <ipxe/acpi.h>
38
+#include <ipxe/in.h>
39
+#include <ipxe/netdevice.h>
40
+#include <ipxe/ethernet.h>
41
+#include <ipxe/dhcp.h>
42
+#include <ipxe/iscsi.h>
43
+#include <ipxe/ibft.h>
44 44
 
45 45
 /** @file
46 46
  *
@@ -54,8 +54,8 @@ FILE_LICENCE ( BSD2 );
54 54
  */
55 55
 
56 56
 #define ibftab __use_data16 ( ibftab )
57
-/** The iBFT used by gPXE */
58
-struct gpxe_ibft __data16 ( ibftab ) = {
57
+/** The iBFT used by iPXE */
58
+struct ipxe_ibft __data16 ( ibftab ) = {
59 59
 	/* Table header */
60 60
 	.table = {
61 61
 		/* ACPI header */
@@ -64,7 +64,7 @@ struct gpxe_ibft __data16 ( ibftab ) = {
64 64
 			.length = sizeof ( ibftab ),
65 65
 			.revision = 1,
66 66
 			.oem_id = "FENSYS",
67
-			.oem_table_id = "gPXE",
67
+			.oem_table_id = "iPXE",
68 68
 		},
69 69
 		/* Control block */
70 70
 		.control = {

+ 3
- 3
src/arch/i386/interface/pcbios/int13.c ファイルの表示

@@ -23,9 +23,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
23 23
 #include <byteswap.h>
24 24
 #include <errno.h>
25 25
 #include <assert.h>
26
-#include <gpxe/list.h>
27
-#include <gpxe/blockdev.h>
28
-#include <gpxe/memmap.h>
26
+#include <ipxe/list.h>
27
+#include <ipxe/blockdev.h>
28
+#include <ipxe/memmap.h>
29 29
 #include <realmode.h>
30 30
 #include <bios.h>
31 31
 #include <biosint.h>

+ 4
- 4
src/arch/i386/interface/pcbios/iscsiboot.c ファイルの表示

@@ -3,10 +3,10 @@
3 3
 #include <stdlib.h>
4 4
 #include <stdio.h>
5 5
 #include <errno.h>
6
-#include <gpxe/iscsi.h>
7
-#include <gpxe/netdevice.h>
8
-#include <gpxe/ibft.h>
9
-#include <gpxe/sanboot.h>
6
+#include <ipxe/iscsi.h>
7
+#include <ipxe/netdevice.h>
8
+#include <ipxe/ibft.h>
9
+#include <ipxe/sanboot.h>
10 10
 #include <int13.h>
11 11
 
12 12
 FILE_LICENCE ( GPL2_OR_LATER );

+ 4
- 4
src/arch/i386/interface/pcbios/keepsan.c ファイルの表示

@@ -1,9 +1,9 @@
1 1
 #include <stdint.h>
2 2
 #include <stdio.h>
3
-#include <gpxe/settings.h>
4
-#include <gpxe/dhcp.h>
5
-#include <gpxe/init.h>
6
-#include <gpxe/sanboot.h>
3
+#include <ipxe/settings.h>
4
+#include <ipxe/dhcp.h>
5
+#include <ipxe/init.h>
6
+#include <ipxe/sanboot.h>
7 7
 #include <usr/autoboot.h>
8 8
 
9 9
 struct setting keep_san_setting __setting = {

+ 4
- 4
src/arch/i386/interface/pcbios/memtop_umalloc.c ファイルの表示

@@ -27,10 +27,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
27 27
 
28 28
 #include <limits.h>
29 29
 #include <errno.h>
30
-#include <gpxe/uaccess.h>
31
-#include <gpxe/hidemem.h>
32
-#include <gpxe/memmap.h>
33
-#include <gpxe/umalloc.h>
30
+#include <ipxe/uaccess.h>
31
+#include <ipxe/hidemem.h>
32
+#include <ipxe/memmap.h>
33
+#include <ipxe/umalloc.h>
34 34
 
35 35
 /** Alignment of external allocated memory */
36 36
 #define EM_ALIGN ( 4 * 1024 )

+ 1
- 1
src/arch/i386/interface/pcbios/pcibios.c ファイルの表示

@@ -19,7 +19,7 @@
19 19
 FILE_LICENCE ( GPL2_OR_LATER );
20 20
 
21 21
 #include <stdint.h>
22
-#include <gpxe/pci.h>
22
+#include <ipxe/pci.h>
23 23
 #include <realmode.h>
24 24
 
25 25
 /** @file

+ 7
- 7
src/arch/i386/interface/pcbios/sbft.c ファイルの表示

@@ -38,14 +38,14 @@ FILE_LICENCE ( BSD2 );
38 38
 
39 39
 #include <assert.h>
40 40
 #include <realmode.h>
41
-#include <gpxe/srp.h>
42
-#include <gpxe/ib_srp.h>
43
-#include <gpxe/acpi.h>
44
-#include <gpxe/sbft.h>
41
+#include <ipxe/srp.h>
42
+#include <ipxe/ib_srp.h>
43
+#include <ipxe/acpi.h>
44
+#include <ipxe/sbft.h>
45 45
 
46 46
 #define sbftab __use_data16 ( sbftab )
47
-/** The sBFT used by gPXE */
48
-struct gpxe_sbft __data16 ( sbftab ) = {
47
+/** The sBFT used by iPXE */
48
+struct ipxe_sbft __data16 ( sbftab ) = {
49 49
 	/* Table header */
50 50
 	.table = {
51 51
 		/* ACPI header */
@@ -54,7 +54,7 @@ struct gpxe_sbft __data16 ( sbftab ) = {
54 54
 			.length = sizeof ( sbftab ),
55 55
 			.revision = 1,
56 56
 			.oem_id = "FENSYS",
57
-			.oem_table_id = "gPXE",
57
+			.oem_table_id = "iPXE",
58 58
 		},
59 59
 		.scsi_offset = offsetof ( typeof ( sbftab ), scsi ),
60 60
 		.srp_offset = offsetof ( typeof ( sbftab ), srp ),

+ 2
- 2
src/arch/i386/interface/pxe/pxe_call.c ファイルの表示

@@ -18,8 +18,8 @@
18 18
 
19 19
 FILE_LICENCE ( GPL2_OR_LATER );
20 20
 
21
-#include <gpxe/uaccess.h>
22
-#include <gpxe/init.h>
21
+#include <ipxe/uaccess.h>
22
+#include <ipxe/init.h>
23 23
 #include <registers.h>
24 24
 #include <biosint.h>
25 25
 #include <pxe.h>

+ 1
- 1
src/arch/i386/interface/pxe/pxe_errors.c ファイルの表示

@@ -1,5 +1,5 @@
1 1
 #include <errno.h>
2
-#include <gpxe/errortab.h>
2
+#include <ipxe/errortab.h>
3 3
 
4 4
 /*
5 5
  * This table was generated from the relevant section of errno.h using

+ 5
- 5
src/arch/i386/interface/pxe/pxe_file.c ファイルの表示

@@ -8,9 +8,9 @@
8 8
 #include <stdio.h>
9 9
 #include <errno.h>
10 10
 #include <byteswap.h>
11
-#include <gpxe/uaccess.h>
12
-#include <gpxe/posix_io.h>
13
-#include <gpxe/features.h>
11
+#include <ipxe/uaccess.h>
12
+#include <ipxe/posix_io.h>
13
+#include <ipxe/features.h>
14 14
 #include <pxe.h>
15 15
 #include <realmode.h>
16 16
 
@@ -245,7 +245,7 @@ segoff_t __data16 ( pxe_exit_hook ) = { 0, 0 };
245 245
  * @ret #PXENV_EXIT_FAILURE		Command was not executed successfully
246 246
  * @ret s_PXENV_FILE_API_CHECK::Status	PXE status code
247 247
  * @ret s_PXENV_FILE_API_CHECK::Magic	Outbound magic number (0xe9c17b20)
248
- * @ret s_PXENV_FILE_API_CHECK::Provider "gPXE" (0x45585067)
248
+ * @ret s_PXENV_FILE_API_CHECK::Provider "iPXE" (0x45585067)
249 249
  * @ret s_PXENV_FILE_API_CHECK::APIMask API function bitmask
250 250
  * @ret s_PXENV_FILE_API_CHECK::Flags	Reserved
251 251
  *
@@ -264,7 +264,7 @@ PXENV_EXIT_t pxenv_file_api_check ( struct s_PXENV_FILE_API_CHECK *file_api_chec
264 264
 		file_api_check->Status   = PXENV_STATUS_SUCCESS;
265 265
 		file_api_check->Size     = sizeof(struct s_PXENV_FILE_API_CHECK);
266 266
 		file_api_check->Magic    = 0xe9c17b20;
267
-		file_api_check->Provider = 0x45585067; /* "gPXE" */
267
+		file_api_check->Provider = 0x45585067; /* "iPXE" */
268 268
 		file_api_check->APIMask  = 0x0000007f; /* Functions e0-e6 */
269 269
 		/* Check to see if we have a PXE exit hook */
270 270
 		if ( pxe_exit_hook.segment | pxe_exit_hook.offset )

+ 1
- 1
src/arch/i386/interface/pxe/pxe_loader.c ファイルの表示

@@ -18,7 +18,7 @@
18 18
 
19 19
 FILE_LICENCE ( GPL2_OR_LATER );
20 20
 
21
-#include <gpxe/init.h>
21
+#include <ipxe/init.h>
22 22
 #include "pxe.h"
23 23
 #include "pxe_call.h"
24 24
 

+ 8
- 8
src/arch/i386/interface/pxe/pxe_preboot.c ファイルの表示

@@ -28,14 +28,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
28 28
 #include <stdint.h>
29 29
 #include <string.h>
30 30
 #include <stdlib.h>
31
-#include <gpxe/uaccess.h>
32
-#include <gpxe/dhcp.h>
33
-#include <gpxe/fakedhcp.h>
34
-#include <gpxe/device.h>
35
-#include <gpxe/netdevice.h>
36
-#include <gpxe/isapnp.h>
37
-#include <gpxe/init.h>
38
-#include <gpxe/if_ether.h>
31
+#include <ipxe/uaccess.h>
32
+#include <ipxe/dhcp.h>
33
+#include <ipxe/fakedhcp.h>
34
+#include <ipxe/device.h>
35
+#include <ipxe/netdevice.h>
36
+#include <ipxe/isapnp.h>
37
+#include <ipxe/init.h>
38
+#include <ipxe/if_ether.h>
39 39
 #include <basemem_packet.h>
40 40
 #include <biosint.h>
41 41
 #include "pxe.h"

+ 6
- 6
src/arch/i386/interface/pxe/pxe_tftp.c ファイルの表示

@@ -28,12 +28,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
28 28
 #include <stdio.h>
29 29
 #include <errno.h>
30 30
 #include <byteswap.h>
31
-#include <gpxe/uaccess.h>
32
-#include <gpxe/in.h>
33
-#include <gpxe/tftp.h>
34
-#include <gpxe/xfer.h>
35
-#include <gpxe/open.h>
36
-#include <gpxe/process.h>
31
+#include <ipxe/uaccess.h>
32
+#include <ipxe/in.h>
33
+#include <ipxe/tftp.h>
34
+#include <ipxe/xfer.h>
35
+#include <ipxe/open.h>
36
+#include <ipxe/process.h>
37 37
 #include <pxe.h>
38 38
 
39 39
 /** A PXE TFTP connection */

+ 4
- 4
src/arch/i386/interface/pxe/pxe_udp.c ファイルの表示

@@ -6,10 +6,10 @@
6 6
 
7 7
 #include <string.h>
8 8
 #include <byteswap.h>
9
-#include <gpxe/xfer.h>
10
-#include <gpxe/udp.h>
11
-#include <gpxe/uaccess.h>
12
-#include <gpxe/process.h>
9
+#include <ipxe/xfer.h>
10
+#include <ipxe/udp.h>
11
+#include <ipxe/uaccess.h>
12
+#include <ipxe/process.h>
13 13
 #include <pxe.h>
14 14
 
15 15
 /*

+ 8
- 8
src/arch/i386/interface/pxe/pxe_undi.c ファイルの表示

@@ -29,14 +29,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
29 29
 #include <string.h>
30 30
 #include <byteswap.h>
31 31
 #include <basemem_packet.h>
32
-#include <gpxe/netdevice.h>
33
-#include <gpxe/iobuf.h>
34
-#include <gpxe/device.h>
35
-#include <gpxe/pci.h>
36
-#include <gpxe/if_ether.h>
37
-#include <gpxe/ip.h>
38
-#include <gpxe/arp.h>
39
-#include <gpxe/rarp.h>
32
+#include <ipxe/netdevice.h>
33
+#include <ipxe/iobuf.h>
34
+#include <ipxe/device.h>
35
+#include <ipxe/pci.h>
36
+#include <ipxe/if_ether.h>
37
+#include <ipxe/ip.h>
38
+#include <ipxe/arp.h>
39
+#include <ipxe/rarp.h>
40 40
 #include "pxe.h"
41 41
 
42 42
 /**

+ 1
- 1
src/arch/i386/interface/pxeparent/pxeparent.c ファイルの表示

@@ -18,7 +18,7 @@
18 18
 
19 19
 FILE_LICENCE ( GPL2_OR_LATER );
20 20
 
21
-#include <gpxe/dhcp.h>
21
+#include <ipxe/dhcp.h>
22 22
 #include <pxeparent.h>
23 23
 #include <pxe_api.h>
24 24
 #include <pxe_types.h>

+ 2
- 2
src/arch/i386/interface/pxeparent/pxeparent_dhcp.c ファイルの表示

@@ -19,8 +19,8 @@
19 19
 FILE_LICENCE ( GPL2_OR_LATER );
20 20
 
21 21
 #include <string.h>
22
-#include <gpxe/dhcp.h>
23
-#include <gpxe/netdevice.h>
22
+#include <ipxe/dhcp.h>
23
+#include <ipxe/netdevice.h>
24 24
 #include <undipreload.h>
25 25
 #include <pxeparent.h>
26 26
 #include <realmode.h>

+ 1
- 1
src/arch/i386/interface/syslinux/com32_call.c ファイルの表示

@@ -27,7 +27,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
27 27
 #include <realmode.h>
28 28
 #include <comboot.h>
29 29
 #include <assert.h>
30
-#include <gpxe/uaccess.h>
30
+#include <ipxe/uaccess.h>
31 31
 
32 32
 static com32sys_t __bss16 ( com32_regs );
33 33
 #define com32_regs __use_data16 ( com32_regs )

+ 1
- 1
src/arch/i386/interface/syslinux/com32_wrapper.S ファイルの表示

@@ -82,7 +82,7 @@ com32_wrapper:
82 82
 
83 83
 	.data
84 84
 
85
-/* Internal gPXE virtual address space %esp */
85
+/* Internal iPXE virtual address space %esp */
86 86
 .globl com32_internal_esp
87 87
 .lcomm com32_internal_esp, 4
88 88
 

+ 11
- 11
src/arch/i386/interface/syslinux/comboot_call.c ファイルの表示

@@ -33,21 +33,21 @@ FILE_LICENCE ( GPL2_OR_LATER );
33 33
 #include <pxe_call.h>
34 34
 #include <setjmp.h>
35 35
 #include <string.h>
36
-#include <gpxe/posix_io.h>
37
-#include <gpxe/process.h>
38
-#include <gpxe/serial.h>
39
-#include <gpxe/init.h>
40
-#include <gpxe/image.h>
36
+#include <ipxe/posix_io.h>
37
+#include <ipxe/process.h>
38
+#include <ipxe/serial.h>
39
+#include <ipxe/init.h>
40
+#include <ipxe/image.h>
41 41
 #include <usr/imgmgmt.h>
42 42
 #include "config/console.h"
43 43
 #include "config/serial.h"
44 44
 
45 45
 /** The "SYSLINUX" version string */
46
-static char __data16_array ( syslinux_version, [] ) = "\r\ngPXE " VERSION;
46
+static char __data16_array ( syslinux_version, [] ) = "\r\niPXE " VERSION;
47 47
 #define syslinux_version __use_data16 ( syslinux_version )
48 48
 
49 49
 /** The "SYSLINUX" copyright string */
50
-static char __data16_array ( syslinux_copyright, [] ) = " http://etherboot.org";
50
+static char __data16_array ( syslinux_copyright, [] ) = " http://ipxe.org";
51 51
 #define syslinux_copyright __use_data16 ( syslinux_copyright )
52 52
 
53 53
 static char __data16_array ( syslinux_configuration_file, [] ) = "";
@@ -335,7 +335,7 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) {
335 335
 		ix86->regs.cl = 0; /* minor */
336 336
 
337 337
 		/* SYSLINUX derivative ID */
338
-		ix86->regs.dl = BZI_LOADER_TYPE_GPXE;
338
+		ix86->regs.dl = BZI_LOADER_TYPE_IPXE;
339 339
 
340 340
 		/* SYSLINUX version and copyright strings */
341 341
 		ix86->segs.es = rm_ds;
@@ -396,7 +396,7 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) {
396 396
 				break;
397 397
 			}
398 398
 
399
-			/* This relies on the fact that a gPXE POSIX fd will
399
+			/* This relies on the fact that a iPXE POSIX fd will
400 400
 			 * always fit in 16 bits.
401 401
 			 */
402 402
 #if (POSIX_FD_MAX > 65535)
@@ -453,9 +453,9 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) {
453 453
 
454 454
 	case 0x000A: /* Get Derivative-Specific Information */
455 455
 
456
-		/* gPXE has its own derivative ID, so there is no defined
456
+		/* iPXE has its own derivative ID, so there is no defined
457 457
 		 * output here; just return AL for now */
458
-		ix86->regs.al = BZI_LOADER_TYPE_GPXE;
458
+		ix86->regs.al = BZI_LOADER_TYPE_IPXE;
459 459
 		ix86->flags &= ~CF;
460 460
 		break;
461 461
 

+ 4
- 4
src/arch/i386/interface/syslinux/comboot_resolv.c ファイルの表示

@@ -1,9 +1,9 @@
1 1
 #include <errno.h>
2 2
 #include <comboot.h>
3
-#include <gpxe/in.h>
4
-#include <gpxe/list.h>
5
-#include <gpxe/process.h>
6
-#include <gpxe/resolv.h>
3
+#include <ipxe/in.h>
4
+#include <ipxe/list.h>
5
+#include <ipxe/process.h>
6
+#include <ipxe/resolv.h>
7 7
 
8 8
 FILE_LICENCE ( GPL2_OR_LATER );
9 9
 

+ 2
- 2
src/arch/i386/prefix/dskprefix.S ファイルの表示

@@ -355,7 +355,7 @@ msg1end:
355 355
 	.word 0xAA55
356 356
 
357 357
 start_runtime:
358
-	/* Install gPXE */
358
+	/* Install iPXE */
359 359
 	call	install
360 360
 
361 361
 	/* Set up real-mode stack */
@@ -373,7 +373,7 @@ start_runtime:
373 373
 	call	prot_call
374 374
 	popl	%ecx /* discard */
375 375
 
376
-	/* Uninstall gPXE */
376
+	/* Uninstall iPXE */
377 377
 	call	uninstall
378 378
 
379 379
 	/* Boot next device */

+ 3
- 3
src/arch/i386/prefix/hdprefix.S ファイルの表示

@@ -78,13 +78,13 @@ load_length:
78 78
 load_failed:
79 79
 	movw	$10f, %si
80 80
 	jmp	boot_error
81
-10:	.asciz	"Could not load gPXE\r\n"
81
+10:	.asciz	"Could not load iPXE\r\n"
82 82
 
83 83
 	.org 510
84 84
 	.byte 0x55, 0xaa
85 85
 
86 86
 start_image:
87
-	/* Install gPXE */
87
+	/* Install iPXE */
88 88
 	call	install
89 89
 
90 90
 	/* Set up real-mode stack */
@@ -102,7 +102,7 @@ start_image:
102 102
 	call	prot_call
103 103
 	popl	%ecx /* discard */
104 104
 
105
-	/* Uninstall gPXE */
105
+	/* Uninstall iPXE */
106 106
 	call	uninstall
107 107
 
108 108
 	/* Boot next device */

+ 4
- 4
src/arch/i386/prefix/lkrnprefix.S ファイルの表示

@@ -178,20 +178,20 @@ setup_code:
178 178
 	 * in the prefix, it doesn't matter: we just have to ensure that
179 179
 	 * %cs:0000 is where the start of the image *would* be.
180 180
 	 */
181
-	ljmp	$(SYSSEG-(PREFIXSIZE/16)), $run_gpxe
181
+	ljmp	$(SYSSEG-(PREFIXSIZE/16)), $run_ipxe
182 182
 
183 183
 
184 184
 	.org	PREFIXSIZE
185 185
 /*
186 186
 	We're now at the beginning of the kernel proper.
187 187
  */
188
-run_gpxe:
188
+run_ipxe:
189 189
 	/* Set up stack just below 0x7c00 */
190 190
 	xorw	%ax, %ax
191 191
 	movw	%ax, %ss
192 192
 	movw	$0x7c00, %sp
193 193
 
194
-	/* Install gPXE */
194
+	/* Install iPXE */
195 195
 	call	install
196 196
 
197 197
 	/* Set up real-mode stack */
@@ -209,7 +209,7 @@ run_gpxe:
209 209
 	call	prot_call
210 210
 	popl	%ecx /* discard */
211 211
 
212
-	/* Uninstall gPXE */
212
+	/* Uninstall iPXE */
213 213
 	call	uninstall
214 214
 
215 215
 	/* Boot next device */

+ 2
- 2
src/arch/i386/prefix/nbiprefix.S ファイルの表示

@@ -50,7 +50,7 @@ memlen:	.long	-512
50 50
  *****************************************************************************
51 51
  */
52 52
 entry:
53
-	/* Install gPXE */
53
+	/* Install iPXE */
54 54
 	call	install
55 55
 
56 56
 	/* Jump to .text16 segment */
@@ -64,7 +64,7 @@ entry:
64 64
 	call	prot_call
65 65
 	popl	%ecx /* discard */
66 66
 
67
-	/* Uninstall gPXE */
67
+	/* Uninstall iPXE */
68 68
 	call	uninstall
69 69
 
70 70
 	/* Reboot system */

+ 5
- 5
src/arch/i386/prefix/pxeprefix.S ファイルの表示

@@ -441,7 +441,7 @@ print_free_basemem:
441 441
  *****************************************************************************
442 442
  */	
443 443
 finished:
444
-	jmp	run_gpxe
444
+	jmp	run_ipxe
445 445
 
446 446
 /*****************************************************************************
447 447
  * Subroutine: print segment:offset address
@@ -686,12 +686,12 @@ flags:
686 686
 	.equ undi_device_size, ( . - undi_device )
687 687
 
688 688
 /*****************************************************************************
689
- * Run gPXE main code
689
+ * Run iPXE main code
690 690
  *****************************************************************************
691 691
  */
692 692
 	.section ".prefix"
693
-run_gpxe:
694
-	/* Install gPXE */
693
+run_ipxe:
694
+	/* Install iPXE */
695 695
 	call	install
696 696
 
697 697
 	/* Set up real-mode stack */
@@ -731,7 +731,7 @@ run_gpxe:
731 731
 	call	prot_call
732 732
 	popl	%ecx /* discard */
733 733
 
734
-	/* Uninstall gPXE */
734
+	/* Uninstall iPXE */
735 735
 	call	uninstall
736 736
 
737 737
 	/* Restore PXE stack */

+ 7
- 7
src/arch/i386/prefix/romprefix.S ファイルの表示

@@ -130,7 +130,7 @@ pnpheader:
130 130
 
131 131
 /* Manufacturer string */
132 132
 mfgstr:
133
-	.asciz	"http://etherboot.org"
133
+	.asciz	"http://ipxe.org"
134 134
 	.size mfgstr, . - mfgstr
135 135
 
136 136
 /* Product string
@@ -477,7 +477,7 @@ no_pmm:
477 477
 	call	print_message
478 478
 	popf
479 479
 	jnz	out
480
-	/* Ctrl-B was pressed: invoke gPXE.  The keypress will be
480
+	/* Ctrl-B was pressed: invoke iPXE.  The keypress will be
481 481
 	 * picked up by the initial shell prompt, and we will drop
482 482
 	 * into a shell.
483 483
 	 */
@@ -503,7 +503,7 @@ out:
503 503
  * strings PRODUCT_NAME and PRODUCT_SHORT_NAME in config/general.h.
504 504
  *
505 505
  * While nothing in the GPL prevents you from removing all references
506
- * to gPXE or http://etherboot.org, we prefer you not to do so.
506
+ * to iPXE or http://ipxe.org, we prefer you not to do so.
507 507
  *
508 508
  * If you have an OEM-mandated branding requirement that cannot be
509 509
  * satisfied simply by defining PRODUCT_NAME and PRODUCT_SHORT_NAME,
@@ -516,7 +516,7 @@ init_message:
516 516
 	.ascii	"\n"
517 517
 	.ascii	PRODUCT_NAME
518 518
 	.ascii	"\n"
519
-	.asciz	"gPXE (http://etherboot.org) - "
519
+	.asciz	"iPXE (http://ipxe.org) - "
520 520
 	.size	init_message, . - init_message
521 521
 init_message_pci:
522 522
 	.asciz	" PCI"
@@ -913,7 +913,7 @@ int19_entry:
913 913
 	call	print_message
914 914
 	popf
915 915
 	jz	1f
916
-	/* Leave keypress in buffer and start gPXE.  The keypress will
916
+	/* Leave keypress in buffer and start iPXE.  The keypress will
917 917
 	 * cause the usual initial Ctrl-B prompt to be skipped.
918 918
 	 */
919 919
 	pushw	%cs
@@ -972,7 +972,7 @@ exec:	/* Set %ds = %cs */
972 972
 	movw	%ax, %ss
973 973
 	movw	$0x7c00, %sp
974 974
 
975
-	/* Install gPXE */
975
+	/* Install iPXE */
976 976
 	movl	image_source, %esi
977 977
 	movl	decompress_to, %edi
978 978
 	call	alloc_basemem
@@ -993,7 +993,7 @@ exec:	/* Set %ds = %cs */
993 993
 	call	prot_call
994 994
 	popl	%ecx /* discard */
995 995
 
996
-	/* Uninstall gPXE */
996
+	/* Uninstall iPXE */
997 997
 	call	uninstall
998 998
 
999 999
 	/* Restore BIOS stack */

+ 0
- 0
src/arch/x86/core/pcidirect.c ファイルの表示


変更されたファイルが多すぎるため、一部のファイルは表示されません

読み込み中…
キャンセル
保存