summaryrefslogtreecommitdiffstats
path: root/sys/dev/ed
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2004-04-16 05:34:14 +0000
committerobrien <obrien@FreeBSD.org>2004-04-16 05:34:14 +0000
commitd9be63e8eb51e811a9496eaf677c8b5435ca24cd (patch)
treec9f6bb6cf329eb926b5377d5fe05e42541303367 /sys/dev/ed
parentdd09fa88653468101ae355dba94423bce7f2208f (diff)
downloadFreeBSD-src-d9be63e8eb51e811a9496eaf677c8b5435ca24cd.zip
FreeBSD-src-d9be63e8eb51e811a9496eaf677c8b5435ca24cd.tar.gz
Fix building on L64 machines.
Diffstat (limited to 'sys/dev/ed')
-rw-r--r--sys/dev/ed/if_ed.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 9b7a0d4..a968f32 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -1205,8 +1205,8 @@ ed_probe_Novell_generic(dev, flags)
device_printf(dev, "RAM start at %ld, size : %d.\n", mstart, msize);
sc->mem_size = msize;
- sc->mem_start = (caddr_t) mstart;
- sc->mem_end = (caddr_t) (msize + mstart);
+ sc->mem_start = (caddr_t)(uintptr_t) mstart;
+ sc->mem_end = (caddr_t)(uintptr_t) (msize + mstart);
sc->tx_page_start = mstart / ED_PAGE_SIZE;
}
@@ -2206,7 +2206,7 @@ outloop:
}
}
} else {
- len = ed_pio_write_mbufs(sc, m, (long)buffer);
+ len = ed_pio_write_mbufs(sc, m, (uintptr_t)buffer);
if (len == 0) {
m_freem(m0);
goto outloop;
@@ -2282,8 +2282,8 @@ ed_rint(sc)
if (sc->mem_shared)
packet_hdr = *(struct ed_ring *) packet_ptr;
else
- ed_pio_readmem(sc, (long)packet_ptr, (char *) &packet_hdr,
- sizeof(packet_hdr));
+ ed_pio_readmem(sc, (uintptr_t)packet_ptr,
+ (char *) &packet_hdr, sizeof(packet_hdr));
len = packet_hdr.count;
if (len > (ETHER_MAX_LEN - ETHER_CRC_LEN + sizeof(struct ed_ring)) ||
len < (ETHER_MIN_LEN - ETHER_CRC_LEN + sizeof(struct ed_ring))) {
@@ -2753,7 +2753,7 @@ ed_ring_copy(sc, src, dst, amount)
if (sc->mem_shared)
bcopy(src, dst, tmp_amount);
else
- ed_pio_readmem(sc, (long)src, dst, tmp_amount);
+ ed_pio_readmem(sc, (uintptr_t)src, dst, tmp_amount);
amount -= tmp_amount;
src = sc->mem_ring;
@@ -2762,7 +2762,7 @@ ed_ring_copy(sc, src, dst, amount)
if (sc->mem_shared)
bcopy(src, dst, amount);
else
- ed_pio_readmem(sc, (long)src, dst, amount);
+ ed_pio_readmem(sc, (uintptr_t)src, dst, amount);
return (src + amount);
}
OpenPOWER on IntegriCloud