Module Name: src
Committed By: matt
Date: Tue Nov 17 07:35:24 UTC 2009
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: bus_space.h
src/sys/arch/mips/mips [matt-nb5-mips64]:
bus_space_alignstride_chipdep.c
Log Message:
Add/use PRIxBUS{ADDR,SIZE} and PRIxBSH
To generate a diff of this commit:
cvs rdiff -u -r1.4.18.1 -r1.4.18.2 src/sys/arch/mips/include/bus_space.h
cvs rdiff -u -r1.10.18.5 -r1.10.18.6 \
src/sys/arch/mips/mips/bus_space_alignstride_chipdep.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/include/bus_space.h
diff -u src/sys/arch/mips/include/bus_space.h:1.4.18.1 src/sys/arch/mips/include/bus_space.h:1.4.18.2
--- src/sys/arch/mips/include/bus_space.h:1.4.18.1 Sun Nov 15 23:09:18 2009
+++ src/sys/arch/mips/include/bus_space.h Tue Nov 17 07:35:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.h,v 1.4.18.1 2009/11/15 23:09:18 cliff Exp $ */
+/* $NetBSD: bus_space.h,v 1.4.18.2 2009/11/17 07:35:24 matt Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -109,12 +109,15 @@
*/
typedef paddr_t bus_addr_t;
typedef psize_t bus_size_t;
+#define PRIxBUSADDR PRIxPADDR
+#define PRIxBUSSIZE PRIxPSIZE
/*
* Access methods for bus space.
*/
typedef struct mips_bus_space *bus_space_tag_t;
typedef intptr_t bus_space_handle_t;
+#define PRIxBSH PRIxPTR
struct mips_bus_space {
/* cookie */
Index: src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c
diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.5 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.6
--- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.5 Sun Nov 15 23:09:45 2009
+++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Tue Nov 17 07:35:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.5 2009/11/15 23:09:45 cliff Exp $ */
+/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.6 2009/11/17 07:35:24 matt Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.5 2009/11/15 23:09:45 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.6 2009/11/17 07:35:24 matt Exp $");
#ifdef CHIP_EXTENT
#include <sys/extent.h>
@@ -840,7 +840,7 @@
__S(__BS(map)), (u_long)CHIP_W3_SYS_START(v),
(u_long)CHIP_W3_SYS_END(v));
#endif
- panic("%s: don't know how to unmap %lx", __S(__BS(unmap)), h);
+ panic("%s: don't know how to unmap %#"PRIxBSH, __S(__BS(unmap)), h);
}
#ifdef EXTENT_DEBUG
@@ -849,7 +849,7 @@
error = extent_free(CHIP_EXTENT(v), addr, size,
EX_NOWAIT | (CHIP_EX_MALLOC_SAFE(v) ? EX_MALLOCOK : 0));
if (error) {
- printf("%s: WARNING: could not unmap 0x%lx-0x%lx (error %d)\n",
+ printf("%s: WARNING: could not unmap %#"PRIxBUSADDR"-%#"PRIxBUSADDR" (error %d)\n",
__S(__BS(unmap)), addr, addr + size - 1,
error);
#ifdef EXTENT_DEBUG
