summaryrefslogtreecommitdiffstats
path: root/src/drivers/net/davicom.c
diff options
context:
space:
mode:
authorMichael Brown2008-11-19 03:22:56 +0100
committerMichael Brown2008-11-19 20:15:44 +0100
commitb59e0cc56eb6d5f3b6f934722931f6919309ffd2 (patch)
tree0e74a023207232f7911e1ccb9abdf6454dea70f5 /src/drivers/net/davicom.c
parent[libgcc] Make __libgcc architecture-specific (diff)
downloadipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.gz
ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.xz
ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.zip
[i386] Change [u]int32_t to [unsigned] int, rather than [unsigned] long
This brings us in to line with Linux definitions, and also simplifies adding x86_64 support since both platforms have 2-byte shorts, 4-byte ints and 8-byte long longs.
Diffstat (limited to 'src/drivers/net/davicom.c')
-rw-r--r--src/drivers/net/davicom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c
index 079e647e..bb6d7e96 100644
--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -630,7 +630,7 @@ static void davicom_disable ( struct nic *nic ) {
outl(inl(ioaddr + CSR6) & ~0x00002002, ioaddr + CSR6);
/* Clear the missed-packet counter. */
- (volatile unsigned long)inl(ioaddr + CSR8);
+ inl(ioaddr + CSR8);
}
@@ -676,7 +676,7 @@ static int davicom_probe ( struct nic *nic, struct pci_device *pci ) {
outl(inl(ioaddr + CSR6) & ~0x00002002, ioaddr + CSR6);
/* Clear the missed-packet counter. */
- (volatile unsigned long)inl(ioaddr + CSR8);
+ inl(ioaddr + CSR8);
/* Get MAC Address */
/* read EEPROM data */