Module Name: src
Committed By: jakllsch
Date: Tue Jul 27 19:31:55 UTC 2010
Modified Files:
src/sys/dev/ic: ld_aac.c
Log Message:
Rework debug printf invocation to not fail on LP64 so easily.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ic/ld_aac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ld_aac.c
diff -u src/sys/dev/ic/ld_aac.c:1.23 src/sys/dev/ic/ld_aac.c:1.24
--- src/sys/dev/ic/ld_aac.c:1.23 Tue May 12 14:25:17 2009
+++ src/sys/dev/ic/ld_aac.c Tue Jul 27 19:31:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_aac.c,v 1.23 2009/05/12 14:25:17 cegger Exp $ */
+/* $NetBSD: ld_aac.c,v 1.24 2010/07/27 19:31:55 jakllsch Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.23 2009/05/12 14:25:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.24 2010/07/27 19:31:55 jakllsch Exp $");
#include "rnd.h"
@@ -212,9 +212,9 @@
sge->SgAddress = htole32(xfer->dm_segs[i].ds_addr);
sge->SgByteCount = htole32(xfer->dm_segs[i].ds_len);
AAC_DPRINTF(AAC_D_IO,
- ("#%d va %p pa %lx len %lx\n", i, data,
- (u_long)xfer->dm_segs[i].ds_addr,
- (u_long)xfer->dm_segs[i].ds_len));
+ ("#%d va %p pa %" PRIxPADDR " len %zx\n",
+ i, data, xfer->dm_segs[i].ds_addr,
+ xfer->dm_segs[i].ds_len));
}
size += xfer->dm_nsegs * sizeof(struct aac_sg_entry);
@@ -265,9 +265,9 @@
sge->SgAddress = htole64(xfer->dm_segs[i].ds_addr);
sge->SgByteCount = htole32(xfer->dm_segs[i].ds_len);
AAC_DPRINTF(AAC_D_IO,
- ("#%d va %p pa %llx len %lx\n", i, data,
- (u_int64_t)xfer->dm_segs[i].ds_addr,
- (u_long)xfer->dm_segs[i].ds_len));
+ ("#%d va %p pa %" PRIxPADDR " len %zx\n",
+ i, data, xfer->dm_segs[i].ds_addr,
+ xfer->dm_segs[i].ds_len));
}
size += xfer->dm_nsegs * sizeof(struct aac_sg_entry64);
size = sizeof(fib->Header) + size;
