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, 33 insertions, 26 deletions

diff --git a/util/uut/l_com_port.c b/util/uut/l_com_port.c
index 018dec9950..e774743160 100644
--- a/util/uut/l_com_port.c
+++ b/util/uut/l_com_port.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 The Chromium OS Authors. All rights reserved.
+ * Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -100,7 +100,8 @@ void set_read_blocking(int dev_drv, bool block)
 	memset(&tty, 0, sizeof(tty));
 
 	if (tcgetattr(dev_drv, &tty) != 0) {
-		display_color_msg(FAIL,
+		display_color_msg(
+			FAIL,
 			"set_read_blocking Error: %d Fail to get attribute "
 			"from Device number %d.\n",
 			errno, dev_drv);
@@ -111,7 +112,8 @@ void set_read_blocking(int dev_drv, bool block)
 	tty.c_cc[VTIME] = 5; /* 0.5 seconds read timeout */
 
 	if (tcsetattr(dev_drv, TCSANOW, &tty) != 0) {
-		display_color_msg(FAIL,
+		display_color_msg(
+			FAIL,
 			"set_read_blocking Error: %d Fail to set attribute to "
 			"Device number %d.\n",
 			errno, dev_drv);
@@ -145,7 +147,8 @@ bool com_config_uart(int h_dev_drv, struct comport_fields com_port_fields)
 	memset(&tty, 0, sizeof(tty));
 
 	if (tcgetattr(h_dev_drv, &tty) != 0) {
-		display_color_msg(FAIL,
+		display_color_msg(
+			FAIL,
 			"com_config_uart Error: Fail to get attribute from "
 			"Device number %d.\n",
 			h_dev_drv);
@@ -171,12 +174,13 @@ bool com_config_uart(int h_dev_drv, struct comport_fields com_port_fields)
 	tty.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
 
 	tty.c_oflag = ~OPOST;
-	tty.c_cc[VMIN] = 0;  /* read doesn't block		*/
+	tty.c_cc[VMIN] = 0; /* read doesn't block		*/
 	tty.c_cc[VTIME] = 5; /* 0.5 seconds read timeout	*/
 
-	tty.c_iflag |= (com_port_fields.flow_control == 0x01)
-			       ? (IXON | IXOFF)
-			       : 0x00; /* xon/xoff ctrl */
+	tty.c_iflag |= (com_port_fields.flow_control == 0x01) ?
+			       (IXON | IXOFF) :
+			       0x00; /* xon/xoff
+					ctrl */
 
 	tty.c_cflag |= (CLOCAL | CREAD); /* ignore modem controls */
 	/* enable reading */
@@ -191,7 +195,8 @@ bool com_config_uart(int h_dev_drv, struct comport_fields com_port_fields)
 	tcflush(h_dev_drv, TCIFLUSH);
 
 	if (tcsetattr(h_dev_drv, TCSANOW, &tty) != 0) {
-		display_color_msg(FAIL,
+		display_color_msg(
+			FAIL,
 			"com_config_uart Error: %d setting port handle %d: %s.\n",
 			errno, h_dev_drv, strerror(errno));
 		return false;
@@ -221,7 +226,6 @@ static void discard_input(int fd)
 	do {
 		res = read(fd, buffer, sizeof(buffer));
 		if (res > 0) {
-
 			/* Discard zeros in the beginning of the buffer. */
 			for (i = 0; i < res; i++)
 				if (buffer[i])
@@ -250,7 +254,6 @@ static void discard_input(int fd)
 		printf("%d zeros ignored\n", count_of_zeros);
 }
 
-
 /******************************************************************************
  * Function: int com_port_open()
  *
@@ -268,7 +271,7 @@ static void discard_input(int fd)
  *****************************************************************************
  */
 int com_port_open(const char *com_port_dev_name,
-				struct comport_fields com_port_fields)
+		  struct comport_fields com_port_fields)
 {
 	int port_handler;
 
@@ -276,15 +279,16 @@ int com_port_open(const char *com_port_dev_name,
 
 	if (port_handler < 0) {
 		display_color_msg(FAIL,
-				"com_port_open Error %d opening %s: %s\n",
-				errno, com_port_dev_name, strerror(errno));
+				  "com_port_open Error %d opening %s: %s\n",
+				  errno, com_port_dev_name, strerror(errno));
 		return INVALID_HANDLE_VALUE;
 	}
 
 	tcgetattr(port_handler, &savetty);
 
 	if (!com_config_uart(port_handler, com_port_fields)) {
-		display_color_msg(FAIL,
+		display_color_msg(
+			FAIL,
 			"com_port_open() Error %d, Failed on com_config_uart() %s, "
 			"%s\n",
 			errno, com_port_dev_name, strerror(errno));
@@ -318,7 +322,8 @@ bool com_port_close(int device_id)
 	tcsetattr(device_id, TCSANOW, &savetty);
 
 	if (close(device_id) == INVALID_HANDLE_VALUE) {
-		display_color_msg(FAIL,
+		display_color_msg(
+			FAIL,
 			"com_port_close() Error: %d Device com%u was not opened, "
 			"%s.\n",
 			errno, (uint32_t)device_id, strerror(errno));
@@ -345,14 +350,14 @@ bool com_port_close(int device_id)
  *
  *****************************************************************************
  */
-bool com_port_write_bin(int device_id, const uint8_t *buffer,
-						uint32_t buf_size)
+bool com_port_write_bin(int device_id, const uint8_t *buffer, uint32_t buf_size)
 {
 	uint32_t bytes_written;
 
 	bytes_written = write(device_id, buffer, buf_size);
 	if (bytes_written != buf_size) {
-		display_color_msg(FAIL,
+		display_color_msg(
+			FAIL,
 			"com_port_write_bin() Error: %d  Failed to write data to "
 			"Uart Port %d, %s.\n",
 			errno, (uint32_t)device_id, strerror(errno));
@@ -389,9 +394,10 @@ uint32_t com_port_read_bin(int device_id, uint8_t *buffer, uint32_t buf_size)
 
 	if (read_bytes == -1) {
 		display_color_msg(FAIL,
-			"%s() Error: %d Device number %u was not "
-			"opened, %s.\n",
-			__func__, errno, (uint32_t)device_id, strerror(errno));
+				  "%s() Error: %d Device number %u was not "
+				  "opened, %s.\n",
+				  __func__, errno, (uint32_t)device_id,
+				  strerror(errno));
 	}
 
 	return read_bytes;
@@ -422,9 +428,9 @@ uint32_t com_port_wait_read(int device_id)
 	fds.events = POLLIN;
 	ret_val = poll(&fds, 1, COMMAND_TIMEOUT);
 	if (ret_val < 0) {
-		display_color_msg(FAIL,
-			"%s() Error: %d Device number %u %s\n",
-			__func__, errno, (uint32_t)device_id, strerror(errno));
+		display_color_msg(FAIL, "%s() Error: %d Device number %u %s\n",
+				  __func__, errno, (uint32_t)device_id,
+				  strerror(errno));
 		return 0;
 	}
 
@@ -434,7 +440,8 @@ uint32_t com_port_wait_read(int device_id)
 	if (ret_val > 0) {
 		/* Get number of bytes that are ready to be read. */
 		if (ioctl(device_id, FIONREAD, &bytes) < 0) {
-			display_color_msg(FAIL,
+			display_color_msg(
+				FAIL,
 				"com_port_wait_for_read() Error: %d Device number "
 				"%u %s\n",
 				errno, (uint32_t)device_id, strerror(errno));