Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci Explicitly cast to uint64_t instead of using PRI...
details: https://anonhg.NetBSD.org/src/rev/ccc155cd666a
branches: trunk
changeset: 781996:ccc155cd666a
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Fri Oct 12 11:24:44 2012 +0000
description:
Explicitly cast to uint64_t instead of using PRIxPADDR because
sizeof(paddr_t) != sizeof(bus_addr_t) on some architecture.
See:
http://mail-index.netbsd.org/source-changes-d/2012/10/09/msg005353.html
diffstat:
sys/dev/pci/if_wm.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diffs (56 lines):
diff -r 24f8578d2fd5 -r ccc155cd666a sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c Fri Oct 12 10:44:20 2012 +0000
+++ b/sys/dev/pci/if_wm.c Fri Oct 12 11:24:44 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.235 2012/10/09 10:25:44 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.236 2012/10/12 11:24:44 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.235 2012/10/09 10:25:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.236 2012/10/12 11:24:44 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2693,10 +2693,10 @@
lasttx = nexttx;
DPRINTF(WM_DEBUG_TX,
- ("%s: TX: desc %d: low %#" PRIxPADDR ", "
+ ("%s: TX: desc %d: low %#" PRIx64 ", "
"len %#04zx\n",
device_xname(sc->sc_dev), nexttx,
- curaddr & 0xffffffffUL, curlen));
+ (uint64_t)curaddr, curlen));
}
}
@@ -3154,9 +3154,9 @@
sc->sc_nq_txdescs[nexttx].nqtx_data.nqtxd_fields =
htole32(fields);
DPRINTF(WM_DEBUG_TX,
- ("%s: TX: adv data desc %d 0x%" PRIxPADDR "\n",
+ ("%s: TX: adv data desc %d 0x%" PRIx64 "\n",
device_xname(sc->sc_dev), nexttx,
- dmamap->dm_segs[0].ds_addr));
+ (uint64_t)dmamap->dm_segs[0].ds_addr));
DPRINTF(WM_DEBUG_TX,
("\t 0x%08x%08x\n", fields,
(uint32_t)dmamap->dm_segs[0].ds_len | cmdlen));
@@ -3180,10 +3180,10 @@
lasttx = nexttx;
DPRINTF(WM_DEBUG_TX,
- ("%s: TX: desc %d: %#" PRIxPADDR ", "
+ ("%s: TX: desc %d: %#" PRIx64 ", "
"len %#04zx\n",
device_xname(sc->sc_dev), nexttx,
- dmamap->dm_segs[seg].ds_addr,
+ (uint64_t)dmamap->dm_segs[seg].ds_addr,
dmamap->dm_segs[seg].ds_len));
}
Home |
Main Index |
Thread Index |
Old Index