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, 19 insertions, 21 deletions

diff --git a/driver/ina3221.c b/driver/ina3221.c
index 5b89f9694e..4659552497 100644
--- a/driver/ina3221.c
+++ b/driver/ina3221.c
@@ -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,12 +14,12 @@
 #include "util.h"
 
 /* Console output macros */
-#define CPRINTS(format, args...) cprints(CC_I2C, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_I2C, format, ##args)
 
 const static uint8_t ina3221_reg_map[INA3221_CHAN_COUNT][INA3221_MAX_REG] = {
-{ 1, 2,  7,  8 }, /* Chan 1 */
-{ 3, 4,  9, 10 }, /* Chan 2 */
-{ 5, 6, 11, 12 }  /* Chan 3 */
+	{ 1, 2, 7, 8 }, /* Chan 1 */
+	{ 3, 4, 9, 10 }, /* Chan 2 */
+	{ 5, 6, 11, 12 } /* Chan 3 */
 };
 
 static uint16_t ina3221_read(unsigned int unit, uint8_t reg)
@@ -27,8 +27,7 @@ static uint16_t ina3221_read(unsigned int unit, uint8_t reg)
 	int res;
 	int val;
 
-	res = i2c_read16(ina3221[unit].port, ina3221[unit].address,
-			 reg, &val);
+	res = i2c_read16(ina3221[unit].port, ina3221[unit].address, reg, &val);
 	if (res) {
 		CPRINTS("INA3221 I2C read failed");
 		return 0x0bad;
@@ -37,7 +36,7 @@ static uint16_t ina3221_read(unsigned int unit, uint8_t reg)
 }
 
 static uint16_t ina3221_chan_read(unsigned int unit, enum ina3221_channel chan,
-			   enum ina3221_register reg)
+				  enum ina3221_register reg)
 {
 	if (chan >= INA3221_CHAN_COUNT || reg >= INA3221_MAX_REG) {
 		CPRINTS("INA3221 Bad channel or register value");
@@ -51,8 +50,8 @@ static int ina3221_write(unsigned int unit, uint8_t reg, uint16_t val)
 	int res;
 	uint16_t be_val = (val >> 8) | ((val & 0xff) << 8);
 
-	res = i2c_write16(ina3221[unit].port, ina3221[unit].address,
-			  reg, be_val);
+	res = i2c_write16(ina3221[unit].port, ina3221[unit].address, reg,
+			  be_val);
 	if (res)
 		CPRINTS("INA3221 I2C write failed");
 	return res;
@@ -93,12 +92,12 @@ static void ina3221_dump(unsigned int unit)
 		if (ina3221[unit].name[chan] != NULL) {
 			sv[chan] = ina3221_chan_read(unit, chan,
 						     INA3221_SHUNT_VOLT);
-			bv[chan] = ina3221_chan_read(unit, chan,
-						     INA3221_BUS_VOLT);
-			crit[chan] = ina3221_chan_read(unit, chan,
-						       INA3221_CRITICAL);
-			warn[chan] = ina3221_chan_read(unit, chan,
-						       INA3221_WARNING);
+			bv[chan] =
+				ina3221_chan_read(unit, chan, INA3221_BUS_VOLT);
+			crit[chan] =
+				ina3221_chan_read(unit, chan, INA3221_CRITICAL);
+			warn[chan] =
+				ina3221_chan_read(unit, chan, INA3221_WARNING);
 		}
 	}
 	mask = ina3221_read(unit, INA3221_REG_MASK);
@@ -109,9 +108,9 @@ static void ina3221_dump(unsigned int unit)
 		if (ina3221[unit].name[chan] != NULL) {
 			ccprintf("%d: %s:\n", chan, ina3221[unit].name[chan]);
 			ccprintf("      Shunt voltage: %04x => %d uV\n",
-				sv[chan], INA3221_SHUNT_UV((int)sv[chan]));
+				 sv[chan], INA3221_SHUNT_UV((int)sv[chan]));
 			ccprintf("      Bus voltage  : %04x => %d mV\n",
-				bv[chan], INA3221_BUS_MV((int)bv[chan]));
+				 bv[chan], INA3221_BUS_MV((int)bv[chan]));
 			ccprintf("      Warning      : %04x\n", warn[chan]);
 			ccprintf("      Critical     : %04x\n", crit[chan]);
 		}
@@ -122,7 +121,7 @@ static void ina3221_dump(unsigned int unit)
 /*****************************************************************************/
 /* Console commands */
 
-static int command_ina(int argc, char **argv)
+static int command_ina(int argc, const char **argv)
 {
 	char *e;
 	unsigned int unit;
@@ -156,7 +155,6 @@ static int command_ina(int argc, char **argv)
 
 	return EC_ERROR_INVAL;
 }
-DECLARE_CONSOLE_COMMAND(ina, command_ina,
-			"<index> [config|mask <val>]",
+DECLARE_CONSOLE_COMMAND(ina, command_ina, "<index> [config|mask <val>]",
 			"INA3221 voltage sensing");
 #endif