Module Name: src
Committed By: cliff
Date: Sun Nov 15 23:00:00 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: bus_dma.c
Log Message:
- make infop work for N32 or N64; firmware gives us a
non-sign-extended 32 bit pointer in a 64 bit variable
- in rmixlfw_init(), when PSB version not found,
fix rc_io_pbase initialization, and add the missing return MEMSIZE.
- use PRIx64 format to make some printfs work for N32 or N64
- use (intptr_t) as needed to make int to pointer casts work for N32 and N64
- init rc_obio_memt replaces init of rc_eb_memt, rc_el_memt
To generate a diff of this commit:
cvs rdiff -u -r1.22.16.6 -r1.22.16.7 src/sys/arch/mips/mips/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/mips/mips/bus_dma.c
diff -u src/sys/arch/mips/mips/bus_dma.c:1.22.16.6 src/sys/arch/mips/mips/bus_dma.c:1.22.16.7
--- src/sys/arch/mips/mips/bus_dma.c:1.22.16.6 Mon Nov 9 09:58:45 2009
+++ src/sys/arch/mips/mips/bus_dma.c Sun Nov 15 23:00:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.22.16.6 2009/11/09 09:58:45 cliff Exp $ */
+/* $NetBSD: bus_dma.c,v 1.22.16.7 2009/11/15 23:00:00 cliff Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22.16.6 2009/11/09 09:58:45 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22.16.7 2009/11/15 23:00:00 cliff Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -422,8 +422,9 @@
#ifdef DIAGNOSTIC
if (offset >= map->dm_mapsize)
- panic("_bus_dmamap_sync: bad offset %lu (map size is %lu)",
- offset, map->dm_mapsize);
+ panic("_bus_dmamap_sync: bad offset %"PRIxPADDR
+ " (map size is %"PRIxPSIZE")",
+ offset, map->dm_mapsize);
if (len == 0 || (offset + len) > map->dm_mapsize)
panic("_bus_dmamap_sync: bad length");
#endif
