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, 66 insertions, 70 deletions

diff --git a/include/bluetooth_le_ll.h b/include/bluetooth_le_ll.h
index 9f540102da..d17aec8a57 100644
--- a/include/bluetooth_le_ll.h
+++ b/include/bluetooth_le_ll.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -17,33 +17,30 @@ enum ll_state_t {
 	TEST_TX,
 };
 
-#define LL_ADV_INTERVAL_UNIT_US       625
-#define LL_ADV_TIMEOUT_UNIT_US        1000000
+#define LL_ADV_INTERVAL_UNIT_US 625
+#define LL_ADV_TIMEOUT_UNIT_US 1000000
 
-#define LL_ADV_DIRECT_INTERVAL_US     3750    /* 3.75 ms */
-#define LL_ADV_DIRECT_TIMEOUT_US      1280000 /* 1.28 s */
+#define LL_ADV_DIRECT_INTERVAL_US 3750 /* 3.75 ms */
+#define LL_ADV_DIRECT_TIMEOUT_US 1280000 /* 1.28 s */
 
-#define LL_MAX_DATA_PACKET_LENGTH     27
-#define LL_MAX_DATA_PACKETS           4
+#define LL_MAX_DATA_PACKET_LENGTH 27
+#define LL_MAX_DATA_PACKETS 4
 
 /* BTLE Spec 4.0: Vol 6, Part B, Section 4.5.3 */
-#define TRANSMIT_WINDOW_OFFSET_CONSTANT	1250
+#define TRANSMIT_WINDOW_OFFSET_CONSTANT 1250
 
-#define LL_MAX_BUFFER_SIZE  (LL_MAX_DATA_PACKET_LENGTH * LL_MAX_DATA_PACKETS)
+#define LL_MAX_BUFFER_SIZE (LL_MAX_DATA_PACKET_LENGTH * LL_MAX_DATA_PACKETS)
 
-#define LL_SUPPORTED_FEATURES (HCI_LE_FTR_ENCRYPTION | \
-	HCI_LE_FTR_CONNECTION_PARAMETERS_REQUEST | \
-	HCI_LE_FTR_EXTENDED_REJECT_INDICATION | \
-	HCI_LE_FTR_SLAVE_INITIATED_FEATURES_EXCHANGE)
+#define LL_SUPPORTED_FEATURES                                               \
+	(HCI_LE_FTR_ENCRYPTION | HCI_LE_FTR_CONNECTION_PARAMETERS_REQUEST | \
+	 HCI_LE_FTR_EXTENDED_REJECT_INDICATION |                            \
+	 HCI_LE_FTR_SLAVE_INITIATED_FEATURES_EXCHANGE)
 
-#define LL_SUPPORTED_STATES (HCI_LE_STATE_NONCON_ADV | \
-	HCI_LE_STATE_SCANNABLE_ADV | \
-	HCI_LE_STATE_CONNECTABLE_ADV | \
-	HCI_LE_STATE_DIRECT_ADV | \
-	HCI_LE_STATE_PASSIVE_SCAN | \
-	HCI_LE_STATE_ACTIVE_SCAN | \
-	HCI_LE_STATE_INITIATE | \
-	HCI_LE_STATE_SLAVE)
+#define LL_SUPPORTED_STATES                                       \
+	(HCI_LE_STATE_NONCON_ADV | HCI_LE_STATE_SCANNABLE_ADV |   \
+	 HCI_LE_STATE_CONNECTABLE_ADV | HCI_LE_STATE_DIRECT_ADV | \
+	 HCI_LE_STATE_PASSIVE_SCAN | HCI_LE_STATE_ACTIVE_SCAN |   \
+	 HCI_LE_STATE_INITIATE | HCI_LE_STATE_SLAVE)
 
 /*
  * 4.6.1 LE Encryption
@@ -60,64 +57,63 @@ enum ll_state_t {
  */
 
 /*Link Layer Control PDU Opcodes */
-#define LL_CONNECTION_UPDATE_REQ  0x00
-#define LL_CHANNEL_MAP_REQ        0x01
-#define LL_TERMINATE_IND          0x02
-#define LL_ENC_REQ                0x03
-#define LL_ENC_RSP                0x04
-#define LL_START_ENC_REQ          0x05
-#define LL_START_ENC_RSP          0x06
-#define LL_UNKNOWN_RSP            0x07
-#define LL_FEATURE_REQ            0x08
-#define LL_FEATURE_RSP            0x09
-#define LL_PAUSE_ENC_REQ          0x0A
-#define LL_PAUSE_ENC_RSP          0x0B
-#define LL_VERSION_IND            0x0C
-#define LL_REJECT_IND             0x0D
-#define LL_SLAVE_FEATURE_REQ      0x0E
-#define LL_CONNECTION_PARAM_REQ   0x0F
-#define LL_CONNECTION_PARAM_RSP   0x10
-#define LL_REJECT_IND_EXT         0x11
-#define LL_PING_REQ               0x12
-#define LL_PING_RSP               0x13
+#define LL_CONNECTION_UPDATE_REQ 0x00
+#define LL_CHANNEL_MAP_REQ 0x01
+#define LL_TERMINATE_IND 0x02
+#define LL_ENC_REQ 0x03
+#define LL_ENC_RSP 0x04
+#define LL_START_ENC_REQ 0x05
+#define LL_START_ENC_RSP 0x06
+#define LL_UNKNOWN_RSP 0x07
+#define LL_FEATURE_REQ 0x08
+#define LL_FEATURE_RSP 0x09
+#define LL_PAUSE_ENC_REQ 0x0A
+#define LL_PAUSE_ENC_RSP 0x0B
+#define LL_VERSION_IND 0x0C
+#define LL_REJECT_IND 0x0D
+#define LL_SLAVE_FEATURE_REQ 0x0E
+#define LL_CONNECTION_PARAM_REQ 0x0F
+#define LL_CONNECTION_PARAM_RSP 0x10
+#define LL_REJECT_IND_EXT 0x11
+#define LL_PING_REQ 0x12
+#define LL_PING_RSP 0x13
 
 /* BLE 4.1 Vol 6 2.3.3.1 Connection information */
-#define CONNECT_REQ_INITA_LEN					6
-#define CONNECT_REQ_ADVA_LEN					6
-#define CONNECT_REQ_ACCESS_ADDR_LEN				4
-#define CONNECT_REQ_CRC_INIT_VAL_LEN				3
-#define CONNECT_REQ_WIN_SIZE_LEN				1
-#define CONNECT_REQ_WIN_OFFSET_LEN				2
-#define CONNECT_REQ_INTERVAL_LEN				2
-#define CONNECT_REQ_LATENCY_LEN					2
-#define CONNECT_REQ_TIMEOUT_LEN					2
-#define CONNECT_REQ_CHANNEL_MAP_LEN				5
-#define CONNECT_REQ_HOP_INCREMENT_AND_SCA_LEN			1
+#define CONNECT_REQ_INITA_LEN 6
+#define CONNECT_REQ_ADVA_LEN 6
+#define CONNECT_REQ_ACCESS_ADDR_LEN 4
+#define CONNECT_REQ_CRC_INIT_VAL_LEN 3
+#define CONNECT_REQ_WIN_SIZE_LEN 1
+#define CONNECT_REQ_WIN_OFFSET_LEN 2
+#define CONNECT_REQ_INTERVAL_LEN 2
+#define CONNECT_REQ_LATENCY_LEN 2
+#define CONNECT_REQ_TIMEOUT_LEN 2
+#define CONNECT_REQ_CHANNEL_MAP_LEN 5
+#define CONNECT_REQ_HOP_INCREMENT_AND_SCA_LEN 1
 struct ble_connection_params {
-	uint8_t		init_a[CONNECT_REQ_INITA_LEN];
-	uint8_t		adv_a[CONNECT_REQ_ADVA_LEN];
-	uint32_t	access_addr;
-	uint32_t	crc_init_val;
-	uint8_t		win_size;
-	uint16_t	win_offset;
-	uint16_t	interval;
-	uint16_t	latency;
-	uint16_t	timeout;
-	uint64_t	channel_map;
-	uint8_t		hop_increment;
-	uint8_t		sleep_clock_accuracy;
-	uint32_t	transmitWindowOffset;
-	uint32_t	transmitWindowSize;
-	uint32_t	connInterval;
-	uint16_t	connLatency;
-	uint32_t	connSupervisionTimeout;
+	uint8_t init_a[CONNECT_REQ_INITA_LEN];
+	uint8_t adv_a[CONNECT_REQ_ADVA_LEN];
+	uint32_t access_addr;
+	uint32_t crc_init_val;
+	uint8_t win_size;
+	uint16_t win_offset;
+	uint16_t interval;
+	uint16_t latency;
+	uint16_t timeout;
+	uint64_t channel_map;
+	uint8_t hop_increment;
+	uint8_t sleep_clock_accuracy;
+	uint32_t transmitWindowOffset;
+	uint32_t transmitWindowSize;
+	uint32_t connInterval;
+	uint16_t connLatency;
+	uint32_t connSupervisionTimeout;
 };
 
 uint8_t ll_reset(void);
 
 uint8_t ll_set_tx_power(uint8_t *params);
 
-
 /* LE Information */
 uint8_t ll_read_buffer_size(uint8_t *return_params);
 uint8_t ll_read_local_supported_features(uint8_t *return_params);