summaryrefslogtreecommitdiffstats
path: root/src/arch/i386/drivers/net
diff options
context:
space:
mode:
authorMichael Brown2009-03-10 18:50:01 +0100
committerMichael Brown2009-03-26 08:27:19 +0100
commit1c67623e37dada045e9b5d1f5e19b414cc79c3e3 (patch)
tree6baaac3371a85232dbfe0faa5e7530eb76fa7413 /src/arch/i386/drivers/net
parent[3c90x] Remove src/drivers/3c90x.txt (diff)
downloadipxe-1c67623e37dada045e9b5d1f5e19b414cc79c3e3.tar.gz
ipxe-1c67623e37dada045e9b5d1f5e19b414cc79c3e3.tar.xz
ipxe-1c67623e37dada045e9b5d1f5e19b414cc79c3e3.zip
[build] Enable building with the Intel C compiler (icc)
Diffstat (limited to 'src/arch/i386/drivers/net')
-rw-r--r--src/arch/i386/drivers/net/undiload.c5
-rw-r--r--src/arch/i386/drivers/net/undinet.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/arch/i386/drivers/net/undiload.c b/src/arch/i386/drivers/net/undiload.c
index dbd9e7c2..6f34404b 100644
--- a/src/arch/i386/drivers/net/undiload.c
+++ b/src/arch/i386/drivers/net/undiload.c
@@ -90,11 +90,10 @@ int undi_load ( struct undi_device *undi, struct undi_rom *undirom ) {
undi_loader_entry = undirom->loader_entry;
__asm__ __volatile__ ( REAL_CODE ( "pushw %%ds\n\t"
"pushw %%ax\n\t"
- "lcall *%c2\n\t"
+ "lcall *undi_loader_entry\n\t"
"addw $4, %%sp\n\t" )
: "=a" ( exit )
- : "a" ( __from_data16 ( &undi_loader ) ),
- "p" ( __from_data16 ( &undi_loader_entry ) )
+ : "a" ( __from_data16 ( &undi_loader ) )
: "ebx", "ecx", "edx", "esi", "edi", "ebp" );
/* UNDI API calls may rudely change the status of A20 and not
diff --git a/src/arch/i386/drivers/net/undinet.c b/src/arch/i386/drivers/net/undinet.c
index d6db6f7c..708fc274 100644
--- a/src/arch/i386/drivers/net/undinet.c
+++ b/src/arch/i386/drivers/net/undinet.c
@@ -173,12 +173,11 @@ static int undinet_call ( struct undi_nic *undinic, unsigned int function,
__asm__ __volatile__ ( REAL_CODE ( "pushw %%es\n\t"
"pushw %%di\n\t"
"pushw %%bx\n\t"
- "lcall *%c3\n\t"
+ "lcall *undinet_entry_point\n\t"
"addw $6, %%sp\n\t" )
: "=a" ( exit ), "=b" ( discard_b ),
"=D" ( discard_D )
- : "p" ( __from_data16 ( &undinet_entry_point )),
- "b" ( function ),
+ : "b" ( function ),
"D" ( __from_data16 ( &undinet_params ) )
: "ecx", "edx", "esi", "ebp" );