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, 47 insertions, 47 deletions

diff --git a/driver/als_bh1730.h b/driver/als_bh1730.h
index f4bbc37a13..ab5a34b92b 100644
--- a/driver/als_bh1730.h
+++ b/driver/als_bh1730.h
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -9,42 +9,42 @@
 #define __CROS_EC_ALS_BH1730_H
 
 /* I2C interface */
-#define BH1730_I2C_ADDR_FLAGS	0x29
+#define BH1730_I2C_ADDR_FLAGS 0x29
 
 /* BH1730 registers */
-#define BH1730_CONTROL		0x80
-#define BH1730_TIMING		0x81
-#define BH1730_INTERRUPT	0x82
-#define BH1730_THLLOW		0x83
-#define BH1730_THLHIGH		0x84
-#define BH1730_THHLOW		0x85
-#define BH1730_THHHIGH		0x86
-#define BH1730_GAIN		0x87
-#define BH1730_OPART_ID		0x92
-#define BH1730_DATA0LOW		0x94
-#define BH1730_DATA0HIGH	0x95
-#define BH1730_DATA1LOW		0x96
-#define BH1730_DATA1HIGH	0x97
+#define BH1730_CONTROL 0x80
+#define BH1730_TIMING 0x81
+#define BH1730_INTERRUPT 0x82
+#define BH1730_THLLOW 0x83
+#define BH1730_THLHIGH 0x84
+#define BH1730_THHLOW 0x85
+#define BH1730_THHHIGH 0x86
+#define BH1730_GAIN 0x87
+#define BH1730_OPART_ID 0x92
+#define BH1730_DATA0LOW 0x94
+#define BH1730_DATA0HIGH 0x95
+#define BH1730_DATA1LOW 0x96
+#define BH1730_DATA1HIGH 0x97
 /* Software reset */
-#define BH1730_RESET		0xE4
+#define BH1730_RESET 0xE4
 
 /* Registers bits */
-#define BH1730_CONTROL_ADC_INTR_INACTIVE	(0x00 << 5)
-#define BH1730_CONTROL_ADC_INTR_ACTIVE		(0x01 << 5)
-#define BH1730_CONTROL_ADC_VALID		(0x01 << 4)
-#define BH1730_CONTROL_ONE_TIME_CONTINOUS	(0x00 << 3)
-#define BH1730_CONTROL_ONE_TIME_ONETIME		(0x01 << 3)
-#define BH1730_CONTROL_DATA_SEL_TYPE0_AND_1	(0x00 << 2)
-#define BH1730_CONTROL_DATA_SEL_TYPE0		(0x01 << 2)
-#define BH1730_CONTROL_ADC_EN_DISABLE		(0x00 << 1)
-#define BH1730_CONTROL_ADC_EN_ENABLE		(0x01 << 1)
-#define BH1730_CONTROL_POWER_DISABLE		(0x00 << 0)
-#define BH1730_CONTROL_POWER_ENABLE		(0x01 << 0)
+#define BH1730_CONTROL_ADC_INTR_INACTIVE (0x00 << 5)
+#define BH1730_CONTROL_ADC_INTR_ACTIVE (0x01 << 5)
+#define BH1730_CONTROL_ADC_VALID (0x01 << 4)
+#define BH1730_CONTROL_ONE_TIME_CONTINOUS (0x00 << 3)
+#define BH1730_CONTROL_ONE_TIME_ONETIME (0x01 << 3)
+#define BH1730_CONTROL_DATA_SEL_TYPE0_AND_1 (0x00 << 2)
+#define BH1730_CONTROL_DATA_SEL_TYPE0 (0x01 << 2)
+#define BH1730_CONTROL_ADC_EN_DISABLE (0x00 << 1)
+#define BH1730_CONTROL_ADC_EN_ENABLE (0x01 << 1)
+#define BH1730_CONTROL_POWER_DISABLE (0x00 << 0)
+#define BH1730_CONTROL_POWER_ENABLE (0x01 << 0)
 
-#define BH1730_GAIN_GAIN_X1_GAIN		(0x00 << 0)
-#define BH1730_GAIN_GAIN_X2_GAIN		(0x01 << 0)
-#define BH1730_GAIN_GAIN_X64_GAIN		(0x02 << 0)
-#define BH1730_GAIN_GAIN_X128_GAIN		(0x03 << 0)
+#define BH1730_GAIN_GAIN_X1_GAIN (0x00 << 0)
+#define BH1730_GAIN_GAIN_X2_GAIN (0x01 << 0)
+#define BH1730_GAIN_GAIN_X64_GAIN (0x02 << 0)
+#define BH1730_GAIN_GAIN_X128_GAIN (0x03 << 0)
 
 /* Sensor configuration */
 /* Select Gain */
@@ -54,10 +54,10 @@
 /* Select Itime, 0xDA is 102.6ms = 38*2.7ms */
 #define BH1730_CONF_ITIME 0xDA
 #define ITIME_MS_X_10 ((256 - BH1730_CONF_ITIME) * 27)
-#define ITIME_MS_X_1K (ITIME_MS_X_10*100)
+#define ITIME_MS_X_1K (ITIME_MS_X_10 * 100)
 
 /* default Itime is about 10Hz */
-#define BH1730_10000_MHZ (10*1000)
+#define BH1730_10000_MHZ (10 * 1000)
 #define BH1730_MAX_FREQ BH1730_10000_MHZ
 /*
  * 10Hz is too fast for the AP: allow the AP query data less often, the EC will
@@ -70,21 +70,21 @@
  * parameters are not defined.
  */
 #ifndef CONFIG_ALS_BH1730_LUXTH_PARAMS
-#define BH1730_LUXTH1_1K                260
-#define BH1730_LUXTH1_D0_1K             1290
-#define BH1730_LUXTH1_D1_1K             2733
-#define BH1730_LUXTH2_1K                550
-#define BH1730_LUXTH2_D0_1K             797
-#define BH1730_LUXTH2_D1_1K             859
-#define BH1730_LUXTH3_1K                1090
-#define BH1730_LUXTH3_D0_1K             510
-#define BH1730_LUXTH3_D1_1K             345
-#define BH1730_LUXTH4_1K                2130
-#define BH1730_LUXTH4_D0_1K             276
-#define BH1730_LUXTH4_D1_1K             130
+#define BH1730_LUXTH1_1K 260
+#define BH1730_LUXTH1_D0_1K 1290
+#define BH1730_LUXTH1_D1_1K 2733
+#define BH1730_LUXTH2_1K 550
+#define BH1730_LUXTH2_D0_1K 797
+#define BH1730_LUXTH2_D1_1K 859
+#define BH1730_LUXTH3_1K 1090
+#define BH1730_LUXTH3_D0_1K 510
+#define BH1730_LUXTH3_D1_1K 345
+#define BH1730_LUXTH4_1K 2130
+#define BH1730_LUXTH4_D0_1K 276
+#define BH1730_LUXTH4_D1_1K 130
 #endif
 
-#define BH1730_GET_DATA(_s)    ((struct bh1730_drv_data_t *)(_s)->drv_data)
+#define BH1730_GET_DATA(_s) ((struct bh1730_drv_data_t *)(_s)->drv_data)
 
 struct bh1730_drv_data_t {
 	int rate;
@@ -93,4 +93,4 @@ struct bh1730_drv_data_t {
 
 extern const struct accelgyro_drv bh1730_drv;
 
-#endif	/* __CROS_EC_ALS_BH1730_H */
+#endif /* __CROS_EC_ALS_BH1730_H */