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, 188 insertions, 193 deletions

diff --git a/zephyr/emul/emul_bmi260.c b/zephyr/emul/emul_bmi260.c
index 31da71316a..5892a9ae96 100644
--- a/zephyr/emul/emul_bmi260.c
+++ b/zephyr/emul/emul_bmi260.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+/* Copyright 2021 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -21,100 +21,100 @@ LOG_MODULE_REGISTER(emul_bmi260);
 
 /** Mask reserved bits in each register of BMI260 */
 static const uint8_t bmi_emul_260_rsvd_mask[] = {
-	[BMI260_CHIP_ID]		= 0x00,
-	[0x01]				= 0xff, /* Reserved */
-	[BMI260_ERR_REG]		= 0x20,
-	[BMI260_STATUS]			= 0x0b,
-	[BMI260_AUX_X_L_G]		= 0x00,
-	[BMI260_AUX_X_H_G]		= 0x00,
-	[BMI260_AUX_Y_L_G]		= 0x00,
-	[BMI260_AUX_Y_H_G]		= 0x00,
-	[BMI260_AUX_Z_L_G]		= 0x00,
-	[BMI260_AUX_Z_H_G]		= 0x00,
-	[BMI260_AUX_R_L_G]		= 0x00,
-	[BMI260_AUX_R_H_G]		= 0x00,
-	[BMI260_ACC_X_L_G]		= 0x00,
-	[BMI260_ACC_X_H_G]		= 0x00,
-	[BMI260_ACC_Y_L_G]		= 0x00,
-	[BMI260_ACC_Y_H_G]		= 0x00,
-	[BMI260_ACC_Z_L_G]		= 0x00,
-	[BMI260_ACC_Z_H_G]		= 0x00,
-	[BMI260_GYR_X_L_G]		= 0x00,
-	[BMI260_GYR_X_H_G]		= 0x00,
-	[BMI260_GYR_Y_L_G]		= 0x00,
-	[BMI260_GYR_Y_H_G]		= 0x00,
-	[BMI260_GYR_Z_L_G]		= 0x00,
-	[BMI260_GYR_Z_H_G]		= 0x00,
-	[BMI260_SENSORTIME_0]		= 0x00,
-	[BMI260_SENSORTIME_1]		= 0x00,
-	[BMI260_SENSORTIME_2]		= 0x00,
-	[BMI260_EVENT]			= 0xe2,
-	[BMI260_INT_STATUS_0]		= 0x00,
-	[BMI260_INT_STATUS_1]		= 0x18,
-	[BMI260_SC_OUT_0]		= 0x00,
-	[BMI260_SC_OUT_1]		= 0x00,
-	[BMI260_ORIENT_ACT]		= 0xe0,
-	[BMI260_INTERNAL_STATUS]	= 0x00,
-	[BMI260_TEMPERATURE_0]		= 0x00,
-	[BMI260_TEMPERATURE_1]		= 0x00,
-	[BMI260_FIFO_LENGTH_0]		= 0x00,
-	[BMI260_FIFO_LENGTH_1]		= 0xc0,
-	[BMI160_FIFO_DATA]		= 0x00,
-	[0x27 ... 0x2e]			= 0xff, /* Reserved */
-	[BMI260_FEAT_PAGE]		= 0xf8,
-	[0x30 ... 0x3f]			= 0x00, /* Features */
-	[BMI260_ACC_CONF]		= 0x00,
-	[BMI260_ACC_RANGE]		= 0xfc,
-	[BMI260_GYR_CONF]		= 0x00,
-	[BMI260_GYR_RANGE]		= 0xf0,
-	[BMI260_AUX_CONF]		= 0x00,
-	[BMI260_FIFO_DOWNS]		= 0x00,
-	[BMI260_FIFO_WTM_0]		= 0x00,
-	[BMI260_FIFO_WTM_1]		= 0xe0,
-	[BMI260_FIFO_CONFIG_0]		= 0xfc,
-	[BMI260_FIFO_CONFIG_1]		= 0x00,
-	[BMI260_SATURATION]		= 0xc0,
-	[BMI260_AUX_DEV_ID]		= 0x01,
-	[BMI260_AUX_IF_CONF]		= 0x30,
-	[BMI260_AUX_RD_ADDR]		= 0x00,
-	[BMI260_AUX_WR_ADDR]		= 0x00,
-	[BMI260_AUX_WR_DATA]		= 0x00,
-	[0x50 ... 0x51]			= 0xff, /* Reserved */
-	[BMI260_ERR_REG_MSK]		= 0x20,
-	[BMI260_INT1_IO_CTRL]		= 0xe1,
-	[BMI260_INT2_IO_CTRL]		= 0xe1,
-	[BMI260_INT_LATCH]		= 0xfe,
-	[BMI260_INT1_MAP_FEAT]		= 0x00,
-	[BMI260_INT2_MAP_FEAT]		= 0x00,
-	[BMI260_INT_MAP_DATA]		= 0x00,
-	[BMI260_INIT_CTRL]		= 0x00,
-	[0x5a]				= 0xff, /* Reserved */
-	[BMI260_INIT_ADDR_0]		= 0xf0,
-	[BMI260_INIT_ADDR_1]		= 0x00,
-	[0x5d]				= 0xff, /* Reserved */
-	[BMI260_INIT_DATA]		= 0x00,
-	[BMI260_INTERNAL_ERROR]		= 0xe9,
-	[0x60 ... 0x67]			= 0xff, /* Reserved */
-	[BMI260_AUX_IF_TRIM]		= 0xf8,
-	[BMI260_GYR_CRT_CONF]		= 0xf2,
-	[BMI260_NVM_CONF]		= 0xfd,
-	[BMI260_IF_CONF]		= 0xcc,
-	[BMI260_DRV]			= 0x00,
-	[BMI260_ACC_SELF_TEST]		= 0xf2,
-	[BMI260_GYR_SELF_TEST_AXES]	= 0xf0,
-	[0x6f]				= 0xff, /* Reserved */
-	[BMI260_NV_CONF]		= 0xf0,
-	[BMI260_OFFSET_ACC70]		= 0x00,
-	[BMI260_OFFSET_ACC70 + 1]	= 0x00,
-	[BMI260_OFFSET_ACC70 + 2]	= 0x00,
-	[BMI260_OFFSET_GYR70]		= 0x00,
-	[BMI260_OFFSET_GYR70 + 1]	= 0x00,
-	[BMI260_OFFSET_GYR70 + 2]	= 0x00,
-	[BMI160_OFFSET_EN_GYR98]	= 0x00,
-	[0x78 ... 0x7b]			= 0xff, /* Reserved */
-	[BMI260_PWR_CONF]		= 0xf8,
-	[BMI260_PWR_CTRL]		= 0xf0,
-	[BMI260_CMD_REG]		= 0x00,
+	[BMI260_CHIP_ID] = 0x00,
+	[0x01] = 0xff, /* Reserved */
+	[BMI260_ERR_REG] = 0x20,
+	[BMI260_STATUS] = 0x0b,
+	[BMI260_AUX_X_L_G] = 0x00,
+	[BMI260_AUX_X_H_G] = 0x00,
+	[BMI260_AUX_Y_L_G] = 0x00,
+	[BMI260_AUX_Y_H_G] = 0x00,
+	[BMI260_AUX_Z_L_G] = 0x00,
+	[BMI260_AUX_Z_H_G] = 0x00,
+	[BMI260_AUX_R_L_G] = 0x00,
+	[BMI260_AUX_R_H_G] = 0x00,
+	[BMI260_ACC_X_L_G] = 0x00,
+	[BMI260_ACC_X_H_G] = 0x00,
+	[BMI260_ACC_Y_L_G] = 0x00,
+	[BMI260_ACC_Y_H_G] = 0x00,
+	[BMI260_ACC_Z_L_G] = 0x00,
+	[BMI260_ACC_Z_H_G] = 0x00,
+	[BMI260_GYR_X_L_G] = 0x00,
+	[BMI260_GYR_X_H_G] = 0x00,
+	[BMI260_GYR_Y_L_G] = 0x00,
+	[BMI260_GYR_Y_H_G] = 0x00,
+	[BMI260_GYR_Z_L_G] = 0x00,
+	[BMI260_GYR_Z_H_G] = 0x00,
+	[BMI260_SENSORTIME_0] = 0x00,
+	[BMI260_SENSORTIME_1] = 0x00,
+	[BMI260_SENSORTIME_2] = 0x00,
+	[BMI260_EVENT] = 0xe2,
+	[BMI260_INT_STATUS_0] = 0x00,
+	[BMI260_INT_STATUS_1] = 0x18,
+	[BMI260_SC_OUT_0] = 0x00,
+	[BMI260_SC_OUT_1] = 0x00,
+	[BMI260_ORIENT_ACT] = 0xe0,
+	[BMI260_INTERNAL_STATUS] = 0x00,
+	[BMI260_TEMPERATURE_0] = 0x00,
+	[BMI260_TEMPERATURE_1] = 0x00,
+	[BMI260_FIFO_LENGTH_0] = 0x00,
+	[BMI260_FIFO_LENGTH_1] = 0xc0,
+	[BMI160_FIFO_DATA] = 0x00,
+	[0x27 ... 0x2e] = 0xff, /* Reserved */
+	[BMI260_FEAT_PAGE] = 0xf8,
+	[0x30 ... 0x3f] = 0x00, /* Features */
+	[BMI260_ACC_CONF] = 0x00,
+	[BMI260_ACC_RANGE] = 0xfc,
+	[BMI260_GYR_CONF] = 0x00,
+	[BMI260_GYR_RANGE] = 0xf0,
+	[BMI260_AUX_CONF] = 0x00,
+	[BMI260_FIFO_DOWNS] = 0x00,
+	[BMI260_FIFO_WTM_0] = 0x00,
+	[BMI260_FIFO_WTM_1] = 0xe0,
+	[BMI260_FIFO_CONFIG_0] = 0xfc,
+	[BMI260_FIFO_CONFIG_1] = 0x00,
+	[BMI260_SATURATION] = 0xc0,
+	[BMI260_AUX_DEV_ID] = 0x01,
+	[BMI260_AUX_IF_CONF] = 0x30,
+	[BMI260_AUX_RD_ADDR] = 0x00,
+	[BMI260_AUX_WR_ADDR] = 0x00,
+	[BMI260_AUX_WR_DATA] = 0x00,
+	[0x50 ... 0x51] = 0xff, /* Reserved */
+	[BMI260_ERR_REG_MSK] = 0x20,
+	[BMI260_INT1_IO_CTRL] = 0xe1,
+	[BMI260_INT2_IO_CTRL] = 0xe1,
+	[BMI260_INT_LATCH] = 0xfe,
+	[BMI260_INT1_MAP_FEAT] = 0x00,
+	[BMI260_INT2_MAP_FEAT] = 0x00,
+	[BMI260_INT_MAP_DATA] = 0x00,
+	[BMI260_INIT_CTRL] = 0x00,
+	[0x5a] = 0xff, /* Reserved */
+	[BMI260_INIT_ADDR_0] = 0xf0,
+	[BMI260_INIT_ADDR_1] = 0x00,
+	[0x5d] = 0xff, /* Reserved */
+	[BMI260_INIT_DATA] = 0x00,
+	[BMI260_INTERNAL_ERROR] = 0xe9,
+	[0x60 ... 0x67] = 0xff, /* Reserved */
+	[BMI260_AUX_IF_TRIM] = 0xf8,
+	[BMI260_GYR_CRT_CONF] = 0xf2,
+	[BMI260_NVM_CONF] = 0xfd,
+	[BMI260_IF_CONF] = 0xcc,
+	[BMI260_DRV] = 0x00,
+	[BMI260_ACC_SELF_TEST] = 0xf2,
+	[BMI260_GYR_SELF_TEST_AXES] = 0xf0,
+	[0x6f] = 0xff, /* Reserved */
+	[BMI260_NV_CONF] = 0xf0,
+	[BMI260_OFFSET_ACC70] = 0x00,
+	[BMI260_OFFSET_ACC70 + 1] = 0x00,
+	[BMI260_OFFSET_ACC70 + 2] = 0x00,
+	[BMI260_OFFSET_GYR70] = 0x00,
+	[BMI260_OFFSET_GYR70 + 1] = 0x00,
+	[BMI260_OFFSET_GYR70 + 2] = 0x00,
+	[BMI160_OFFSET_EN_GYR98] = 0x00,
+	[0x78 ... 0x7b] = 0xff, /* Reserved */
+	[BMI260_PWR_CONF] = 0xf8,
+	[BMI260_PWR_CTRL] = 0xf0,
+	[BMI260_CMD_REG] = 0x00,
 };
 
 /**
@@ -123,88 +123,88 @@ static const uint8_t bmi_emul_260_rsvd_mask[] = {
  * @param regs Pointer to array of emulator's registers
  * @param emul Pointer to BMI emulator
  */
-static void bmi260_emul_reset(uint8_t *regs, struct i2c_emul *emul)
+static void bmi260_emul_reset(uint8_t *regs, const struct emul *emul)
 {
 	bool tag_time;
 	bool header;
 
-	regs[BMI260_CHIP_ID]		= 0x27;
-	regs[BMI260_ERR_REG]		= 0x00;
-	regs[BMI260_STATUS]		= 0x10;
-	regs[BMI260_AUX_X_L_G]		= 0x00;
-	regs[BMI260_AUX_X_H_G]		= 0x00;
-	regs[BMI260_AUX_Y_L_G]		= 0x00;
-	regs[BMI260_AUX_Y_H_G]		= 0x00;
-	regs[BMI260_AUX_Z_L_G]		= 0x00;
-	regs[BMI260_AUX_Z_H_G]		= 0x00;
-	regs[BMI260_AUX_R_L_G]		= 0x00;
-	regs[BMI260_AUX_R_H_G]		= 0x00;
-	regs[BMI260_ACC_X_L_G]		= 0x00;
-	regs[BMI260_ACC_X_H_G]		= 0x00;
-	regs[BMI260_ACC_Y_L_G]		= 0x00;
-	regs[BMI260_ACC_Y_H_G]		= 0x00;
-	regs[BMI260_ACC_Z_L_G]		= 0x00;
-	regs[BMI260_ACC_Z_H_G]		= 0x00;
-	regs[BMI260_GYR_X_L_G]		= 0x00;
-	regs[BMI260_GYR_X_H_G]		= 0x00;
-	regs[BMI260_GYR_Y_L_G]		= 0x00;
-	regs[BMI260_GYR_Y_H_G]		= 0x00;
-	regs[BMI260_GYR_Z_L_G]		= 0x00;
-	regs[BMI260_GYR_Z_H_G]		= 0x00;
-	regs[BMI260_SENSORTIME_0]	= 0x00;
-	regs[BMI260_SENSORTIME_1]	= 0x00;
-	regs[BMI260_SENSORTIME_2]	= 0x00;
-	regs[BMI260_EVENT]		= 0x01;
-	regs[BMI260_INT_STATUS_0]	= 0x00;
-	regs[BMI260_INT_STATUS_1]	= 0x00;
-	regs[BMI260_SC_OUT_0]		= 0x00;
-	regs[BMI260_SC_OUT_1]		= 0x00;
-	regs[BMI260_ORIENT_ACT]		= 0x00;
-	regs[BMI260_INTERNAL_STATUS]	= 0x00;
-	regs[BMI260_TEMPERATURE_0]	= 0x00;
-	regs[BMI260_TEMPERATURE_1]	= 0x80;
-	regs[BMI260_FIFO_LENGTH_0]	= 0x00;
-	regs[BMI260_FIFO_LENGTH_1]	= 0x00;
-	regs[BMI160_FIFO_DATA]		= 0x00;
-	regs[BMI260_FEAT_PAGE]		= 0x00;
-	regs[BMI260_ACC_CONF]		= 0xa8;
-	regs[BMI260_ACC_RANGE]		= 0x02;
-	regs[BMI260_GYR_CONF]		= 0xa9;
-	regs[BMI260_GYR_RANGE]		= 0x00;
-	regs[BMI260_AUX_CONF]		= 0x46;
-	regs[BMI260_FIFO_DOWNS]		= 0x88;
-	regs[BMI260_FIFO_WTM_0]		= 0x00;
-	regs[BMI260_FIFO_WTM_1]		= 0x02;
-	regs[BMI260_FIFO_CONFIG_0]	= 0x02;
-	regs[BMI260_FIFO_CONFIG_1]	= 0x10;
-	regs[BMI260_SATURATION]		= 0x00;
-	regs[BMI260_AUX_DEV_ID]		= 0x20;
-	regs[BMI260_AUX_IF_CONF]	= 0x83;
-	regs[BMI260_AUX_RD_ADDR]	= 0x42;
-	regs[BMI260_AUX_WR_ADDR]	= 0x4c;
-	regs[BMI260_AUX_WR_DATA]	= 0x02;
-	regs[BMI260_ERR_REG_MSK]	= 0x00;
-	regs[BMI260_INT1_IO_CTRL]	= 0x00;
-	regs[BMI260_INT2_IO_CTRL]	= 0x00;
-	regs[BMI260_INT_LATCH]		= 0x00;
-	regs[BMI260_INT1_MAP_FEAT]	= 0x00;
-	regs[BMI260_INT2_MAP_FEAT]	= 0x00;
-	regs[BMI260_INT_MAP_DATA]	= 0x00;
-	regs[BMI260_INIT_CTRL]		= 0x00;
-	regs[BMI260_INIT_ADDR_0]	= 0x00;
-	regs[BMI260_INIT_ADDR_1]	= 0x00;
-	regs[BMI260_INIT_DATA]		= 0x00;
-	regs[BMI260_INTERNAL_ERROR]	= 0x00;
-	regs[BMI260_AUX_IF_TRIM]	= 0x01;
-	regs[BMI260_GYR_CRT_CONF]	= 0x00;
-	regs[BMI260_NVM_CONF]		= 0x00;
-	regs[BMI260_IF_CONF]		= 0x00;
-	regs[BMI260_DRV]		= 0xff;
-	regs[BMI260_ACC_SELF_TEST]	= 0x00;
-	regs[BMI260_GYR_SELF_TEST_AXES]	= 0x00;
-	regs[BMI260_PWR_CONF]		= 0x03;
-	regs[BMI260_PWR_CTRL]		= 0x00;
-	regs[BMI260_CMD_REG]		= 0x00;
+	regs[BMI260_CHIP_ID] = 0x27;
+	regs[BMI260_ERR_REG] = 0x00;
+	regs[BMI260_STATUS] = 0x10;
+	regs[BMI260_AUX_X_L_G] = 0x00;
+	regs[BMI260_AUX_X_H_G] = 0x00;
+	regs[BMI260_AUX_Y_L_G] = 0x00;
+	regs[BMI260_AUX_Y_H_G] = 0x00;
+	regs[BMI260_AUX_Z_L_G] = 0x00;
+	regs[BMI260_AUX_Z_H_G] = 0x00;
+	regs[BMI260_AUX_R_L_G] = 0x00;
+	regs[BMI260_AUX_R_H_G] = 0x00;
+	regs[BMI260_ACC_X_L_G] = 0x00;
+	regs[BMI260_ACC_X_H_G] = 0x00;
+	regs[BMI260_ACC_Y_L_G] = 0x00;
+	regs[BMI260_ACC_Y_H_G] = 0x00;
+	regs[BMI260_ACC_Z_L_G] = 0x00;
+	regs[BMI260_ACC_Z_H_G] = 0x00;
+	regs[BMI260_GYR_X_L_G] = 0x00;
+	regs[BMI260_GYR_X_H_G] = 0x00;
+	regs[BMI260_GYR_Y_L_G] = 0x00;
+	regs[BMI260_GYR_Y_H_G] = 0x00;
+	regs[BMI260_GYR_Z_L_G] = 0x00;
+	regs[BMI260_GYR_Z_H_G] = 0x00;
+	regs[BMI260_SENSORTIME_0] = 0x00;
+	regs[BMI260_SENSORTIME_1] = 0x00;
+	regs[BMI260_SENSORTIME_2] = 0x00;
+	regs[BMI260_EVENT] = 0x01;
+	regs[BMI260_INT_STATUS_0] = 0x00;
+	regs[BMI260_INT_STATUS_1] = 0x00;
+	regs[BMI260_SC_OUT_0] = 0x00;
+	regs[BMI260_SC_OUT_1] = 0x00;
+	regs[BMI260_ORIENT_ACT] = 0x00;
+	regs[BMI260_INTERNAL_STATUS] = 0x00;
+	regs[BMI260_TEMPERATURE_0] = 0x00;
+	regs[BMI260_TEMPERATURE_1] = 0x80;
+	regs[BMI260_FIFO_LENGTH_0] = 0x00;
+	regs[BMI260_FIFO_LENGTH_1] = 0x00;
+	regs[BMI160_FIFO_DATA] = 0x00;
+	regs[BMI260_FEAT_PAGE] = 0x00;
+	regs[BMI260_ACC_CONF] = 0xa8;
+	regs[BMI260_ACC_RANGE] = 0x02;
+	regs[BMI260_GYR_CONF] = 0xa9;
+	regs[BMI260_GYR_RANGE] = 0x00;
+	regs[BMI260_AUX_CONF] = 0x46;
+	regs[BMI260_FIFO_DOWNS] = 0x88;
+	regs[BMI260_FIFO_WTM_0] = 0x00;
+	regs[BMI260_FIFO_WTM_1] = 0x02;
+	regs[BMI260_FIFO_CONFIG_0] = 0x02;
+	regs[BMI260_FIFO_CONFIG_1] = 0x10;
+	regs[BMI260_SATURATION] = 0x00;
+	regs[BMI260_AUX_DEV_ID] = 0x20;
+	regs[BMI260_AUX_IF_CONF] = 0x83;
+	regs[BMI260_AUX_RD_ADDR] = 0x42;
+	regs[BMI260_AUX_WR_ADDR] = 0x4c;
+	regs[BMI260_AUX_WR_DATA] = 0x02;
+	regs[BMI260_ERR_REG_MSK] = 0x00;
+	regs[BMI260_INT1_IO_CTRL] = 0x00;
+	regs[BMI260_INT2_IO_CTRL] = 0x00;
+	regs[BMI260_INT_LATCH] = 0x00;
+	regs[BMI260_INT1_MAP_FEAT] = 0x00;
+	regs[BMI260_INT2_MAP_FEAT] = 0x00;
+	regs[BMI260_INT_MAP_DATA] = 0x00;
+	regs[BMI260_INIT_CTRL] = 0x00;
+	regs[BMI260_INIT_ADDR_0] = 0x00;
+	regs[BMI260_INIT_ADDR_1] = 0x00;
+	regs[BMI260_INIT_DATA] = 0x00;
+	regs[BMI260_INTERNAL_ERROR] = 0x00;
+	regs[BMI260_AUX_IF_TRIM] = 0x01;
+	regs[BMI260_GYR_CRT_CONF] = 0x00;
+	regs[BMI260_NVM_CONF] = 0x00;
+	regs[BMI260_IF_CONF] = 0x00;
+	regs[BMI260_DRV] = 0xff;
+	regs[BMI260_ACC_SELF_TEST] = 0x00;
+	regs[BMI260_GYR_SELF_TEST_AXES] = 0x00;
+	regs[BMI260_PWR_CONF] = 0x03;
+	regs[BMI260_PWR_CTRL] = 0x00;
+	regs[BMI260_CMD_REG] = 0x00;
 
 	/* Call generic reset */
 	tag_time = regs[BMI260_FIFO_CONFIG_0] & BMI260_FIFO_TIME_EN;
@@ -278,7 +278,8 @@ static int bmi260_emul_gyr_range_to_shift(uint8_t range)
  * @return 0 on success
  * @return -EIO on failure
  */
-static int bmi260_emul_start_cmd(uint8_t *regs, struct i2c_emul *emul, int cmd)
+static int bmi260_emul_start_cmd(uint8_t *regs, const struct emul *emul,
+				 int cmd)
 {
 	int time;
 
@@ -306,7 +307,7 @@ static int bmi260_emul_start_cmd(uint8_t *regs, struct i2c_emul *emul, int cmd)
  * @param regs Pointer to array of emulator's registers
  * @param emul Pointer to BMI emulator
  */
-static void bmi260_emul_end_cmd(uint8_t *regs, struct i2c_emul *emul)
+static void bmi260_emul_end_cmd(uint8_t *regs, const struct emul *emul)
 {
 	bool tag_time;
 	bool header;
@@ -339,7 +340,7 @@ static void bmi260_emul_end_cmd(uint8_t *regs, struct i2c_emul *emul)
  *
  * @return Currently accessed register
  */
-static int bmi260_emul_access_reg(struct i2c_emul *emul, int reg, int byte,
+static int bmi260_emul_access_reg(const struct emul *emul, int reg, int byte,
 				  bool read)
 {
 	/* Ignore first byte which sets starting register */
@@ -354,8 +355,7 @@ static int bmi260_emul_access_reg(struct i2c_emul *emul, int reg, int byte,
 	 */
 	if (reg <= BMI260_FIFO_DATA && reg + byte >= BMI260_FIFO_DATA) {
 		return BMI260_FIFO_DATA;
-	} else if (reg <= BMI260_INIT_DATA &&
-		   reg + byte >= BMI260_INIT_DATA) {
+	} else if (reg <= BMI260_INIT_DATA && reg + byte >= BMI260_INIT_DATA) {
 		return BMI260_INIT_DATA;
 	}
 
@@ -381,7 +381,7 @@ static int bmi260_emul_access_reg(struct i2c_emul *emul, int reg, int byte,
  * @return BMI_EMUL_ACCESS_E on RO register access
  * @return -EIO on error
  */
-static int bmi260_emul_handle_write(uint8_t *regs, struct i2c_emul *emul,
+static int bmi260_emul_handle_write(uint8_t *regs, const struct emul *emul,
 				    int reg, int byte, uint8_t val)
 {
 	uint8_t mask;
@@ -395,7 +395,6 @@ static int bmi260_emul_handle_write(uint8_t *regs, struct i2c_emul *emul,
 		return BMI_EMUL_ACCESS_E;
 	}
 
-
 	/* Stop on going command if required */
 	if (regs[BMI260_CMD_REG] != 0 && bmi_emul_is_cmd_end(emul)) {
 		bmi260_emul_end_cmd(regs, emul);
@@ -454,7 +453,7 @@ static int bmi260_emul_handle_write(uint8_t *regs, struct i2c_emul *emul,
  * @return BMI_EMUL_ACCESS_E on WO register access
  * @return -EIO on other error
  */
-static int bmi260_emul_handle_read(uint8_t *regs, struct i2c_emul *emul,
+static int bmi260_emul_handle_read(uint8_t *regs, const struct emul *emul,
 				   int reg, int byte, char *buf)
 {
 	uint16_t fifo_len;
@@ -513,8 +512,8 @@ static int bmi260_emul_handle_read(uint8_t *regs, struct i2c_emul *emul,
 			bmi_emul_state_to_reg(emul, acc_shift, gyr_shift,
 					      BMI260_ACC_X_L_G,
 					      BMI260_GYR_X_L_G,
-					      BMI260_SENSORTIME_0,
-					      acc_off_en, gyr_off_en);
+					      BMI260_SENSORTIME_0, acc_off_en,
+					      gyr_off_en);
 		}
 		break;
 	case BMI260_FIFO_LENGTH_0:
@@ -538,16 +537,12 @@ static int bmi260_emul_handle_read(uint8_t *regs, struct i2c_emul *emul,
 }
 
 /** Registers backed in NVM by BMI260 */
-const int bmi260_nvm_reg[] = {BMI260_AUX_IF_TRIM,
-			      BMI260_NV_CONF,
-			      BMI260_DRV,
-			      BMI260_OFFSET_ACC70,
-			      BMI260_OFFSET_ACC70 + 1,
-			      BMI260_OFFSET_ACC70 + 2,
-			      BMI260_OFFSET_GYR70,
-			      BMI260_OFFSET_GYR70 + 1,
-			      BMI260_OFFSET_GYR70 + 2,
-			      BMI260_OFFSET_EN_GYR98};
+const int bmi260_nvm_reg[] = {
+	BMI260_AUX_IF_TRIM,    BMI260_NV_CONF,		BMI260_DRV,
+	BMI260_OFFSET_ACC70,   BMI260_OFFSET_ACC70 + 1, BMI260_OFFSET_ACC70 + 2,
+	BMI260_OFFSET_GYR70,   BMI260_OFFSET_GYR70 + 1, BMI260_OFFSET_GYR70 + 2,
+	BMI260_OFFSET_EN_GYR98
+};
 
 /** Confguration of BMI260 */
 struct bmi_emul_type_data bmi260_emul = {