Module Name: src
Committed By: martin
Date: Sun Jan 24 13:33:56 UTC 2021
Modified Files:
src/sys/arch/arm/include: bus_funcs.h
src/sys/sys: bus_proto.h
Log Message:
Obey __HAVE_BUS_SPACE_8
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/include/bus_funcs.h
cvs rdiff -u -r1.12 -r1.13 src/sys/sys/bus_proto.h
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/arm/include/bus_funcs.h
diff -u src/sys/arch/arm/include/bus_funcs.h:1.10 src/sys/arch/arm/include/bus_funcs.h:1.11
--- src/sys/arch/arm/include/bus_funcs.h:1.10 Sat Sep 5 16:04:31 2020
+++ src/sys/arch/arm/include/bus_funcs.h Sun Jan 24 13:33:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_funcs.h,v 1.10 2020/09/05 16:04:31 jakllsch Exp $ */
+/* $NetBSD: bus_funcs.h,v 1.11 2021/01/24 13:33:56 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -150,13 +150,17 @@
#define bus_space_read_1(t, h, o) __bs_rs(1,(t),(h),(o))
#define bus_space_read_2(t, h, o) __bs_rs(2,(t),(h),(o))
#define bus_space_read_4(t, h, o) __bs_rs(4,(t),(h),(o))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_read_8(t, h, o) __bs_rs(8,(t),(h),(o))
+#endif
#ifdef __BUS_SPACE_HAS_STREAM_METHODS
#define bus_space_read_stream_1(t, h, o) __bs_rs_s(1,(t),(h),(o))
#define bus_space_read_stream_2(t, h, o) __bs_rs_s(2,(t),(h),(o))
#define bus_space_read_stream_4(t, h, o) __bs_rs_s(4,(t),(h),(o))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_read_stream_8(t, h, o) __bs_rs_s(8,(t),(h),(o))
#endif
+#endif
/*
@@ -168,8 +172,10 @@
__bs_nonsingle(rm,2,(t),(h),(o),(a),(c))
#define bus_space_read_multi_4(t, h, o, a, c) \
__bs_nonsingle(rm,4,(t),(h),(o),(a),(c))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_read_multi_8(t, h, o, a, c) \
__bs_nonsingle(rm,8,(t),(h),(o),(a),(c))
+#endif
#ifdef __BUS_SPACE_HAS_STREAM_METHODS
#define bus_space_read_multi_stream_1(t, h, o, a, c) \
__bs_nonsingle_s(rm,1,(t),(h),(o),(a),(c))
@@ -177,9 +183,11 @@
__bs_nonsingle_s(rm,2,(t),(h),(o),(a),(c))
#define bus_space_read_multi_stream_4(t, h, o, a, c) \
__bs_nonsingle_s(rm,4,(t),(h),(o),(a),(c))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_read_multi_stream_8(t, h, o, a, c) \
__bs_nonsingle_s(rm,8,(t),(h),(o),(a),(c))
#endif
+#endif
/*
@@ -191,8 +199,10 @@
__bs_nonsingle(rr,2,(t),(h),(o),(a),(c))
#define bus_space_read_region_4(t, h, o, a, c) \
__bs_nonsingle(rr,4,(t),(h),(o),(a),(c))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_read_region_8(t, h, o, a, c) \
__bs_nonsingle(rr,8,(t),(h),(o),(a),(c))
+#endif
#ifdef __BUS_SPACE_HAS_STREAM_METHODS
#define bus_space_read_region_stream_1(t, h, o, a, c) \
__bs_nonsingle_s(rr,1,(t),(h),(o),(a),(c))
@@ -200,9 +210,11 @@
__bs_nonsingle_s(rr,2,(t),(h),(o),(a),(c))
#define bus_space_read_region_stream_4(t, h, o, a, c) \
__bs_nonsingle_s(rr,4,(t),(h),(o),(a),(c))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_read_region_stream_8(t, h, o, a, c) \
__bs_nonsingle_s(rr,8,(t),(h),(o),(a),(c))
#endif
+#endif
/*
@@ -211,13 +223,17 @@
#define bus_space_write_1(t, h, o, v) __bs_ws(1,(t),(h),(o),(v))
#define bus_space_write_2(t, h, o, v) __bs_ws(2,(t),(h),(o),(v))
#define bus_space_write_4(t, h, o, v) __bs_ws(4,(t),(h),(o),(v))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_write_8(t, h, o, v) __bs_ws(8,(t),(h),(o),(v))
+#endif
#ifdef __BUS_SPACE_HAS_STREAM_METHODS
#define bus_space_write_stream_1(t, h, o, v) __bs_ws_s(1,(t),(h),(o),(v))
#define bus_space_write_stream_2(t, h, o, v) __bs_ws_s(2,(t),(h),(o),(v))
#define bus_space_write_stream_4(t, h, o, v) __bs_ws_s(4,(t),(h),(o),(v))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_write_stream_8(t, h, o, v) __bs_ws_s(8,(t),(h),(o),(v))
#endif
+#endif
/*
@@ -229,8 +245,10 @@
__bs_nonsingle(wm,2,(t),(h),(o),(a),(c))
#define bus_space_write_multi_4(t, h, o, a, c) \
__bs_nonsingle(wm,4,(t),(h),(o),(a),(c))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_write_multi_8(t, h, o, a, c) \
__bs_nonsingle(wm,8,(t),(h),(o),(a),(c))
+#endif
#ifdef __BUS_SPACE_HAS_STREAM_METHODS
#define bus_space_write_multi_stream_1(t, h, o, a, c) \
__bs_nonsingle_s(wm,1,(t),(h),(o),(a),(c))
@@ -238,9 +256,11 @@
__bs_nonsingle_s(wm,2,(t),(h),(o),(a),(c))
#define bus_space_write_multi_stream_4(t, h, o, a, c) \
__bs_nonsingle_s(wm,4,(t),(h),(o),(a),(c))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_write_multi_stream_8(t, h, o, a, c) \
__bs_nonsingle_s(wm,8,(t),(h),(o),(a),(c))
#endif
+#endif
/*
@@ -252,8 +272,10 @@
__bs_nonsingle(wr,2,(t),(h),(o),(a),(c))
#define bus_space_write_region_4(t, h, o, a, c) \
__bs_nonsingle(wr,4,(t),(h),(o),(a),(c))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_write_region_8(t, h, o, a, c) \
__bs_nonsingle(wr,8,(t),(h),(o),(a),(c))
+#endif
#ifdef __BUS_SPACE_HAS_STREAM_METHODS
#define bus_space_write_region_stream_1(t, h, o, a, c) \
__bs_nonsingle_s(wr,1,(t),(h),(o),(a),(c))
@@ -261,9 +283,11 @@
__bs_nonsingle_s(wr,2,(t),(h),(o),(a),(c))
#define bus_space_write_region_stream_4(t, h, o, a, c) \
__bs_nonsingle_s(wr,4,(t),(h),(o),(a),(c))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_write_region_stream_8(t, h, o, a, c) \
__bs_nonsingle_s(wr,8,(t),(h),(o),(a),(c))
#endif
+#endif
/*
@@ -275,8 +299,10 @@
__bs_set(sm,2,(t),(h),(o),(v),(c))
#define bus_space_set_multi_4(t, h, o, v, c) \
__bs_set(sm,4,(t),(h),(o),(v),(c))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_set_multi_8(t, h, o, v, c) \
__bs_set(sm,8,(t),(h),(o),(v),(c))
+#endif
/*
* Set region operations.
@@ -287,8 +313,10 @@
__bs_set(sr,2,(t),(h),(o),(v),(c))
#define bus_space_set_region_4(t, h, o, v, c) \
__bs_set(sr,4,(t),(h),(o),(v),(c))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_set_region_8(t, h, o, v, c) \
__bs_set(sr,8,(t),(h),(o),(v),(c))
+#endif
/*
* Copy operations.
@@ -299,8 +327,10 @@
__bs_copy(2, t, h1, o1, h2, o2, c)
#define bus_space_copy_region_4(t, h1, o1, h2, o2, c) \
__bs_copy(4, t, h1, o1, h2, o2, c)
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_copy_region_8(t, h1, o1, h2, o2, c) \
__bs_copy(8, t, h1, o1, h2, o2, c)
+#endif
/*
* Probing operations.
@@ -309,13 +339,17 @@
#define bus_space_peek_1(t, h, o, p) __bs_pe(1,(t),(h),(o),(p))
#define bus_space_peek_2(t, h, o, p) __bs_pe(2,(t),(h),(o),(p))
#define bus_space_peek_4(t, h, o, p) __bs_pe(4,(t),(h),(o),(p))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_peek_8(t, h, o, p) __bs_pe(8,(t),(h),(o),(p))
+#endif
#define bus_space_poke_1(t, h, o, v) __bs_po(1,(t),(h),(o),(v))
#define bus_space_poke_2(t, h, o, v) __bs_po(2,(t),(h),(o),(v))
#define bus_space_poke_4(t, h, o, v) __bs_po(4,(t),(h),(o),(v))
+#ifdef __HAVE_BUS_SPACE_8
#define bus_space_poke_8(t, h, o, v) __bs_po(8,(t),(h),(o),(v))
#endif
+#endif
/*
* Macros to provide prototypes for all the functions used in the
Index: src/sys/sys/bus_proto.h
diff -u src/sys/sys/bus_proto.h:1.12 src/sys/sys/bus_proto.h:1.13
--- src/sys/sys/bus_proto.h:1.12 Wed Nov 18 07:42:46 2020
+++ src/sys/sys/bus_proto.h Sun Jan 24 13:33:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_proto.h,v 1.12 2020/11/18 07:42:46 skrll Exp $ */
+/* $NetBSD: bus_proto.h,v 1.13 2021/01/24 13:33:56 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001, 2007 The NetBSD Foundation, Inc.
@@ -129,10 +129,12 @@ uint32_t bus_space_read_4(bus_space_tag_
uint32_t bus_space_read_stream_4(bus_space_tag_t, bus_space_handle_t,
bus_size_t);
+#ifdef __HAVE_BUS_SPACE_8
uint64_t bus_space_read_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t);
uint64_t bus_space_read_stream_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t);
+#endif
#if defined(KASAN) && defined(__HAVE_KASAN_INSTR_BUS)
#define BUS_SPACE_READ_MEM_PROTOS(bytes, bits) \
@@ -244,10 +246,12 @@ void bus_space_write_4(bus_space_tag_t,
void bus_space_write_stream_4(bus_space_tag_t, bus_space_handle_t,
bus_size_t, uint32_t);
+#ifdef __HAVE_BUS_SPACE_8
void bus_space_write_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, uint64_t);
void bus_space_write_stream_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, uint64_t);
+#endif
#if defined(KASAN) && defined(__HAVE_KASAN_INSTR_BUS)
#define BUS_SPACE_WRITE_MEM_PROTOS(bytes, bits) \
@@ -350,8 +354,10 @@ void bus_space_set_multi_2(bus_space_tag
bus_size_t, u_int16_t, bus_size_t);
void bus_space_set_multi_4(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int32_t, bus_size_t);
+#ifdef __HAVE_BUS_SPACE_8
void bus_space_set_multi_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int64_t, bus_size_t);
+#endif
void bus_space_set_multi_stream_1(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int8_t, bus_size_t);
@@ -359,8 +365,10 @@ void bus_space_set_multi_stream_2(bus_sp
bus_size_t, u_int16_t, bus_size_t);
void bus_space_set_multi_stream_4(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int32_t, bus_size_t);
+#ifdef __HAVE_BUS_SPACE_8
void bus_space_set_multi_stream_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int64_t, bus_size_t);
+#endif
void bus_space_set_region_1(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int8_t, bus_size_t);
@@ -368,8 +376,10 @@ void bus_space_set_region_2(bus_space_ta
bus_size_t, u_int16_t, bus_size_t);
void bus_space_set_region_4(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int32_t, bus_size_t);
+#ifdef __HAVE_BUS_SPACE_8
void bus_space_set_region_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int64_t, bus_size_t);
+#endif
void bus_space_set_region_stream_1(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int8_t, bus_size_t);
@@ -377,8 +387,10 @@ void bus_space_set_region_stream_2(bus_s
bus_size_t, u_int16_t, bus_size_t);
void bus_space_set_region_stream_4(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int32_t, bus_size_t);
+#ifdef __HAVE_BUS_SPACE_8
void bus_space_set_region_stream_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, u_int64_t, bus_size_t);
+#endif
void bus_space_copy_region_1(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_space_handle_t,
@@ -389,9 +401,11 @@ void bus_space_copy_region_2(bus_space_t
void bus_space_copy_region_4(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_space_handle_t,
bus_size_t, bus_size_t);
+#ifdef __HAVE_BUS_SPACE_8
void bus_space_copy_region_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_space_handle_t,
bus_size_t, bus_size_t);
+#endif
void bus_space_copy_region_stream_1(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_space_handle_t,
@@ -402,9 +416,11 @@ void bus_space_copy_region_stream_2(bus_
void bus_space_copy_region_stream_4(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_space_handle_t,
bus_size_t, bus_size_t);
+#ifdef __HAVE_BUS_SPACE_8
void bus_space_copy_region_stream_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_space_handle_t,
bus_size_t, bus_size_t);
+#endif
bool bus_space_is_equal(bus_space_tag_t, bus_space_tag_t);
bool bus_space_handle_is_equal(bus_space_tag_t, bus_space_handle_t,
