Module Name: src
Committed By: skrll
Date: Sat Oct 2 20:52:09 UTC 2021
Modified Files:
src/sys/arch/arm/cortex: a9tmr_reg.h cpu_in_cksum_asm_neon.S gicv3.c
pl310.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/cortex/a9tmr_reg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/cortex/cpu_in_cksum_asm_neon.S
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/cortex/gicv3.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/cortex/pl310.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/arm/cortex/a9tmr_reg.h
diff -u src/sys/arch/arm/cortex/a9tmr_reg.h:1.2 src/sys/arch/arm/cortex/a9tmr_reg.h:1.3
--- src/sys/arch/arm/cortex/a9tmr_reg.h:1.2 Sat Jul 27 07:02:09 2019
+++ src/sys/arch/arm/cortex/a9tmr_reg.h Sat Oct 2 20:52:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: a9tmr_reg.h,v 1.2 2019/07/27 07:02:09 skrll Exp $ */
+/* $NetBSD: a9tmr_reg.h,v 1.3 2021/10/02 20:52:09 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -87,7 +87,7 @@
#define TMR_GBL_CTL_PRESCALER __BIT(15,8)
#define TMR_GBL_CTL_AUTO_INC __BIT(3) // Auto Increment is enabled
#define TMR_GBL_CTL_INT_ENABLE __BIT(2) // [banked] INT 27 is enabled
-#define TMR_GBL_CTL_CMP_ENABLE __BIT(1) // [banked]
+#define TMR_GBL_CTL_CMP_ENABLE __BIT(1) // [banked]
#define TMR_GBL_CTL_ENABLE __BIT(0)
#endif /* !_ARM_CORTEX_A9TMR_REG_H_ */
Index: src/sys/arch/arm/cortex/cpu_in_cksum_asm_neon.S
diff -u src/sys/arch/arm/cortex/cpu_in_cksum_asm_neon.S:1.3 src/sys/arch/arm/cortex/cpu_in_cksum_asm_neon.S:1.4
--- src/sys/arch/arm/cortex/cpu_in_cksum_asm_neon.S:1.3 Sat Dec 22 18:58:29 2012
+++ src/sys/arch/arm/cortex/cpu_in_cksum_asm_neon.S Sat Oct 2 20:52:09 2021
@@ -29,7 +29,7 @@
#include <machine/asm.h>
-RCSID("$NetBSD: cpu_in_cksum_asm_neon.S,v 1.3 2012/12/22 18:58:29 matt Exp $")
+RCSID("$NetBSD: cpu_in_cksum_asm_neon.S,v 1.4 2021/10/02 20:52:09 skrll Exp $")
/*
* uint32_t
@@ -52,7 +52,7 @@ ENTRY(cpu_in_cksum_neon)
* Normally the lower addressed is in d6 but in this case we want to
* reverse it since we might only have a single dword and the final
* fold will want the dword to trim in d7 so put the first dword in
- * d7 until we know we are going to read more than one.
+ * d7 until we know we are going to read more than one.
*/
veor d6, d6, d6 /* clear second dword */
vld1.64 {d7}, [ip:64]! /* load first dword */
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.48 src/sys/arch/arm/cortex/gicv3.c:1.49
--- src/sys/arch/arm/cortex/gicv3.c:1.48 Sun Sep 26 13:38:50 2021
+++ src/sys/arch/arm/cortex/gicv3.c Sat Oct 2 20:52:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.48 2021/09/26 13:38:50 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.49 2021/10/02 20:52:09 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -32,7 +32,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.48 2021/09/26 13:38:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.49 2021/10/02 20:52:09 skrll Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -837,7 +837,7 @@ gicv3_quirk_rockchip_rk3399(struct gicv3
/*
* If we see fewer PMR bits than IPRIORITYRn bits here, it means
* we have a secure view of IPRIORITYRn (this is not supposed to
- * happen!).
+ * happen!).
*/
if (pmrbits < pribits) {
aprint_verbose_dev(sc->sc_dev,
Index: src/sys/arch/arm/cortex/pl310.c
diff -u src/sys/arch/arm/cortex/pl310.c:1.19 src/sys/arch/arm/cortex/pl310.c:1.20
--- src/sys/arch/arm/cortex/pl310.c:1.19 Sat Jan 19 20:52:26 2019
+++ src/sys/arch/arm/cortex/pl310.c Sat Oct 2 20:52:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pl310.c,v 1.19 2019/01/19 20:52:26 jmcneill Exp $ */
+/* $NetBSD: pl310.c,v 1.20 2021/10/02 20:52:09 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1.19 2019/01/19 20:52:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1.20 2021/10/02 20:52:09 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -157,7 +157,7 @@ arml2cc_attach(device_t parent, device_t
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_HIGH);
- bus_space_subregion(sc->sc_memt, mpcaa->mpcaa_memh,
+ bus_space_subregion(sc->sc_memt, mpcaa->mpcaa_memh,
off, L2CC_SIZE, &sc->sc_memh);
uint32_t id = arml2cc_read_4(sc, L2C_CACHE_ID);
