Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/sys/dev/pci sys/dev/pci/if_wm.c 1.235-1.236 via patch
details: https://anonhg.NetBSD.org/src/rev/6fbfce6724b2
branches: netbsd-6
changeset: 775702:6fbfce6724b2
user: riz <riz%NetBSD.org@localhost>
date: Mon Feb 18 17:57:57 2013 +0000
description:
sys/dev/pci/if_wm.c 1.235-1.236 via patch
Use PRIx64 and explicitly cast to uint64_t to print a DMA address.
This fixes a problem that if_wm.c can't compile with WM_DEBUG on
non-64bit platforms.
[msaitoh, ticket #823]
diffstat:
sys/dev/pci/if_wm.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diffs (53 lines):
diff -r 97585b57cbf1 -r 6fbfce6724b2 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c Mon Feb 18 17:54:41 2013 +0000
+++ b/sys/dev/pci/if_wm.c Mon Feb 18 17:57:57 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.227.2.6 2013/02/14 22:08:28 jdc Exp $ */
+/* $NetBSD: if_wm.c,v 1.227.2.7 2013/02/18 17:57:57 riz 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.227.2.6 2013/02/14 22:08:28 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.227.2.7 2013/02/18 17:57:57 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2695,10 +2695,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));
}
}
@@ -3158,7 +3158,7 @@
DPRINTF(WM_DEBUG_TX,
("%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));
@@ -3182,10 +3182,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