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

diff --git a/driver/mp4245.c b/driver/mp4245.c
index 60df5affaf..a78cfbd068 100644
--- a/driver/mp4245.c
+++ b/driver/mp4245.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
+/* Copyright 2020 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -11,7 +11,6 @@
 #include "mp4245.h"
 #include "util.h"
 
-
 static int mp4245_reg16_write(int offset, int data)
 {
 	return i2c_write16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS, offset,
@@ -29,8 +28,8 @@ int mp4245_set_voltage_out(int desired_mv)
 	 *
 	 * VOUT_COMMAND = (Vdes (mV) * 1024 / 1000) / 1024
 	 */
-	vout = (desired_mv * MP4245_VOUT_FROM_MV + (MP4245_VOUT_1V >> 1))
-		/ MP4245_VOUT_1V;
+	vout = (desired_mv * MP4245_VOUT_FROM_MV + (MP4245_VOUT_1V >> 1)) /
+	       MP4245_VOUT_1V;
 
 	return mp4245_reg16_write(MP4245_CMD_VOUT_COMMAND, vout);
 }
@@ -50,7 +49,7 @@ int mp4245_votlage_out_enable(int enable)
 	int cmd_val = enable ? MP4245_CMD_OPERATION_ON : 0;
 
 	return i2c_write8(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-			MP4245_CMD_OPERATION, cmd_val);
+			  MP4245_CMD_OPERATION, cmd_val);
 }
 
 int mp3245_get_vbus(int *mv, int *ma)
@@ -61,9 +60,9 @@ int mp3245_get_vbus(int *mv, int *ma)
 
 	/* Get Vbus/Ibus raw measurements */
 	rv = i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		   MP4245_CMD_READ_VOUT, &vbus);
+			MP4245_CMD_READ_VOUT, &vbus);
 	rv |= i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		  MP4245_CMD_READ_IOUT, &ibus);
+			 MP4245_CMD_READ_IOUT, &ibus);
 
 	if (rv == EC_SUCCESS) {
 		/* Convert Vbus/Ibus to mV/mA */
@@ -82,34 +81,21 @@ struct mp4245_info {
 	uint8_t len;
 };
 
-static struct mp4245_info  mp4245_cmds[] = {
-	{MP4245_CMD_OPERATION,          1},
-	{MP4245_CMD_CLEAR_FAULTS,       1},
-	{MP4245_CMD_WRITE_PROTECT,      1},
-	{MP4245_CMD_STORE_USER_ALL,     1},
-	{MP4245_CMD_RESTORE_USER_ALL,   1},
-	{MP4245_CMD_VOUT_MODE,          1},
-	{MP4245_CMD_VOUT_COMMAND,       2},
-	{MP4245_CMD_VOUT_SCALE_LOOP,    2},
-	{MP4245_CMD_STATUS_BYTE,        1},
-	{MP4245_CMD_STATUS_WORD,        2},
-	{MP4245_CMD_STATUS_VOUT,        1},
-	{MP4245_CMD_STATUS_INPUT,       1},
-	{MP4245_CMD_STATUS_TEMP,        1},
-	{MP4245_CMD_STATUS_CML,         1},
-	{MP4245_CMD_READ_VIN,           2},
-	{MP4245_CMD_READ_VOUT,          2},
-	{MP4245_CMD_READ_IOUT,          2},
-	{MP4245_CMD_READ_TEMP,          2},
-	{MP4245_CMD_MFR_MODE_CTRL,      1},
-	{MP4245_CMD_MFR_CURRENT_LIM,    1},
-	{MP4245_CMD_MFR_LINE_DROP,      1},
-	{MP4245_CMD_MFR_OT_FAULT_LIM,   1},
-	{MP4245_CMD_MFR_OT_WARN_LIM,    1},
-	{MP4245_CMD_MFR_CRC_ERROR,      1},
-	{MP4245_CMD_MFF_MTP_CFG_CODE,   1},
-	{MP4245_CMD_MFR_MTP_REV_NUM,    1},
-	{MP4245_CMD_MFR_STATUS_MASK,    1},
+static struct mp4245_info mp4245_cmds[] = {
+	{ MP4245_CMD_OPERATION, 1 },	    { MP4245_CMD_CLEAR_FAULTS, 1 },
+	{ MP4245_CMD_WRITE_PROTECT, 1 },    { MP4245_CMD_STORE_USER_ALL, 1 },
+	{ MP4245_CMD_RESTORE_USER_ALL, 1 }, { MP4245_CMD_VOUT_MODE, 1 },
+	{ MP4245_CMD_VOUT_COMMAND, 2 },	    { MP4245_CMD_VOUT_SCALE_LOOP, 2 },
+	{ MP4245_CMD_STATUS_BYTE, 1 },	    { MP4245_CMD_STATUS_WORD, 2 },
+	{ MP4245_CMD_STATUS_VOUT, 1 },	    { MP4245_CMD_STATUS_INPUT, 1 },
+	{ MP4245_CMD_STATUS_TEMP, 1 },	    { MP4245_CMD_STATUS_CML, 1 },
+	{ MP4245_CMD_READ_VIN, 2 },	    { MP4245_CMD_READ_VOUT, 2 },
+	{ MP4245_CMD_READ_IOUT, 2 },	    { MP4245_CMD_READ_TEMP, 2 },
+	{ MP4245_CMD_MFR_MODE_CTRL, 1 },    { MP4245_CMD_MFR_CURRENT_LIM, 1 },
+	{ MP4245_CMD_MFR_LINE_DROP, 1 },    { MP4245_CMD_MFR_OT_FAULT_LIM, 1 },
+	{ MP4245_CMD_MFR_OT_WARN_LIM, 1 },  { MP4245_CMD_MFR_CRC_ERROR, 1 },
+	{ MP4245_CMD_MFF_MTP_CFG_CODE, 1 }, { MP4245_CMD_MFR_MTP_REV_NUM, 1 },
+	{ MP4245_CMD_MFR_STATUS_MASK, 1 },
 };
 
 static void mp4245_dump_reg(void)
@@ -124,7 +110,7 @@ static void mp4245_dump_reg(void)
 				       mp4245_cmds[i].cmd, &val);
 		} else {
 			rv = i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-				       mp4245_cmds[i].cmd, &val);
+					mp4245_cmds[i].cmd, &val);
 		}
 
 		if (!rv)
@@ -142,23 +128,23 @@ void mp4245_get_status(void)
 	int vout;
 
 	/* Get Operation register */
-	i2c_read8(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		  MP4245_CMD_OPERATION, &on);
+	i2c_read8(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS, MP4245_CMD_OPERATION,
+		  &on);
 	/* Vbus on/off is bit 7 */
 	on >>= 7;
 
 	/* Get status word */
 	i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		  MP4245_CMD_STATUS_WORD, &status);
+		   MP4245_CMD_STATUS_WORD, &status);
 
 	/* Get Vbus measurement */
-	i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		   MP4245_CMD_READ_VOUT, &vbus);
+	i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS, MP4245_CMD_READ_VOUT,
+		   &vbus);
 	vbus = MP4245_VOUT_TO_MV(vbus);
 
 	/* Get Ibus measurement */
-	i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		  MP4245_CMD_READ_IOUT, &ibus);
+	i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS, MP4245_CMD_READ_IOUT,
+		   &ibus);
 	ibus = MP4245_IOUT_TO_MA(ibus);
 
 	/* Get Vout command (sets Vbus level) */
@@ -168,7 +154,7 @@ void mp4245_get_status(void)
 
 	/* Get Input current limit */
 	i2c_read8(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		   MP4245_CMD_MFR_CURRENT_LIM, &ilim);
+		  MP4245_CMD_MFR_CURRENT_LIM, &ilim);
 	ilim *= MP4245_ILIM_STEP_MA;
 
 	ccprintf("mp4245 Vbus %s:\n", on ? "On" : "Off");
@@ -177,7 +163,7 @@ void mp4245_get_status(void)
 	ccprintf("\tIlim   = %d mA, Ibus = %d mA\n", ilim, ibus);
 }
 
-static int command_mp4245(int argc, char **argv)
+static int command_mp4245(int argc, const char **argv)
 {
 	char *e;
 	int val;
@@ -208,6 +194,5 @@ static int command_mp4245(int argc, char **argv)
 	}
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(mp4245, command_mp4245,
-			"<info|dump|vbus|ilim>",
+DECLARE_CONSOLE_COMMAND(mp4245, command_mp4245, "<info|dump|vbus|ilim>",
 			"Turn on/off|set vbus.");