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, 44 deletions

diff --git a/common/console.c b/common/console.c
index dc0d2655c0..9e7d6ad036 100644
--- a/common/console.c
+++ b/common/console.c
@@ -1,4 +1,4 @@
-/* Copyright 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright 2012 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -52,14 +52,14 @@ static int last_rx_was_cr;
 #ifndef CONFIG_EXPERIMENTAL_CONSOLE
 /* State of input escape code */
 static enum {
-	ESC_OUTSIDE,   /* Not in escape code */
-	ESC_START,     /* Got ESC */
-	ESC_BAD,       /* Bad escape sequence */
-	ESC_BRACKET,   /* Got ESC [ */
+	ESC_OUTSIDE, /* Not in escape code */
+	ESC_START, /* Got ESC */
+	ESC_BAD, /* Bad escape sequence */
+	ESC_BRACKET, /* Got ESC [ */
 	ESC_BRACKET_1, /* Got ESC [ 1 */
 	ESC_BRACKET_3, /* Got ESC [ 3 */
 	ESC_BRACKET_4, /* Got ESC [ 4 */
-	ESC_O,         /* Got ESC O */
+	ESC_O, /* Got ESC O */
 } esc_state;
 #endif /* !defined(CONFIG_EXPERIMENTAL_CONSOLE) */
 
@@ -85,7 +85,7 @@ enum extended_key_code {
  * @return EC_SUCCESS.  If more than MAX_ARGS_PER_COMMAND words are found,
  *	discards the excess and returns EC_ERROR_OVERFLOW.
  */
-static int split_words(char *input, int *argc, char **argv)
+static int split_words(char *input, int *argc, const char **argv)
 {
 	char *c;
 	int in_word = 0;
@@ -129,7 +129,7 @@ static int split_words(char *input, int *argc, char **argv)
  *
  * @return A pointer to the command structure, or NULL if no match found.
  */
-static const struct console_command *find_command(char *name)
+static const struct console_command *find_command(const char *name)
 {
 	const struct console_command *cmd, *match = NULL;
 	int match_length = strlen(name);
@@ -151,18 +151,10 @@ static const struct console_command *find_command(char *name)
 	return match;
 }
 
-
 static const char *const errmsgs[] = {
-	"OK",
-	"Unknown error",
-	"Unimplemented",
-	"Overflow",
-	"Timeout",
-	"Invalid argument",
-	"Busy",
-	"Access Denied",
-	"Not Powered",
-	"Not Calibrated",
+	"OK",	       "Unknown error",	   "Unimplemented", "Overflow",
+	"Timeout",     "Invalid argument", "Busy",	    "Access Denied",
+	"Not Powered", "Not Calibrated",
 };
 
 /**
@@ -175,7 +167,7 @@ static const char *const errmsgs[] = {
 static int handle_command(char *input)
 {
 	const struct console_command *cmd;
-	char *argv[MAX_ARGS_PER_COMMAND];
+	const char *argv[MAX_ARGS_PER_COMMAND];
 	int argc = 0;
 	int rv;
 #ifdef CONFIG_EXPERIMENTAL_CONSOLE
@@ -205,10 +197,10 @@ static int handle_command(char *input)
 	i = input[1] == '&' ? 2 : 1;
 
 	/* Next, there should be 4 hex digits: XXYY + '&' */
-	if (i+5 > input_len)
+	if (i + 5 > input_len)
 		goto command_has_error;
 	/* Replace the '&' with null so we can call strtoi(). */
-	input[i+4] = 0;
+	input[i + 4] = 0;
 	j = strtoi(input + i, &e, 16);
 	if (*e)
 		goto command_has_error;
@@ -218,10 +210,10 @@ static int handle_command(char *input)
 	i += 5;
 
 	/* Lastly, verify the CRC8 of the command. */
-	if (i+command_len > input_len)
+	if (i + command_len > input_len)
 		goto command_has_error;
 	if (packed_crc8 != cros_crc8(&input[i], command_len)) {
-command_has_error:
+	command_has_error:
 		/* Send back the error string. */
 		ccprintf("&&EE\n");
 		return EC_ERROR_UNKNOWN;
@@ -248,7 +240,7 @@ command_has_error:
 		rv = EC_ERROR_ACCESS_DENIED;
 	else
 #endif
-	rv = cmd->handler(argc, argv);
+		rv = cmd->handler(argc, argv);
 	if (rv == EC_SUCCESS)
 		return rv;
 
@@ -372,7 +364,7 @@ static void save_history(void)
 static void handle_backspace(void)
 {
 	if (!input_pos)
-		return;  /* Already at beginning of line */
+		return; /* Already at beginning of line */
 
 	/* Move cursor back */
 	console_putc('\b');
@@ -380,8 +372,7 @@ static void handle_backspace(void)
 	/* Print and move anything following the cursor position */
 	if (input_pos != input_len) {
 		ccputs(input_buf + input_pos);
-		memmove(input_buf + input_pos - 1,
-			input_buf + input_pos,
+		memmove(input_buf + input_pos - 1, input_buf + input_pos,
 			input_len - input_pos + 1);
 	} else {
 		input_buf[input_len - 1] = '\0';
@@ -511,7 +502,7 @@ static void console_handle_char(int c)
 #ifndef CONFIG_EXPERIMENTAL_CONSOLE
 	case KEY_DEL:
 		if (input_pos == input_len)
-			break;  /* Already at end */
+			break; /* Already at end */
 
 		move_cursor_right();
 
@@ -544,8 +535,8 @@ static void console_handle_char(int c)
 		/* Save command in history buffer */
 		if (input_len) {
 			save_history();
-			history_next = (history_next + 1) %
-				CONFIG_CONSOLE_HISTORY;
+			history_next =
+				(history_next + 1) % CONFIG_CONSOLE_HISTORY;
 			history_pos = history_next;
 		}
 #endif
@@ -692,7 +683,7 @@ void console_task(void *u)
 			console_handle_char(c);
 		}
 
-		task_wait_event(-1);  /* Wait for more input */
+		task_wait_event(-1); /* Wait for more input */
 	}
 }
 
@@ -700,10 +691,10 @@ void console_task(void *u)
 /* Console commands */
 
 /* Command handler - prints help. */
-static int command_help(int argc, char **argv)
+static int command_help(int argc, const char **argv)
 {
 	const int ncmds = __cmds_end - __cmds;
-	const int cols = 5;			/* printing in five columns */
+	const int cols = 5; /* printing in five columns */
 	const int rows = (ncmds + cols - 1) / cols;
 	int i, j;
 
@@ -715,16 +706,15 @@ static int command_help(int argc, char **argv)
 #ifdef CONFIG_CONSOLE_COMMAND_FLAGS
 			ccputs("Command     Flags   Description\n");
 			for (i = 0; i < ncmds; i++) {
-				ccprintf(" %-14s %x %s\n",
-					 __cmds[i].name, __cmds[i].flags,
-					 __cmds[i].help);
+				ccprintf(" %-14s %x %s\n", __cmds[i].name,
+					 __cmds[i].flags, __cmds[i].help);
 				cflush();
 			}
 #else
 			ccputs("Known commands:\n");
 			for (i = 0; i < ncmds; i++) {
-				ccprintf("  %-15s%s\n",
-					 __cmds[i].name, __cmds[i].help);
+				ccprintf("  %-15s%s\n", __cmds[i].name,
+					 __cmds[i].help);
 				cflush();
 			}
 #endif
@@ -771,12 +761,11 @@ static int command_help(int argc, char **argv)
 
 	return EC_SUCCESS;
 }
-DECLARE_SAFE_CONSOLE_COMMAND(help, command_help,
-			     "[ list | <name> ]",
+DECLARE_SAFE_CONSOLE_COMMAND(help, command_help, "[ list | <name> ]",
 			     "Print command help");
 
 #ifdef CONFIG_CONSOLE_HISTORY
-static int command_history(int argc, char **argv)
+static int command_history(int argc, const char **argv)
 {
 	int i;
 
@@ -788,7 +777,6 @@ static int command_history(int argc, char **argv)
 
 	return EC_SUCCESS;
 }
-DECLARE_SAFE_CONSOLE_COMMAND(history, command_history,
-			     NULL,
+DECLARE_SAFE_CONSOLE_COMMAND(history, command_history, NULL,
 			     "Print console history");
 #endif