aboutsummaryrefslogtreecommitdiffstats
path: root/gpxe/src/arch/i386/interface/pxe/pxe_call.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2009-03-11 19:46:35 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2009-03-11 19:46:35 -0700
commitd16e5e8e8ea526326ed6f8880464399624bfe171 (patch)
tree9d1eb354f74532c219d31607e28840c4ebde3103 /gpxe/src/arch/i386/interface/pxe/pxe_call.c
parent43224f02c231ed97a15d8300eaaf69ad8118d222 (diff)
downloadsyslinux.git-d16e5e8e8ea526326ed6f8880464399624bfe171.tar.gz
syslinux.git-d16e5e8e8ea526326ed6f8880464399624bfe171.tar.xz
syslinux.git-d16e5e8e8ea526326ed6f8880464399624bfe171.zip
Update gPXE to version 0.9.7syslinux-3.74-pre3
Diffstat (limited to 'gpxe/src/arch/i386/interface/pxe/pxe_call.c')
-rw-r--r--gpxe/src/arch/i386/interface/pxe/pxe_call.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/gpxe/src/arch/i386/interface/pxe/pxe_call.c b/gpxe/src/arch/i386/interface/pxe/pxe_call.c
index 04aaf3b2..06dee25c 100644
--- a/gpxe/src/arch/i386/interface/pxe/pxe_call.c
+++ b/gpxe/src/arch/i386/interface/pxe/pxe_call.c
@@ -433,22 +433,24 @@ void pxe_init_structures ( void ) {
* @ret rc Return status code
*/
int pxe_start_nbp ( void ) {
- int discard_b, discard_c;
+ int discard_b, discard_c, discard_d, discard_D;
uint16_t rc;
/* Far call to PXE NBP */
- __asm__ __volatile__ ( REAL_CODE ( "pushw %%cx\n\t"
- "pushw %%ax\n\t"
- "movw %%cx, %%es\n\t"
+ __asm__ __volatile__ ( REAL_CODE ( "movw %%cx, %%es\n\t"
+ "pushw %%es\n\t"
+ "pushw %%di\n\t"
"sti\n\t"
"lcall $0, $0x7c00\n\t"
"addw $4, %%sp\n\t" )
: "=a" ( rc ), "=b" ( discard_b ),
- "=c" ( discard_c )
- : "a" ( __from_text16 ( &ppxe ) ),
- "b" ( __from_text16 ( &pxenv ) ),
- "c" ( rm_cs )
- : "edx", "esi", "edi", "ebp", "memory" );
+ "=c" ( discard_c ), "=d" ( discard_d ),
+ "=D" ( discard_D )
+ : "a" ( 0 ), "b" ( __from_text16 ( &pxenv ) ),
+ "c" ( rm_cs ),
+ "d" ( virt_to_phys ( &pxenv ) ),
+ "D" ( __from_text16 ( &ppxe ) )
+ : "esi", "ebp", "memory" );
return rc;
}