Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-releasefirmware-fpmcu-bloonchipper-release

Generated by: ./util/update_release_branch.py --board bloonchipper
--relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-
fpmcu-bloonchipper-release

Relevant changes:

git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh

ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dc3e9008b8 board/hatch_fp/board.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header

BRANCH=None
BUG=b:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
     Test "aes": PASSED
     Test "cec": PASSED
     Test "cortexm_fpu": PASSED
     Test "crc": PASSED
     Test "flash_physical": PASSED
     Test "flash_write_protect": PASSED
     Test "fpsensor_hw": PASSED
     Test "fpsensor_spi_ro": PASSED
     Test "fpsensor_spi_rw": PASSED
     Test "fpsensor_uart_ro": PASSED
     Test "fpsensor_uart_rw": PASSED
     Test "mpu_ro": PASSED
     Test "mpu_rw": PASSED
     Test "mutex": PASSED
     Test "pingpong": PASSED
     Test "printf": PASSED
     Test "queue": PASSED
     Test "rollback_region0": PASSED
     Test "rollback_region1": PASSED
     Test "rollback_entropy": PASSED
     Test "rtc": PASSED
     Test "sha256": PASSED
     Test "sha256_unrolled": PASSED
     Test "static_if": PASSED
     Test "stdlib": PASSED
     Test "system_is_locked_wp_on": PASSED
     Test "system_is_locked_wp_off": PASSED
     Test "timer_dos": PASSED
     Test "utils": PASSED
     Test "utils_str": PASSED
     Test "stm32f_rtc": PASSED
     Test "panic_data_bloonchipper_v2.0.4277": PASSED
     Test "panic_data_bloonchipper_v2.0.5938": PASSED

Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3

1 files changed, 76 insertions, 78 deletions

diff --git a/driver/accel_lis2ds.h b/driver/accel_lis2ds.h
index e25bc5954f..3f821b3514 100644
--- a/driver/accel_lis2ds.h
+++ b/driver/accel_lis2ds.h
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -14,95 +14,93 @@
  * 7-bit address is 110101Xb. Where 'X' is determined
  * by the voltage on the ADDR pin.
  */
-#define LIS2DS_ADDR0_FLAGS		0x1a
-#define LIS2DS_ADDR1_FLAGS		0x1e
+#define LIS2DS_ADDR0_FLAGS 0x1a
+#define LIS2DS_ADDR1_FLAGS 0x1e
 
 /* who am I  */
-#define LIS2DS_WHO_AM_I_REG		0x0f
-#define LIS2DS_WHO_AM_I			0x43
+#define LIS2DS_WHO_AM_I_REG 0x0f
+#define LIS2DS_WHO_AM_I 0x43
 
 /* X, Y, Z axis data len */
-#define LIS2DS_OUT_XYZ_SIZE		6
+#define LIS2DS_OUT_XYZ_SIZE 6
 
 /* COMMON DEFINE FOR ACCEL SENSOR */
-#define LIS2DS_EN_BIT			0x01
-#define LIS2DS_DIS_BIT			0x00
-
-#define LIS2DS_CTRL1_ADDR		0x20
-#define LIS2DS_CTRL2_ADDR		0x21
-#define LIS2DS_CTRL3_ADDR		0x22
-#define LIS2DS_TAP_X_EN			0x20
-#define LIS2DS_TAP_Y_EN			0x10
-#define LIS2DS_TAP_Z_EN			0x08
-#define LIS2DS_TAP_EN_MASK		(LIS2DS_TAP_X_EN | \
-					 LIS2DS_TAP_Y_EN | \
-					 LIS2DS_TAP_Z_EN)
-#define LIS2DS_TAP_EN_ALL		0x07
-
-#define LIS2DS_CTRL4_ADDR		0x23
-#define LIS2DS_INT1_FTH			0x02
-#define LIS2DS_INT1_D_TAP		0x08
-#define LIS2DS_INT1_S_TAP		0x40
-
-#define LIS2DS_CTRL5_ADDR		0x24
-#define LIS2DS_FIFO_CTRL_ADDR		0x25
-#define LIS2DS_FIFO_MODE_MASK		0xe0
-#define LIS2DS_FIFO_BYPASS_MODE		0
-#define LIS2DS_FIFO_MODE		1
-#define LIS2DS_FIFO_CONT_MODE		6
-
-#define LIS2DS_STATUS_REG		0x27
-#define LIS2DS_STS_XLDA_UP		0x01
-#define LIS2DS_SINGLE_TAP_UP		0x08
-#define LIS2DS_DOUBLE_TAP_UP		0x10
-#define LIS2DS_FIFO_THS_UP		0x80
-
-#define LIS2DS_OUT_X_L_ADDR		0x28
-#define LIS2DS_FIFO_THS_ADDR		0x2e
-
-#define LIS2DS_FIFO_SRC_ADDR		0x2f
-#define LIS2DS_FIFO_DIFF_MASK		0xff
-#define LIS2DS_FIFO_DIFF8_MASK		0x20
-#define LIS2DS_FIFO_OVR_MASK		0x40
-#define LIS2DS_FIFO_FTH_MASK		0x80
+#define LIS2DS_EN_BIT 0x01
+#define LIS2DS_DIS_BIT 0x00
+
+#define LIS2DS_CTRL1_ADDR 0x20
+#define LIS2DS_CTRL2_ADDR 0x21
+#define LIS2DS_CTRL3_ADDR 0x22
+#define LIS2DS_TAP_X_EN 0x20
+#define LIS2DS_TAP_Y_EN 0x10
+#define LIS2DS_TAP_Z_EN 0x08
+#define LIS2DS_TAP_EN_MASK (LIS2DS_TAP_X_EN | LIS2DS_TAP_Y_EN | LIS2DS_TAP_Z_EN)
+#define LIS2DS_TAP_EN_ALL 0x07
+
+#define LIS2DS_CTRL4_ADDR 0x23
+#define LIS2DS_INT1_FTH 0x02
+#define LIS2DS_INT1_D_TAP 0x08
+#define LIS2DS_INT1_S_TAP 0x40
+
+#define LIS2DS_CTRL5_ADDR 0x24
+#define LIS2DS_FIFO_CTRL_ADDR 0x25
+#define LIS2DS_FIFO_MODE_MASK 0xe0
+#define LIS2DS_FIFO_BYPASS_MODE 0
+#define LIS2DS_FIFO_MODE 1
+#define LIS2DS_FIFO_CONT_MODE 6
+
+#define LIS2DS_STATUS_REG 0x27
+#define LIS2DS_STS_XLDA_UP 0x01
+#define LIS2DS_SINGLE_TAP_UP 0x08
+#define LIS2DS_DOUBLE_TAP_UP 0x10
+#define LIS2DS_FIFO_THS_UP 0x80
+
+#define LIS2DS_OUT_X_L_ADDR 0x28
+#define LIS2DS_FIFO_THS_ADDR 0x2e
+
+#define LIS2DS_FIFO_SRC_ADDR 0x2f
+#define LIS2DS_FIFO_DIFF_MASK 0xff
+#define LIS2DS_FIFO_DIFF8_MASK 0x20
+#define LIS2DS_FIFO_OVR_MASK 0x40
+#define LIS2DS_FIFO_FTH_MASK 0x80
 
 /*
  * Concatenated with DIFF8 bit in FIFO_SRC (2Fh) register, it represents the
  * number of unread samples stored in FIFO. (000000000 = FIFO empty;
  * 100000000 = FIFO full, 256 unread samples).
  */
-#define LIS2DS_FIFO_SAMPLES_ADDR	0x30
-#define LIS2DS_TAP_6D_THS_ADDR		0x31
-#define LIS2DS_INT_DUR_ADDR		0x32
-#define LIS2DS_WAKE_UP_THS_ADDR		0x33
+#define LIS2DS_FIFO_SAMPLES_ADDR 0x30
+#define LIS2DS_TAP_6D_THS_ADDR 0x31
+#define LIS2DS_INT_DUR_ADDR 0x32
+#define LIS2DS_WAKE_UP_THS_ADDR 0x33
 
-#define LIS2DS_TAP_SRC_ADDR		0x38
-#define LIS2DS_TAP_EVENT_DETECT		0x40
+#define LIS2DS_TAP_SRC_ADDR 0x38
+#define LIS2DS_TAP_EVENT_DETECT 0x40
 
 /* Alias Register/Mask */
-#define LIS2DS_ACC_ODR_ADDR		LIS2DS_CTRL1_ADDR
-#define LIS2DS_ACC_ODR_MASK		0xf0
+#define LIS2DS_ACC_ODR_ADDR LIS2DS_CTRL1_ADDR
+#define LIS2DS_ACC_ODR_MASK 0xf0
 
-#define LIS2DS_BDU_ADDR			LIS2DS_CTRL1_ADDR
-#define LIS2DS_BDU_MASK			0x01
+#define LIS2DS_BDU_ADDR LIS2DS_CTRL1_ADDR
+#define LIS2DS_BDU_MASK 0x01
 
-#define LIS2DS_SOFT_RESET_ADDR		LIS2DS_CTRL2_ADDR
-#define LIS2DS_SOFT_RESET_MASK		0x40
+#define LIS2DS_SOFT_RESET_ADDR LIS2DS_CTRL2_ADDR
+#define LIS2DS_SOFT_RESET_MASK 0x40
 
-#define LIS2DS_LIR_ADDR			LIS2DS_CTRL3_ADDR
-#define LIS2DS_LIR_MASK			0x04
+#define LIS2DS_LIR_ADDR LIS2DS_CTRL3_ADDR
+#define LIS2DS_LIR_MASK 0x04
 
-#define LIS2DS_H_ACTIVE_ADDR		LIS2DS_CTRL3_ADDR
-#define LIS2DS_H_ACTIVE_MASK		0x02
+#define LIS2DS_H_ACTIVE_ADDR LIS2DS_CTRL3_ADDR
+#define LIS2DS_H_ACTIVE_MASK 0x02
 
-#define LIS2DS_INT1_FTH_ADDR		LIS2DS_CTRL4_ADDR
-#define LIS2DS_INT1_FTH_MASK		0x02
+#define LIS2DS_INT1_FTH_ADDR LIS2DS_CTRL4_ADDR
+#define LIS2DS_INT1_FTH_MASK 0x02
 
-#define LIS2DS_INT2_ON_INT1_ADDR	LIS2DS_CTRL5_ADDR
-#define LIS2DS_INT2_ON_INT1_MASK	0x20
+#define LIS2DS_INT2_ON_INT1_ADDR LIS2DS_CTRL5_ADDR
+#define LIS2DS_INT2_ON_INT1_MASK 0x20
 
-#define LIS2DS_DRDY_PULSED_ADDR		LIS2DS_CTRL5_ADDR
-#define LIS2DS_DRDY_PULSED_MASK		0x80
+#define LIS2DS_DRDY_PULSED_ADDR LIS2DS_CTRL5_ADDR
+#define LIS2DS_DRDY_PULSED_MASK 0x80
 
 /* Acc data rate for HR mode */
 enum lis2ds_odr {
@@ -118,7 +116,7 @@ enum lis2ds_odr {
 };
 
 /* Absolute Acc rate */
-#define LIS2DS_ODR_MIN_VAL		12500
+#define LIS2DS_ODR_MIN_VAL 12500
 #define LIS2DS_ODR_MAX_VAL \
 	MOTION_MAX_SENSOR_FREQUENCY(800000, LIS2DS_ODR_MIN_VAL)
 
@@ -130,8 +128,8 @@ enum lis2ds_odr {
 	(LIS2DS_ODR_MIN_VAL << (_reg - LIS2DS_ODR_12HZ_VAL))
 
 /* Full scale range registers */
-#define LIS2DS_FS_ADDR			LIS2DS_CTRL1_ADDR
-#define LIS2DS_FS_MASK			0x0c
+#define LIS2DS_FS_ADDR LIS2DS_CTRL1_ADDR
+#define LIS2DS_FS_MASK 0x0c
 
 /* Acc FS value */
 enum lis2ds_fs {
@@ -142,20 +140,20 @@ enum lis2ds_fs {
 	LIS2DS_FS_LIST_NUM
 };
 
-#define LIS2DS_ACCEL_FS_MAX_VAL		16
-#define LIS2DS_ACCEL_FS_MIN_VAL		2
+#define LIS2DS_ACCEL_FS_MAX_VAL 16
+#define LIS2DS_ACCEL_FS_MIN_VAL 2
 
 /* Reg value from Full Scale */
-#define LIS2DS_FS_REG(_fs) \
-	(_fs == 2 ? LIS2DS_FS_2G_VAL : \
-	_fs == 16 ? LIS2DS_FS_16G_VAL : \
-	__fls(_fs))
+#define LIS2DS_FS_REG(_fs)               \
+	(_fs == 2  ? LIS2DS_FS_2G_VAL :  \
+	 _fs == 16 ? LIS2DS_FS_16G_VAL : \
+		     __fls(_fs))
 
 /*
  * Sensor resolution in number of bits. Sensor has two resolution:
  * 10 and 14 bit for LP and HR mode resp.
  */
-#define LIS2DS_RESOLUTION		16
+#define LIS2DS_RESOLUTION 16
 
 extern const struct accelgyro_drv lis2ds_drv;