Add convenience macros for bus_space usage that doesn't require specification
of bus tag+handle. Instead of bus_space_write_1(sc->tag, sc->handle, ...) this macros offer bus_write_1(sc->resource, ...) The name+argument transformation is constant and the the macros are generated (by hand) by the script in tools/bus_macro.sh.
This commit is contained in:
Poul-Henning Kamp
parent
ae7ff71f63
commit
6db1c434a4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=150524
135
sys/sys/bus.h
135
sys/sys/bus.h
@ -519,6 +519,141 @@ static __inline void varp ## _set_ ## var(device_t dev, type t) \
|
||||
ivarp ## _IVAR_ ## ivar, v); \
|
||||
}
|
||||
|
||||
/**
|
||||
* Shorthand macros, taking resource argument
|
||||
* Generated with sys/tools/bus_macro.sh
|
||||
*/
|
||||
|
||||
#define bus_barrier(r, o, l, f) \
|
||||
bus_space_barrier((r)->r_bustag, (r)->r_bushandle, (o), (l), (f))
|
||||
#define bus_read_1(r, o) \
|
||||
bus_space_read_1((r)->r_bustag, (r)->r_bushandle, (o))
|
||||
#define bus_read_multi_1(r, o, d, c) \
|
||||
bus_space_read_multi_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_region_1(r, o, d, c) \
|
||||
bus_space_read_region_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_set_multi_1(r, o, v, c) \
|
||||
bus_space_set_multi_1((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_set_region_1(r, o, v, c) \
|
||||
bus_space_set_region_1((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_write_1(r, o, v) \
|
||||
bus_space_write_1((r)->r_bustag, (r)->r_bushandle, (o), (v))
|
||||
#define bus_write_multi_1(r, o, d, c) \
|
||||
bus_space_write_multi_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_write_region_1(r, o, d, c) \
|
||||
bus_space_write_region_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_stream_1(r, o) \
|
||||
bus_space_read_stream_1((r)->r_bustag, (r)->r_bushandle, (o))
|
||||
#define bus_read_multi_stream_1(r, o, d, c) \
|
||||
bus_space_read_multi_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_region_stream_1(r, o, d, c) \
|
||||
bus_space_read_region_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_set_multi_stream_1(r, o, v, c) \
|
||||
bus_space_set_multi_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_set_region_stream_1(r, o, v, c) \
|
||||
bus_space_set_region_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_write_stream_1(r, o, v) \
|
||||
bus_space_write_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (v))
|
||||
#define bus_write_multi_stream_1(r, o, d, c) \
|
||||
bus_space_write_multi_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_write_region_stream_1(r, o, d, c) \
|
||||
bus_space_write_region_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_2(r, o) \
|
||||
bus_space_read_2((r)->r_bustag, (r)->r_bushandle, (o))
|
||||
#define bus_read_multi_2(r, o, d, c) \
|
||||
bus_space_read_multi_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_region_2(r, o, d, c) \
|
||||
bus_space_read_region_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_set_multi_2(r, o, v, c) \
|
||||
bus_space_set_multi_2((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_set_region_2(r, o, v, c) \
|
||||
bus_space_set_region_2((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_write_2(r, o, v) \
|
||||
bus_space_write_2((r)->r_bustag, (r)->r_bushandle, (o), (v))
|
||||
#define bus_write_multi_2(r, o, d, c) \
|
||||
bus_space_write_multi_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_write_region_2(r, o, d, c) \
|
||||
bus_space_write_region_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_stream_2(r, o) \
|
||||
bus_space_read_stream_2((r)->r_bustag, (r)->r_bushandle, (o))
|
||||
#define bus_read_multi_stream_2(r, o, d, c) \
|
||||
bus_space_read_multi_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_region_stream_2(r, o, d, c) \
|
||||
bus_space_read_region_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_set_multi_stream_2(r, o, v, c) \
|
||||
bus_space_set_multi_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_set_region_stream_2(r, o, v, c) \
|
||||
bus_space_set_region_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_write_stream_2(r, o, v) \
|
||||
bus_space_write_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (v))
|
||||
#define bus_write_multi_stream_2(r, o, d, c) \
|
||||
bus_space_write_multi_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_write_region_stream_2(r, o, d, c) \
|
||||
bus_space_write_region_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_4(r, o) \
|
||||
bus_space_read_4((r)->r_bustag, (r)->r_bushandle, (o))
|
||||
#define bus_read_multi_4(r, o, d, c) \
|
||||
bus_space_read_multi_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_region_4(r, o, d, c) \
|
||||
bus_space_read_region_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_set_multi_4(r, o, v, c) \
|
||||
bus_space_set_multi_4((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_set_region_4(r, o, v, c) \
|
||||
bus_space_set_region_4((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_write_4(r, o, v) \
|
||||
bus_space_write_4((r)->r_bustag, (r)->r_bushandle, (o), (v))
|
||||
#define bus_write_multi_4(r, o, d, c) \
|
||||
bus_space_write_multi_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_write_region_4(r, o, d, c) \
|
||||
bus_space_write_region_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_stream_4(r, o) \
|
||||
bus_space_read_stream_4((r)->r_bustag, (r)->r_bushandle, (o))
|
||||
#define bus_read_multi_stream_4(r, o, d, c) \
|
||||
bus_space_read_multi_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_region_stream_4(r, o, d, c) \
|
||||
bus_space_read_region_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_set_multi_stream_4(r, o, v, c) \
|
||||
bus_space_set_multi_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_set_region_stream_4(r, o, v, c) \
|
||||
bus_space_set_region_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_write_stream_4(r, o, v) \
|
||||
bus_space_write_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (v))
|
||||
#define bus_write_multi_stream_4(r, o, d, c) \
|
||||
bus_space_write_multi_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_write_region_stream_4(r, o, d, c) \
|
||||
bus_space_write_region_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_8(r, o) \
|
||||
bus_space_read_8((r)->r_bustag, (r)->r_bushandle, (o))
|
||||
#define bus_read_multi_8(r, o, d, c) \
|
||||
bus_space_read_multi_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_region_8(r, o, d, c) \
|
||||
bus_space_read_region_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_set_multi_8(r, o, v, c) \
|
||||
bus_space_set_multi_8((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_set_region_8(r, o, v, c) \
|
||||
bus_space_set_region_8((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_write_8(r, o, v) \
|
||||
bus_space_write_8((r)->r_bustag, (r)->r_bushandle, (o), (v))
|
||||
#define bus_write_multi_8(r, o, d, c) \
|
||||
bus_space_write_multi_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_write_region_8(r, o, d, c) \
|
||||
bus_space_write_region_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_stream_8(r, o) \
|
||||
bus_space_read_stream_8((r)->r_bustag, (r)->r_bushandle, (o))
|
||||
#define bus_read_multi_stream_8(r, o, d, c) \
|
||||
bus_space_read_multi_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_read_region_stream_8(r, o, d, c) \
|
||||
bus_space_read_region_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_set_multi_stream_8(r, o, v, c) \
|
||||
bus_space_set_multi_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_set_region_stream_8(r, o, v, c) \
|
||||
bus_space_set_region_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
|
||||
#define bus_write_stream_8(r, o, v) \
|
||||
bus_space_write_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (v))
|
||||
#define bus_write_multi_stream_8(r, o, d, c) \
|
||||
bus_space_write_multi_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#define bus_write_region_stream_8(r, o, d, c) \
|
||||
bus_space_write_region_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#endif /* !_SYS_BUS_H_ */
|
||||
|
||||
68
sys/tools/bus_macro.sh
Normal file
68
sys/tools/bus_macro.sh
Normal file
@ -0,0 +1,68 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2004-2005 Poul-Henning Kamp.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
# Generate the convenience macros at the bottom of sys/bus.h
|
||||
#
|
||||
|
||||
macro () {
|
||||
|
||||
n=${1}
|
||||
shift
|
||||
echo -n "#define bus_${n}(r"
|
||||
for i
|
||||
do
|
||||
echo -n ", ${i}"
|
||||
done
|
||||
echo ") \\"
|
||||
echo -n " bus_space_${n}((r)->r_bustag, (r)->r_bushandle"
|
||||
for i
|
||||
do
|
||||
echo -n ", (${i})"
|
||||
done
|
||||
echo ")"
|
||||
}
|
||||
|
||||
macro barrier o l f
|
||||
|
||||
for w in 1 2 4 8
|
||||
do
|
||||
# macro copy_region_$w so dh do c
|
||||
# macro copy_region_stream_$w ?
|
||||
# macro peek_$w
|
||||
for s in "" stream_
|
||||
do
|
||||
macro read_$s$w o
|
||||
macro read_multi_$s$w o d c
|
||||
macro read_region_$s$w o d c
|
||||
macro set_multi_$s$w o v c
|
||||
macro set_region_$s$w o v c
|
||||
macro write_$s$w o v
|
||||
macro write_multi_$s$w o d c
|
||||
macro write_region_$s$w o d c
|
||||
done
|
||||
done
|
||||
Loading…
Reference in New Issue
Block a user