Module Name: src
Committed By: christos
Date: Thu May 18 16:34:56 UTC 2017
Modified Files:
src/sys/arch/pmax/pmax: bus.c bus_dma.c
Log Message:
Fix debug (make it compile)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/pmax/pmax/bus.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/pmax/pmax/bus_dma.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/arch/pmax/pmax/bus.c
diff -u src/sys/arch/pmax/pmax/bus.c:1.1 src/sys/arch/pmax/pmax/bus.c:1.2
--- src/sys/arch/pmax/pmax/bus.c:1.1 Wed Nov 16 14:37:06 2016
+++ src/sys/arch/pmax/pmax/bus.c Thu May 18 12:34:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.1 2016/11/16 19:37:06 macallan Exp $ */
+/* $NetBSD: bus.c,v 1.2 2017/05/18 16:34:56 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.1 2016/11/16 19:37:06 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.2 2017/05/18 16:34:56 christos Exp $");
#include "opt_cputype.h"
@@ -182,9 +182,9 @@ _bus_dmamap_sync_r3k(bus_dma_tag_t t, bu
addr = map->dm_segs[i].ds_addr;
#ifdef BUS_DMA_DEBUG
- printf("bus_dmamap_sync_r3k: flushing segment %d "
- "(0x%lx..0x%lx) ...", i, addr + offset,
- addr + offset + minlen - 1);
+ printf("%s: flushing segment %d (%#jx..%#jx) ...", __func__, i,
+ (intmax_t)addr + offset,
+ (intmax_t)addr + offset + minlen - 1);
#endif
mips_dcache_inv_range(
MIPS_PHYS_TO_KSEG0(addr + offset), minlen);
@@ -294,9 +294,9 @@ _bus_dmamap_sync_r4k(bus_dma_tag_t t, bu
addr = map->dm_segs[i]._ds_vaddr;
#ifdef BUS_DMA_DEBUG
- printf("bus_dmamap_sync: flushing segment %d "
- "(0x%lx..0x%lx) ...", i, addr + offset,
- addr + offset + minlen - 1);
+ printf("%s: flushing segment %d (%#jx..%#jx) ...",
+ __func__, i, (intmax_t)addr + offset,
+ (intmax_t)ddr + offset + minlen - 1);
#endif
/*
Index: src/sys/arch/pmax/pmax/bus_dma.c
diff -u src/sys/arch/pmax/pmax/bus_dma.c:1.58 src/sys/arch/pmax/pmax/bus_dma.c:1.59
--- src/sys/arch/pmax/pmax/bus_dma.c:1.58 Thu Jun 11 04:22:09 2015
+++ src/sys/arch/pmax/pmax/bus_dma.c Thu May 18 12:34:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.58 2015/06/11 08:22:09 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.59 2017/05/18 16:34:56 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.58 2015/06/11 08:22:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.59 2017/05/18 16:34:56 christos Exp $");
#include "opt_cputype.h"
@@ -493,9 +493,9 @@ _bus_dmamap_sync_r3k(bus_dma_tag_t t, bu
addr = map->dm_segs[i].ds_addr;
#ifdef BUS_DMA_DEBUG
- printf("bus_dmamap_sync_r3k: flushing segment %d "
- "(0x%lx..0x%lx) ...", i, addr + offset,
- addr + offset + minlen - 1);
+ printf("%s: flushing segment %d (%#jx..%#jx) ...", __func__,
+ i, (intmax_t)addr + offset,
+ (intmax_t)addr + offset + minlen - 1);
#endif
mips_dcache_inv_range(
MIPS_PHYS_TO_KSEG0(addr + offset), minlen);
@@ -604,9 +604,9 @@ _bus_dmamap_sync_r4k(bus_dma_tag_t t, bu
addr = map->dm_segs[i]._ds_vaddr;
#ifdef BUS_DMA_DEBUG
- printf("bus_dmamap_sync: flushing segment %d "
- "(0x%lx..0x%lx) ...", i, addr + offset,
- addr + offset + minlen - 1);
+ printf("%s: flushing segment %d (%#jx..%#jx) ...", __func__,
+ i, (intmax_t)addr + offset,
+ (intmax_t)addr + offset + minlen - 1);
#endif
/*
