Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Jun 2021 14:01:04 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 2c89a8c9aae2 - stable/13 - Clean up the style in the arm64 bus.h
Message-ID:  <202106121401.15CE14mp022184@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=2c89a8c9aae25a20882bf33c0f291fab692f307a

commit 2c89a8c9aae25a20882bf33c0f291fab692f307a
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2021-04-08 09:41:23 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2021-06-12 01:21:11 +0000

    Clean up the style in the arm64 bus.h
    
    MFC after:      2 weeks
    Sponsored by:   Innovate UK
    
    (cherry picked from commit 5998328e55f8850718a6b48842823eb0a6524ae6)
---
 sys/arm64/include/bus.h | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/sys/arm64/include/bus.h b/sys/arm64/include/bus.h
index 417b918f595f..5995aa0b4a79 100644
--- a/sys/arm64/include/bus.h
+++ b/sys/arm64/include/bus.h
@@ -79,12 +79,12 @@
 #define	BUS_SPACE_MAXSIZE_32BIT	0xFFFFFFFFUL
 #define	BUS_SPACE_MAXSIZE_40BIT	0xFFFFFFFFFFUL
 
-#define	BUS_SPACE_MAXADDR 	0xFFFFFFFFFFFFFFFFUL
-#define	BUS_SPACE_MAXSIZE 	0xFFFFFFFFFFFFFFFFUL
+#define	BUS_SPACE_MAXADDR	0xFFFFFFFFFFFFFFFFUL
+#define	BUS_SPACE_MAXSIZE	0xFFFFFFFFFFFFFFFFUL
 
 #define	BUS_SPACE_MAP_CACHEABLE		0x01
 #define	BUS_SPACE_MAP_LINEAR		0x02
-#define	BUS_SPACE_MAP_PREFETCHABLE     	0x04
+#define	BUS_SPACE_MAP_PREFETCHABLE	0x04
 
 #define	BUS_SPACE_UNRESTRICTED	(~0)
 
@@ -133,7 +133,7 @@ struct bus_space {
 			    bus_size_t, u_int32_t *, bus_size_t);
 	void		(*bs_rm_8) (void *, bus_space_handle_t,
 			    bus_size_t, u_int64_t *, bus_size_t);
-					
+
 	/* read region */
 	void		(*bs_rr_1) (void *, bus_space_handle_t,
 			    bus_size_t, u_int8_t *, bus_size_t);
@@ -143,7 +143,7 @@ struct bus_space {
 			    bus_size_t, u_int32_t *, bus_size_t);
 	void		(*bs_rr_8) (void *, bus_space_handle_t,
 			    bus_size_t, u_int64_t *, bus_size_t);
-					
+
 	/* write single */
 	void		(*bs_w_1) (void *, bus_space_handle_t,
 			    bus_size_t, u_int8_t);
@@ -163,7 +163,7 @@ struct bus_space {
 			    bus_size_t, const u_int32_t *, bus_size_t);
 	void		(*bs_wm_8) (void *, bus_space_handle_t,
 			    bus_size_t, const u_int64_t *, bus_size_t);
-					
+
 	/* write region */
 	void		(*bs_wr_1) (void *, bus_space_handle_t,
 			    bus_size_t, const u_int8_t *, bus_size_t);
@@ -219,7 +219,7 @@ struct bus_space {
 			    bus_size_t, u_int32_t *, bus_size_t);
 	void		(*bs_rm_8_s) (void *, bus_space_handle_t,
 			    bus_size_t, u_int64_t *, bus_size_t);
-					
+
 	/* read region stream */
 	void		(*bs_rr_1_s) (void *, bus_space_handle_t,
 			    bus_size_t, u_int8_t *, bus_size_t);
@@ -229,7 +229,7 @@ struct bus_space {
 			    bus_size_t, u_int32_t *, bus_size_t);
 	void		(*bs_rr_8_s) (void *, bus_space_handle_t,
 			    bus_size_t, u_int64_t *, bus_size_t);
-					
+
 	/* write single stream */
 	void		(*bs_w_1_s) (void *, bus_space_handle_t,
 			    bus_size_t, u_int8_t);
@@ -249,7 +249,7 @@ struct bus_space {
 			    bus_size_t, const u_int32_t *, bus_size_t);
 	void		(*bs_wm_8_s) (void *, bus_space_handle_t,
 			    bus_size_t, const u_int64_t *, bus_size_t);
-					
+
 	/* write region stream */
 	void		(*bs_wr_1_s) (void *, bus_space_handle_t,
 			    bus_size_t, const u_int8_t *, bus_size_t);
@@ -259,6 +259,7 @@ struct bus_space {
 			    bus_size_t, const u_int32_t *, bus_size_t);
 	void		(*bs_wr_8_s) (void *, bus_space_handle_t,
 			    bus_size_t, const u_int64_t *, bus_size_t);
+
 	/* peek */
 	int		(*bs_peek_1)(void *, bus_space_handle_t,
 			    bus_size_t , uint8_t *);
@@ -268,6 +269,7 @@ struct bus_space {
 			    bus_size_t , uint32_t *);
 	int		(*bs_peek_8)(void *, bus_space_handle_t,
 			    bus_size_t , uint64_t *);
+
 	/* poke */
 	int		(*bs_poke_1)(void *, bus_space_handle_t,
 			   bus_size_t, uint8_t);
@@ -341,9 +343,9 @@ struct bus_space {
 #define	bus_space_read_4(t, h, o)	__bs_rs(4,(t),(h),(o))
 #define	bus_space_read_8(t, h, o)	__bs_rs(8,(t),(h),(o))
 
-#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))
+#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))
 #define	bus_space_read_stream_8(t, h, o)	__bs_rs_s(8,(t), (h), (o))
 
 /*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106121401.15CE14mp022184>