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

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

Relevant changes:

git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp
board/dartmonkey 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
a0751778f4 board/nocturne_fp/ro_workarounds.c: 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
58f0246dbe board/nocturne_fp/board_ro.c: 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
84e53a65da board/nocturne_fp/board.h: 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
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:244387210 b:242720240 b:215613183 b:242720910 b:236386294
BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908
BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010
BUG=b:246424843 b:234181908 b:131913998
TEST=`make -j buildall`
TEST=./util/run_device_tests.py --board dartmonkey
     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 "panic_data_dartmonkey_v2.0.2887": PASSED
     Test "panic_data_nocturne_fp_v2.2.64": PASSED
     Test "panic_data_nami_fp_v2.2.144": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>

Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7

1 files changed, 52 insertions, 53 deletions

diff --git a/driver/als_si114x.h b/driver/als_si114x.h
index 2084c55f09..57ef6f8021 100644
--- a/driver/als_si114x.h
+++ b/driver/als_si114x.h
@@ -1,4 +1,4 @@
-/* Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 2015 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -8,75 +8,75 @@
 #ifndef __CROS_EC_ALS_SI114X_H
 #define __CROS_EC_ALS_SI114X_H
 
-#define SI114X_ADDR_FLAGS               0x5a
+#define SI114X_ADDR_FLAGS 0x5a
 
-#define SI114X_PART_ID		0x00
-#define SI114X_SEQ_ID		0x02
+#define SI114X_PART_ID 0x00
+#define SI114X_SEQ_ID 0x02
 
-#define SI114X_INT_CFG		0x03
-#define SI114X_INT_CFG_INT_OE		BIT(0)
+#define SI114X_INT_CFG 0x03
+#define SI114X_INT_CFG_INT_OE BIT(0)
 
-#define SI114X_IRQ_ENABLE	0x04
-#define SI114X_IRQ_ENABLE_PS3_IE	BIT(4)
-#define SI114X_IRQ_ENABLE_PS2_IE	BIT(3)
-#define SI114X_IRQ_ENABLE_PS1_IE	BIT(2)
-#define SI114X_IRQ_ENABLE_ALS_IE_INT1	BIT(1)
-#define SI114X_IRQ_ENABLE_ALS_IE_INT0	BIT(0)
+#define SI114X_IRQ_ENABLE 0x04
+#define SI114X_IRQ_ENABLE_PS3_IE BIT(4)
+#define SI114X_IRQ_ENABLE_PS2_IE BIT(3)
+#define SI114X_IRQ_ENABLE_PS1_IE BIT(2)
+#define SI114X_IRQ_ENABLE_ALS_IE_INT1 BIT(1)
+#define SI114X_IRQ_ENABLE_ALS_IE_INT0 BIT(0)
 
-#define SI114X_HW_KEY		0x07
-#define SI114X_HW_KEY_VALUE		0x17
+#define SI114X_HW_KEY 0x07
+#define SI114X_HW_KEY_VALUE 0x17
 
-#define SI114X_MEAS_RATE	0x08
-#define SI114X_ALS_RATE		0x09
-#define SI114X_PS_RATE		0x0A
+#define SI114X_MEAS_RATE 0x08
+#define SI114X_ALS_RATE 0x09
+#define SI114X_PS_RATE 0x0A
 
-#define SI114X_PS_LED21		0x0F
-#define SI114X_PS_LED3		0x10
-#define SI114X_NUM_LEDS  (CONFIG_ALS_SI114X - 0x40)
+#define SI114X_PS_LED21 0x0F
+#define SI114X_PS_LED3 0x10
+#define SI114X_NUM_LEDS (CONFIG_ALS_SI114X - 0x40)
 
-#define SI114X_PARAM_WR		0x17
-#define SI114X_COMMAND		0x18
+#define SI114X_PARAM_WR 0x17
+#define SI114X_COMMAND 0x18
 
-#define SI114X_COMMAND_PARAM_QUERY	0x80
-#define SI114X_COMMAND_PARAM_SET	0xA0
-#define SI114X_PARAM_CHLIST			0x01
-#define SI114X_PARAM_CHLIST_EN_ALS_VIS			BIT(4)
-#define SI114X_PARAM_CHLIST_EN_PS3			BIT(2)
-#define SI114X_PARAM_CHLIST_EN_PS2			BIT(1)
-#define SI114X_PARAM_CHLIST_EN_PS1			BIT(0)
-#define SI114X_PARAM_PS_ADC_COUNTER		0x0A
-#define SI114X_PARAM_PS_ADC_GAIN		0x0B
-#define SI114X_PARAM_PS_ADC_MISC		0x0C
-#define SI114X_PARAM_PS_ADC_MISC_MODE			BIT(2)
-#define SI114X_PARAM_PS_ADC_MISC_MODE_NORMAL_PROXIMITY	BIT(2)
-#define SI114X_PARAM_ALS_VIS_ADC_COUNTER	0x10
-#define SI114X_PARAM_ALS_VIS_ADC_GAIN		0x11
-#define SI114X_PARAM_ALS_VIS_ADC_MISC		0x12
+#define SI114X_COMMAND_PARAM_QUERY 0x80
+#define SI114X_COMMAND_PARAM_SET 0xA0
+#define SI114X_PARAM_CHLIST 0x01
+#define SI114X_PARAM_CHLIST_EN_ALS_VIS BIT(4)
+#define SI114X_PARAM_CHLIST_EN_PS3 BIT(2)
+#define SI114X_PARAM_CHLIST_EN_PS2 BIT(1)
+#define SI114X_PARAM_CHLIST_EN_PS1 BIT(0)
+#define SI114X_PARAM_PS_ADC_COUNTER 0x0A
+#define SI114X_PARAM_PS_ADC_GAIN 0x0B
+#define SI114X_PARAM_PS_ADC_MISC 0x0C
+#define SI114X_PARAM_PS_ADC_MISC_MODE BIT(2)
+#define SI114X_PARAM_PS_ADC_MISC_MODE_NORMAL_PROXIMITY BIT(2)
+#define SI114X_PARAM_ALS_VIS_ADC_COUNTER 0x10
+#define SI114X_PARAM_ALS_VIS_ADC_GAIN 0x11
+#define SI114X_PARAM_ALS_VIS_ADC_MISC 0x12
 
-#define SI114X_COMMAND_RESET		0x01
-#define SI114X_COMMAND_PS_FORCE		0x05
-#define SI114X_COMMAND_ALS_FORCE	0x06
+#define SI114X_COMMAND_RESET 0x01
+#define SI114X_COMMAND_PS_FORCE 0x05
+#define SI114X_COMMAND_ALS_FORCE 0x06
 
-#define SI114X_IRQ_STATUS	0x21
-#define SI114X_ALS_VIS_DATA0	0x22
+#define SI114X_IRQ_STATUS 0x21
+#define SI114X_ALS_VIS_DATA0 0x22
 
-#define SI114X_PARAM_RD		0x2E
+#define SI114X_PARAM_RD 0x2E
 
 /* Proximity sensor finds an object within 5 cm, disable light sensor */
-#define SI114X_COVERED_THRESHOLD        5
-#define SI114X_OVERFLOW                 0xffff
+#define SI114X_COVERED_THRESHOLD 5
+#define SI114X_OVERFLOW 0xffff
 
 /* Time to wait before re-initializing the device if access is denied */
-#define SI114X_DENIED_THRESHOLD		(10 * SECOND)
+#define SI114X_DENIED_THRESHOLD (10 * SECOND)
 
 /* Delay used for deferred callback when polling is enabled */
 #define SI114x_POLLING_DELAY (8 * MSEC)
 
 /* Min and Max sampling frequency in mHz */
-#define SI114X_PROX_MIN_FREQ            504
-#define SI114X_PROX_MAX_FREQ            50000
-#define SI114X_LIGHT_MIN_FREQ           504
-#define SI114X_LIGHT_MAX_FREQ           50000
+#define SI114X_PROX_MIN_FREQ 504
+#define SI114X_PROX_MAX_FREQ 50000
+#define SI114X_LIGHT_MIN_FREQ 504
+#define SI114X_LIGHT_MAX_FREQ 50000
 #if (CONFIG_EC_MAX_SENSOR_FREQ_MILLIHZ <= SI114X_PROX_MAX_FREQ)
 #error "EC too slow for light sensor"
 #endif
@@ -109,12 +109,11 @@ struct si114x_drv_data_t {
 	struct si114x_typed_data_t type_data[2];
 };
 
-#define SI114X_GET_DATA(_s) \
-	((struct si114x_drv_data_t *)(_s)->drv_data)
+#define SI114X_GET_DATA(_s) ((struct si114x_drv_data_t *)(_s)->drv_data)
 
 #define SI114X_GET_TYPED_DATA(_s) \
 	(&SI114X_GET_DATA(_s)->type_data[(_s)->type - MOTIONSENSE_TYPE_PROX])
 
 void si114x_interrupt(enum gpio_signal signal);
 
-#endif	/* __CROS_EC_ALS_SI114X_H */
+#endif /* __CROS_EC_ALS_SI114X_H */