diff options
| author | Michael Brown <mcb30@etherboot.org> | 2007-06-30 14:56:35 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2007-06-30 14:56:35 +0100 |
| commit | 8130443f9ffd64f48a756d440e11d0265925765e (patch) | |
| tree | b92c33226b361b83513fbbc1af2dc4e3d1d8c727 /src/interface | |
| parent | acd598b4f93473f1792686a8ab691c88f1d4d8e5 (diff) | |
| download | ipxe-8130443f9ffd64f48a756d440e11d0265925765e.zip ipxe-8130443f9ffd64f48a756d440e11d0265925765e.tar.gz ipxe-8130443f9ffd64f48a756d440e11d0265925765e.tar.bz2 | |
Separate out pxe_start_nbp() from pxe_image.c into pxe_call.c
Implement PXENV_RESTART_TFTP.
Diffstat (limited to 'src/interface')
| -rw-r--r-- | src/interface/pxe/pxe_preboot.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/interface/pxe/pxe_preboot.c b/src/interface/pxe/pxe_preboot.c index a1b1636..b1cc39c 100644 --- a/src/interface/pxe/pxe_preboot.c +++ b/src/interface/pxe/pxe_preboot.c @@ -30,7 +30,7 @@ #include <gpxe/dhcp.h> #include <dhcp_basemem.h> #include "pxe.h" -#include "pxe_callbacks.h" +#include "pxe_call.h" /** * UNLOAD BASE CODE STACK @@ -146,22 +146,21 @@ PXENV_EXIT_t pxenv_get_cached_info ( struct s_PXENV_GET_CACHED_INFO */ PXENV_EXIT_t pxenv_restart_tftp ( struct s_PXENV_TFTP_READ_FILE *restart_tftp ) { - DBG ( "PXENV_RESTART_TFTP" ); + PXENV_EXIT_t tftp_exit; + + DBG ( "PXENV_RESTART_TFTP " ); -#if 0 /* Words cannot describe the complete mismatch between the PXE * specification and any possible version of reality... */ - restart_tftp->Buffer = PXE_LOAD_ADDRESS; /* Fixed by spec, apparently */ - restart_tftp->BufferSize = get_free_base_memory() - PXE_LOAD_ADDRESS; /* Near enough */ - DBG ( "(" ); - tftp_exit = pxe_api_call ( PXENV_TFTP_READ_FILE, (union u_PXENV_ANY*)restart_tftp ); - DBG ( ")" ); - if ( tftp_exit != PXENV_EXIT_SUCCESS ) return tftp_exit; + restart_tftp->Buffer = PXE_LOAD_PHYS; /* Fixed by spec, apparently */ + restart_tftp->BufferSize = ( 0xa0000 - PXE_LOAD_PHYS ); /* Near enough */ + tftp_exit = pxenv_tftp_read_file ( restart_tftp ); + if ( tftp_exit != PXENV_EXIT_SUCCESS ) + return tftp_exit; /* Fire up the new NBP */ - restart_tftp->Status = xstartpxe(); -#endif + restart_tftp->Status = pxe_start_nbp(); /* Not sure what "SUCCESS" actually means, since we can only * return if the new NBP failed to boot... |