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, 36 insertions, 38 deletions

diff --git a/driver/mag_lis2mdl.h b/driver/mag_lis2mdl.h
index bc823628b3..ea28137beb 100644
--- a/driver/mag_lis2mdl.h
+++ b/driver/mag_lis2mdl.h
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -16,45 +16,45 @@
  * 8-bit address is 0011110Wb where the last bit represents whether the
  * operation is a read or a write.
  */
-#define LIS2MDL_ADDR_FLAGS		0x1e
+#define LIS2MDL_ADDR_FLAGS 0x1e
 
-#define LIS2MDL_STARTUP_MS		10
+#define LIS2MDL_STARTUP_MS 10
 
 /* Registers */
-#define LIS2MDL_WHO_AM_I_REG		0x4f
-#define LIS2MDL_CFG_REG_A_ADDR		0x60
-#define LIS2MDL_INT_CTRL_REG		0x63
-#define LIS2MDL_STATUS_REG		0x67
-#define LIS2MDL_OUT_REG			0x68
-
-#define LIS2MDL_WHO_AM_I		0x40
-
-#define LIS2MDL_FLAG_TEMP_COMPENSATION	0x80
-#define LIS2MDL_FLAG_REBOOT		0x40
-#define LIS2MDL_FLAG_SW_RESET		0x20
-#define LIS2MDL_FLAG_LOW_POWER		0x10
-#define LIS2MDL_ODR_50HZ		0x08
-#define LIS2MDL_ODR_20HZ		0x04
-#define LIS2MDL_ODR_10HZ		0x00
-#define LIS2MDL_MODE_IDLE		0x03
-#define LIS2MDL_MODE_SINGLE		0x01
-#define LIS2MDL_MODE_CONT		0x00
-#define LIS2MDL_ODR_MODE_MASK		0x8f
-
-#define LIS2MDL_X_DIRTY			0x01
-#define LIS2MDL_Y_DIRTY			0x02
-#define LIS2MDL_Z_DIRTY			0x04
-#define LIS2MDL_XYZ_DIRTY		0x08
-#define LIS2MDL_XYZ_DIRTY_MASK		0x0f
-
-#define	LIS2DSL_RESOLUTION		16
+#define LIS2MDL_WHO_AM_I_REG 0x4f
+#define LIS2MDL_CFG_REG_A_ADDR 0x60
+#define LIS2MDL_INT_CTRL_REG 0x63
+#define LIS2MDL_STATUS_REG 0x67
+#define LIS2MDL_OUT_REG 0x68
+
+#define LIS2MDL_WHO_AM_I 0x40
+
+#define LIS2MDL_FLAG_TEMP_COMPENSATION 0x80
+#define LIS2MDL_FLAG_REBOOT 0x40
+#define LIS2MDL_FLAG_SW_RESET 0x20
+#define LIS2MDL_FLAG_LOW_POWER 0x10
+#define LIS2MDL_ODR_50HZ 0x08
+#define LIS2MDL_ODR_20HZ 0x04
+#define LIS2MDL_ODR_10HZ 0x00
+#define LIS2MDL_MODE_IDLE 0x03
+#define LIS2MDL_MODE_SINGLE 0x01
+#define LIS2MDL_MODE_CONT 0x00
+#define LIS2MDL_ODR_MODE_MASK 0x8f
+
+#define LIS2MDL_X_DIRTY 0x01
+#define LIS2MDL_Y_DIRTY 0x02
+#define LIS2MDL_Z_DIRTY 0x04
+#define LIS2MDL_XYZ_DIRTY 0x08
+#define LIS2MDL_XYZ_DIRTY_MASK 0x0f
+
+#define LIS2DSL_RESOLUTION 16
 /*
  * Maximum sensor data range (milligauss):
  * Spec is 1.5 mguass / LSB, so 0.15 uT / LSB.
  * Calibration code is set to 16LSB/ut, [0.0625 uT/LSB]
  * Apply a multiplier to change the unit
  */
-#define LIS2MDL_RATIO(_in) (((_in) * 24) / 10)
+#define LIS2MDL_RATIO(_in) (((_in)*24) / 10)
 
 struct lis2mdl_private_data {
 	/* lsm6dsm_data union requires cal be first element */
@@ -63,8 +63,8 @@ struct lis2mdl_private_data {
 	struct stprivate_data data;
 #endif
 #ifdef CONFIG_MAG_BMI_LIS2MDL
-	intv3_t          hn;   /* last sample for offset compensation */
-	int              hn_valid;
+	intv3_t hn; /* last sample for offset compensation */
+	int hn_valid;
 #endif
 };
 
@@ -75,15 +75,13 @@ struct lis2mdl_private_data {
 	(&(DOWNCAST(s->drv_data, struct lis2mdl_private_data, data)->cal))
 #endif
 
-
-#define LIS2MDL_ODR_MIN_VAL	10000
-#define LIS2MDL_ODR_MAX_VAL	50000
+#define LIS2MDL_ODR_MIN_VAL 10000
+#define LIS2MDL_ODR_MAX_VAL 50000
 #if (CONFIG_EC_MAX_SENSOR_FREQ_MILLIHZ <= LIS2MDL_ODR_MAX_VAL)
 #error "EC too slow for magnetometer"
 #endif
 
-void lis2mdl_normalize(const struct motion_sensor_t *s,
-		       intv3_t v,
+void lis2mdl_normalize(const struct motion_sensor_t *s, intv3_t v,
 		       uint8_t *data);
 
 extern const struct accelgyro_drv lis2mdl_drv;