Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Provide PRIxBUSADDR, PRIxBUSSIZE, PRIuBUSSIZE, and ...
details: https://anonhg.NetBSD.org/src/rev/50e2689690c1
branches: trunk
changeset: 459736:50e2689690c1
user: skrll <skrll%NetBSD.org@localhost>
date: Mon Sep 23 16:17:54 2019 +0000
description:
Provide PRIxBUSADDR, PRIxBUSSIZE, PRIuBUSSIZE, and PRIxBSH for all arches
to follow arm and (generic) mips.
Reviewed by christos.
diffstat:
sys/arch/alpha/include/bus_defs.h | 4 +++-
sys/arch/alpha/include/bus_user.h | 6 +++++-
sys/arch/amiga/include/bus.h | 8 +++++++-
sys/arch/amigappc/include/bus_defs.h | 7 ++++++-
sys/arch/arc/include/bus_defs.h | 8 +++++++-
sys/arch/atari/include/bus_defs.h | 8 +++++++-
sys/arch/cesfic/include/bus.h | 8 +++++++-
sys/arch/dreamcast/include/bus_defs.h | 7 ++++++-
sys/arch/emips/include/bus.h | 7 ++++++-
sys/arch/evbcf/include/bus_space.h | 7 ++++++-
sys/arch/evbsh3/include/bus_defs.h | 8 +++++++-
sys/arch/ews4800mips/include/bus.h | 7 ++++++-
sys/arch/hp300/include/bus.h | 8 +++++++-
sys/arch/hpcmips/include/bus_types.h | 9 ++++++++-
sys/arch/hpcsh/include/bus_defs.h | 7 ++++++-
sys/arch/hppa/include/bus_defs.h | 9 ++++++++-
sys/arch/ia64/include/bus.h | 8 +++++++-
sys/arch/landisk/include/bus_defs.h | 8 +++++++-
sys/arch/luna68k/include/bus.h | 8 +++++++-
sys/arch/mac68k/include/bus.h | 7 +++++--
sys/arch/mipsco/include/bus.h | 9 ++++++++-
sys/arch/mvme68k/include/bus_space.h | 8 +++++++-
sys/arch/news68k/include/bus.h | 8 +++++++-
sys/arch/newsmips/include/bus.h | 8 +++++++-
sys/arch/next68k/include/bus_space.h | 8 +++++++-
sys/arch/or1k/include/bus_defs.h | 9 ++++++++-
sys/arch/playstation2/include/bus.h | 7 ++++++-
sys/arch/powerpc/include/bus_defs.h | 9 ++++++++-
sys/arch/riscv/include/bus.h | 10 +++++++++-
sys/arch/sh3/include/bus_defs.h | 8 +++++++-
sys/arch/sparc/include/bus_defs.h | 9 ++++++++-
sys/arch/sparc64/include/bus_defs.h | 6 +++++-
sys/arch/sun68k/include/bus.h | 7 ++++++-
sys/arch/usermode/include/bus.h | 7 ++++++-
sys/arch/vax/include/bus.h | 7 ++++++-
sys/arch/x68k/include/bus.h | 7 ++++++-
sys/arch/x86/include/bus_defs.h | 8 +++++++-
37 files changed, 246 insertions(+), 38 deletions(-)
diffs (truncated from 954 to 300 lines):
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/alpha/include/bus_defs.h
--- a/sys/arch/alpha/include/bus_defs.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/alpha/include/bus_defs.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.4 2017/06/22 16:46:52 flxd Exp $ */
+/* $NetBSD: bus_defs.h,v 1.5 2019/09/23 16:17:54 skrll Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -113,6 +113,8 @@
typedef struct alpha_bus_space *bus_space_tag_t;
typedef u_long bus_space_handle_t;
+#define PRIxBSH "lx"
+
struct alpha_bus_space {
/* cookie */
void *abs_cookie;
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/alpha/include/bus_user.h
--- a/sys/arch/alpha/include/bus_user.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/alpha/include/bus_user.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_user.h,v 1.2 2016/01/24 16:47:50 christos Exp $ */
+/* $NetBSD: bus_user.h,v 1.3 2019/09/23 16:17:54 skrll Exp $ */
/*
* XXX This file is a stopgap intended to keep NetBSD/alpha buildable
* XXX while developers figure out whether/how to expose to userland
@@ -18,6 +18,10 @@
typedef u_long bus_addr_t;
typedef u_long bus_size_t;
+#define PRIxBUSADDR "lx"
+#define PRIxBUSSIZE "lx"
+#define PRIuBUSSIZE "lu"
+
/*
* Translation of an Alpha bus address; INTERNAL USE ONLY.
*/
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/amiga/include/bus.h
--- a/sys/arch/amiga/include/bus.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/amiga/include/bus.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.29 2014/01/03 00:33:06 rkujawa Exp $ */
+/* $NetBSD: bus.h,v 1.30 2019/09/23 16:17:54 skrll Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -38,12 +38,18 @@
typedef u_int32_t bus_addr_t;
typedef u_int32_t bus_size_t;
+#define PRIxBUSADDR "x"
+#define PRIxBUSSIZE "x"
+#define PRIuBUSSIZE "u"
+
/*
* Access methods for bus resources and address space.
*/
typedef struct bus_space_tag *bus_space_tag_t;
typedef u_long bus_space_handle_t;
+#define PRIxBSH "lx"
+
/* unpublic, but needed by method implementors */
/*
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/amigappc/include/bus_defs.h
--- a/sys/arch/amigappc/include/bus_defs.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/amigappc/include/bus_defs.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.6 2014/01/22 00:24:53 christos Exp $ */
+/* $NetBSD: bus_defs.h,v 1.7 2019/09/23 16:17:54 skrll Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -34,12 +34,17 @@
typedef uint32_t bus_addr_t;
typedef uint32_t bus_size_t;
+#define PRIxBUSADDR "x"
+#define PRIxBUSSIZE "x"
+#define PRIuBUSSIZE "u"
/*
* Access methods for bus resources and address space.
*/
typedef struct bus_space_tag *bus_space_tag_t;
typedef u_long bus_space_handle_t;
+#define PRIxBSH "lx"
+
struct amigappc_bus_dma_segment;
struct amigappc_bus_dma_tag;
struct amigappc_bus_dmamap;
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/arc/include/bus_defs.h
--- a/sys/arch/arc/include/bus_defs.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/arc/include/bus_defs.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.1 2011/07/01 17:09:58 dyoung Exp $ */
+/* $NetBSD: bus_defs.h,v 1.2 2019/09/23 16:17:54 skrll Exp $ */
/* NetBSD: bus.h,v 1.27 2000/03/15 16:44:50 drochner Exp */
/* $OpenBSD: bus.h,v 1.15 1999/08/11 23:15:21 niklas Exp $ */
@@ -73,6 +73,10 @@
typedef u_long bus_addr_t;
typedef u_long bus_size_t;
+#define PRIxBUSADDR "lx"
+#define PRIxBUSSIZE "lx"
+#define PRIuBUSSIZE "lu"
+
#include <mips/locore.h>
#ifdef BUS_SPACE_DEBUG
@@ -108,6 +112,8 @@
typedef uint32_t bus_space_handle_t;
typedef struct arc_bus_space *bus_space_tag_t;
+#define PRIxBSH "lx"
+
struct arc_bus_space {
const char *bs_name;
struct extent *bs_extent;
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/atari/include/bus_defs.h
--- a/sys/arch/atari/include/bus_defs.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/atari/include/bus_defs.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.1 2011/07/01 17:09:58 dyoung Exp $ */
+/* $NetBSD: bus_defs.h,v 1.2 2019/09/23 16:17:55 skrll Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,6 +66,10 @@
typedef u_long bus_addr_t;
typedef u_long bus_size_t;
+#define PRIxBUSADDR "lx"
+#define PRIxBUSSIZE "lx"
+#define PRIuBUSSIZE "lu"
+
/*
* I/O addresses (in bus space)
*/
@@ -80,6 +84,8 @@
typedef struct atari_bus_space *bus_space_tag_t;
typedef u_long bus_space_handle_t;
+#define PRIxBSH "lx"
+
#define BUS_SPACE_MAP_CACHEABLE 0x01
#define BUS_SPACE_MAP_LINEAR 0x02
#define BUS_SPACE_MAP_PREFETCHABLE 0x04
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/cesfic/include/bus.h
--- a/sys/arch/cesfic/include/bus.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/cesfic/include/bus.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.2 2012/05/07 18:16:38 tsutsui Exp $ */
+/* $NetBSD: bus.h,v 1.3 2019/09/23 16:17:55 skrll Exp $ */
/*
* XXX: A dummy <machine/bus.h> for MI <sys/bus.h>.
@@ -10,9 +10,15 @@
typedef paddr_t bus_addr_t;
typedef psize_t bus_size_t;
+#define PRIxBUSADDR PRIxPADDR
+#define PRIxBUSSIZE PRIxPSIZE
+#define PRIuBUSSIZE PRIuPSIZE
+
typedef int bus_space_tag_t;
typedef int bus_space_handle_t;
+#define PRIxBSH "x"
+
/*
* There is no bus_dma(9)'fied bus drivers on this port.
*/
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/dreamcast/include/bus_defs.h
--- a/sys/arch/dreamcast/include/bus_defs.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/dreamcast/include/bus_defs.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:52:30 dyoung Exp $ */
+/* $NetBSD: bus_defs.h,v 1.2 2019/09/23 16:17:55 skrll Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -102,12 +102,17 @@
typedef u_long bus_addr_t;
typedef u_long bus_size_t;
+#define PRIxBUSADDR "lx"
+#define PRIxBUSSIZE "lx"
+#define PRIuBUSSIZE "lu"
/*
* Access methods for bus space.
*/
typedef struct dreamcast_bus_space *bus_space_tag_t;
typedef u_long bus_space_handle_t;
+#define PRIxBSH "lx"
+
struct dreamcast_bus_space {
/* cookie */
void *dbs_cookie;
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/emips/include/bus.h
--- a/sys/arch/emips/include/bus.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/emips/include/bus.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.2 2012/02/12 16:34:08 matt Exp $ */
+/* $NetBSD: bus.h,v 1.3 2019/09/23 16:17:55 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -47,12 +47,17 @@
typedef u_long bus_addr_t;
typedef u_long bus_size_t;
+#define PRIxBUSADDR "lx"
+#define PRIxBUSSIZE "lx"
+#define PRIuBUSSIZE "lu"
/*
* Access methods for bus resources and address space.
*/
typedef int bus_space_tag_t;
typedef u_long bus_space_handle_t;
+#define PRIxBSH "lx"
+
/*
* int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
* bus_size_t size, int flags, bus_space_handle_t *bshp);
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/evbcf/include/bus_space.h
--- a/sys/arch/evbcf/include/bus_space.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/evbcf/include/bus_space.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.h,v 1.2 2014/03/18 18:20:41 riastradh Exp $ */
+/* $NetBSD: bus_space.h,v 1.3 2019/09/23 16:17:55 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,6 +71,9 @@
typedef u_long bus_addr_t;
typedef u_long bus_size_t;
+#define PRIxBUSADDR "lx"
+#define PRIxBUSSIZE "lx"
+#define PRIuBUSSIZE "lu"
/*
* Access methods for bus resources and address space.
*/
@@ -78,6 +81,8 @@
typedef struct mvme68k_bus_space_tag *bus_space_tag_t;
typedef u_long bus_space_handle_t;
+#define PRIxBSH "lx"
+
struct mvme68k_bus_space_tag {
void *bs_cookie;
int (*bs_map)(void *, bus_addr_t, bus_size_t,
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/evbsh3/include/bus_defs.h
--- a/sys/arch/evbsh3/include/bus_defs.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/evbsh3/include/bus_defs.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:44:53 dyoung Exp $ */
+/* $NetBSD: bus_defs.h,v 1.2 2019/09/23 16:17:55 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -103,9 +103,15 @@
typedef u_long bus_addr_t;
typedef u_long bus_size_t;
+#define PRIxBUSADDR "lx"
+#define PRIxBUSSIZE "lx"
+#define PRIuBUSSIZE "lu"
+
typedef struct _bus_space *bus_space_tag_t;
typedef u_long bus_space_handle_t;
+#define PRIxBSH "lx"
+
struct _bus_space {
/* cookie */
void *bs_cookie;
diff -r 89aedf5a8fe1 -r 50e2689690c1 sys/arch/ews4800mips/include/bus.h
--- a/sys/arch/ews4800mips/include/bus.h Mon Sep 23 16:07:07 2019 +0000
+++ b/sys/arch/ews4800mips/include/bus.h Mon Sep 23 16:17:54 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.7 2015/06/23 21:00:23 matt Exp $ */
+/* $NetBSD: bus.h,v 1.8 2019/09/23 16:17:55 skrll Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001, 2005 The NetBSD Foundation, Inc.
@@ -104,12 +104,17 @@
typedef long bus_addr_t;
typedef long bus_size_t;
+#define PRIxBUSADDR "lx"
+#define PRIxBUSSIZE "lx"
+#define PRIuBUSSIZE "lu"
/*
Home |
Main Index |
Thread Index |
Old Index