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

2 files changed, 106 insertions, 97 deletions

diff --git a/driver/nfc/ctn730.c b/driver/nfc/ctn730.c
index 775149e659..090c140864 100644
--- a/driver/nfc/ctn730.c
+++ b/driver/nfc/ctn730.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
+/* Copyright 2020 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -10,6 +10,7 @@
 #include "gpio.h"
 #include "i2c.h"
 #include "peripheral_charger.h"
+#include "printf.h"
 #include "timer.h"
 #include "util.h"
 #include "watchdog.h"
@@ -31,16 +32,15 @@ static const int _wake_up_delay_ms = 10;
 static const int _detection_interval_ms = 500;
 
 /* Buffer size for i2c read & write */
-#define CTN730_MESSAGE_BUFFER_SIZE	0x20
+#define CTN730_MESSAGE_BUFFER_SIZE 0x20
 
 /* This driver isn't compatible with big endian. */
-BUILD_ASSERT(__BYTE_ORDER__  == __ORDER_LITTLE_ENDIAN__);
+BUILD_ASSERT(__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__);
 
 #define CPRINTS(fmt, args...) cprints(CC_PCHG, "CTN730: " fmt, ##args)
 
 static const char *_text_instruction(uint8_t instruction)
 {
-	/* TODO: For normal build, use %pb and BINARY_VALUE(res->inst, 6) */
 	switch (instruction) {
 	case WLC_HOST_CTRL_RESET:
 		return "RESET";
@@ -158,8 +158,7 @@ static int _i2c_read(int i2c_port, uint8_t *in, int in_len)
 
 static void _print_header(const struct ctn730_msg *msg)
 {
-	CPRINTS("%s_%s",
-		_text_instruction(msg->instruction),
+	CPRINTS("%s_%s", _text_instruction(msg->instruction),
 		_text_message_type(msg->message_type));
 }
 
@@ -206,9 +205,9 @@ static int ctn730_init(struct pchg *ctx)
 	cmd->message_type = CTN730_MESSAGE_TYPE_COMMAND;
 	cmd->instruction = WLC_HOST_CTRL_RESET;
 	cmd->length = WLC_HOST_CTRL_RESET_CMD_SIZE;
-	cmd->payload[0] = ctx->mode == PCHG_MODE_NORMAL
-			? WLC_HOST_CTRL_RESET_CMD_MODE_NORMAL
-			: WLC_HOST_CTRL_RESET_CMD_MODE_DOWNLOAD;
+	cmd->payload[0] = ctx->mode == PCHG_MODE_NORMAL ?
+				  WLC_HOST_CTRL_RESET_CMD_MODE_NORMAL :
+				  WLC_HOST_CTRL_RESET_CMD_MODE_DOWNLOAD;
 
 	/* TODO: Run 1 sec timeout timer. */
 	rv = _send_command(ctx, cmd);
@@ -258,8 +257,13 @@ static int _process_payload_response(struct pchg *ctx, struct ctn730_msg *res)
 		int rv = _i2c_read(ctx->cfg->i2c_port, buf, len);
 		if (rv)
 			return rv;
-		if (IS_ENABLED(CTN730_DEBUG))
-			CPRINTS("Payload: %ph", HEX_BUF(buf, len));
+		if (IS_ENABLED(CTN730_DEBUG)) {
+			char str_buf[hex_str_buf_size(len)];
+
+			snprintf_hex_buffer(str_buf, sizeof(str_buf),
+					    HEX_BUF(buf, len));
+			CPRINTS("Payload: %s", str_buf);
+		}
 	}
 
 	ctx->event = PCHG_EVENT_NONE;
@@ -359,8 +363,13 @@ static int _process_payload_event(struct pchg *ctx, struct ctn730_msg *res)
 		int rv = _i2c_read(ctx->cfg->i2c_port, buf, len);
 		if (rv)
 			return rv;
-		if (IS_ENABLED(CTN730_DEBUG))
-			CPRINTS("Payload: %ph", HEX_BUF(buf, len));
+		if (IS_ENABLED(CTN730_DEBUG)) {
+			char str_buf[hex_str_buf_size(len)];
+
+			snprintf_hex_buffer(str_buf, sizeof(str_buf),
+					    HEX_BUF(buf, len));
+			CPRINTS("Payload: %s", str_buf);
+		}
 	}
 
 	ctx->event = PCHG_EVENT_NONE;
@@ -510,8 +519,8 @@ static int ctn730_get_soc(struct pchg *ctx)
 
 static int ctn730_update_open(struct pchg *ctx)
 {
-	uint8_t buf[sizeof(struct ctn730_msg)
-		    + WLC_HOST_CTRL_DL_OPEN_SESSION_CMD_SIZE];
+	uint8_t buf[sizeof(struct ctn730_msg) +
+		    WLC_HOST_CTRL_DL_OPEN_SESSION_CMD_SIZE];
 	struct ctn730_msg *cmd = (void *)buf;
 	uint32_t version = ctx->update.version;
 	int rv;
@@ -531,16 +540,16 @@ static int ctn730_update_open(struct pchg *ctx)
 
 static int ctn730_update_write(struct pchg *ctx)
 {
-	uint8_t buf[sizeof(struct ctn730_msg)
-		    + WLC_HOST_CTRL_DL_WRITE_FLASH_CMD_SIZE];
+	uint8_t buf[sizeof(struct ctn730_msg) +
+		    WLC_HOST_CTRL_DL_WRITE_FLASH_CMD_SIZE];
 	struct ctn730_msg *cmd = (void *)buf;
 	uint32_t *a = (void *)cmd->payload;
 	uint8_t *d = (void *)&cmd->payload[CTN730_FLASH_ADDR_SIZE];
 	int rv;
 
 	/* Address is 3 bytes. FW size must be a multiple of 128 bytes. */
-	if (ctx->update.addr & GENMASK(31, 24)
-		|| ctx->update.size != WLC_HOST_CTRL_DL_WRITE_FLASH_BLOCK_SIZE)
+	if (ctx->update.addr & GENMASK(31, 24) ||
+	    ctx->update.size != WLC_HOST_CTRL_DL_WRITE_FLASH_BLOCK_SIZE)
 		return EC_ERROR_INVAL;
 
 	cmd->message_type = CTN730_MESSAGE_TYPE_COMMAND;
@@ -563,8 +572,8 @@ static int ctn730_update_write(struct pchg *ctx)
 
 static int ctn730_update_close(struct pchg *ctx)
 {
-	uint8_t buf[sizeof(struct ctn730_msg)
-		    + WLC_HOST_CTRL_DL_COMMIT_SESSION_CMD_SIZE];
+	uint8_t buf[sizeof(struct ctn730_msg) +
+		    WLC_HOST_CTRL_DL_COMMIT_SESSION_CMD_SIZE];
 	struct ctn730_msg *cmd = (void *)buf;
 	uint32_t *crc32 = (void *)cmd->payload;
 	int rv;
@@ -654,7 +663,7 @@ const struct pchg_drv ctn730_drv = {
 	.update_close = ctn730_update_close,
 };
 
-static int cc_ctn730(int argc, char **argv)
+static int cc_ctn730(int argc, const char **argv)
 {
 	int port;
 	char *end;
diff --git a/driver/nfc/ctn730.h b/driver/nfc/ctn730.h
index 0195b36a6d..6911d4fa5e 100644
--- a/driver/nfc/ctn730.h
+++ b/driver/nfc/ctn730.h
@@ -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.
  */
@@ -6,109 +6,109 @@
 #ifndef __CROS_EC_CTN730_H
 #define __CROS_EC_CTN730_H
 
-#define CTN730_I2C_ADDR			0x28
+#define CTN730_I2C_ADDR 0x28
 
 /* Size of flash address space in bytes */
-#define CTN730_FLASH_ADDR_SIZE		3
+#define CTN730_FLASH_ADDR_SIZE 3
 
 /* All commands are guaranteed to finish within 1 second. */
-#define CTN730_COMMAND_TIME_OUT		(1 * SECOND)
+#define CTN730_COMMAND_TIME_OUT (1 * SECOND)
 
 /* Message Types */
-#define CTN730_MESSAGE_TYPE_COMMAND	0b00
-#define CTN730_MESSAGE_TYPE_RESPONSE	0b01
-#define CTN730_MESSAGE_TYPE_EVENT	0b10
+#define CTN730_MESSAGE_TYPE_COMMAND 0b00
+#define CTN730_MESSAGE_TYPE_RESPONSE 0b01
+#define CTN730_MESSAGE_TYPE_EVENT 0b10
 
 /* Instruction Codes */
-#define WLC_HOST_CTRL_RESET			0b000000
-#define WLC_HOST_CTRL_DL_OPEN_SESSION		0b000011
-#define WLC_HOST_CTRL_DL_COMMIT_SESSION		0b000100
-#define WLC_HOST_CTRL_DL_WRITE_FLASH		0b000101
-#define WLC_HOST_CTRL_DUMP_STATUS		0b001100
-#define WLC_HOST_CTRL_GENERIC_ERROR		0b001111
-#define WLC_HOST_CTRL_BIST			0b000110
-#define WLC_CHG_CTRL_ENABLE			0b010000
-#define WLC_CHG_CTRL_DISABLE			0b010001
-#define WLC_CHG_CTRL_DEVICE_STATE		0b010010
-#define WLC_CHG_CTRL_CHARGING_STATE		0b010100
-#define WLC_CHG_CTRL_CHARGING_INFO		0b010101
+#define WLC_HOST_CTRL_RESET 0b000000
+#define WLC_HOST_CTRL_DL_OPEN_SESSION 0b000011
+#define WLC_HOST_CTRL_DL_COMMIT_SESSION 0b000100
+#define WLC_HOST_CTRL_DL_WRITE_FLASH 0b000101
+#define WLC_HOST_CTRL_DUMP_STATUS 0b001100
+#define WLC_HOST_CTRL_GENERIC_ERROR 0b001111
+#define WLC_HOST_CTRL_BIST 0b000110
+#define WLC_CHG_CTRL_ENABLE 0b010000
+#define WLC_CHG_CTRL_DISABLE 0b010001
+#define WLC_CHG_CTRL_DEVICE_STATE 0b010010
+#define WLC_CHG_CTRL_CHARGING_STATE 0b010100
+#define WLC_CHG_CTRL_CHARGING_INFO 0b010101
 
 /* WLC_HOST_CTRL_RESET constants */
-#define WLC_HOST_CTRL_RESET_CMD_SIZE			1
-#define WLC_HOST_CTRL_RESET_RSP_SIZE			1
-#define WLC_HOST_CTRL_RESET_EVT_NORMAL_MODE		0x00
-#define WLC_HOST_CTRL_RESET_EVT_NORMAL_MODE_SIZE	3
-#define WLC_HOST_CTRL_RESET_EVT_DOWNLOAD_MODE		0x01
-#define WLC_HOST_CTRL_RESET_EVT_DOWNLOAD_MODE_SIZE	2
-#define WLC_HOST_CTRL_RESET_REASON_INTENDED		0x00
-#define WLC_HOST_CTRL_RESET_REASON_CORRUPTED		0x01
-#define WLC_HOST_CTRL_RESET_REASON_UNRECOVERABLE	0x02
-#define WLC_HOST_CTRL_RESET_CMD_MODE_NORMAL		0x00
-#define WLC_HOST_CTRL_RESET_CMD_MODE_DOWNLOAD		0x01
+#define WLC_HOST_CTRL_RESET_CMD_SIZE 1
+#define WLC_HOST_CTRL_RESET_RSP_SIZE 1
+#define WLC_HOST_CTRL_RESET_EVT_NORMAL_MODE 0x00
+#define WLC_HOST_CTRL_RESET_EVT_NORMAL_MODE_SIZE 3
+#define WLC_HOST_CTRL_RESET_EVT_DOWNLOAD_MODE 0x01
+#define WLC_HOST_CTRL_RESET_EVT_DOWNLOAD_MODE_SIZE 2
+#define WLC_HOST_CTRL_RESET_REASON_INTENDED 0x00
+#define WLC_HOST_CTRL_RESET_REASON_CORRUPTED 0x01
+#define WLC_HOST_CTRL_RESET_REASON_UNRECOVERABLE 0x02
+#define WLC_HOST_CTRL_RESET_CMD_MODE_NORMAL 0x00
+#define WLC_HOST_CTRL_RESET_CMD_MODE_DOWNLOAD 0x01
 #define WLC_HOST_CTRL_RESET_EVT_MIN_SIZE \
 	WLC_HOST_CTRL_RESET_EVT_DOWNLOAD_MODE_SIZE
 
 /* WLC_HOST_CTRL_DL_* constants */
-#define WLC_HOST_CTRL_DL_OPEN_SESSION_CMD_SIZE		2
-#define WLC_HOST_CTRL_DL_OPEN_SESSION_RSP_SIZE		1
-#define WLC_HOST_CTRL_DL_WRITE_FLASH_BLOCK_SIZE		128
-#define WLC_HOST_CTRL_DL_WRITE_FLASH_CMD_SIZE		\
+#define WLC_HOST_CTRL_DL_OPEN_SESSION_CMD_SIZE 2
+#define WLC_HOST_CTRL_DL_OPEN_SESSION_RSP_SIZE 1
+#define WLC_HOST_CTRL_DL_WRITE_FLASH_BLOCK_SIZE 128
+#define WLC_HOST_CTRL_DL_WRITE_FLASH_CMD_SIZE \
 	(CTN730_FLASH_ADDR_SIZE + WLC_HOST_CTRL_DL_WRITE_FLASH_BLOCK_SIZE)
-#define WLC_HOST_CTRL_DL_WRITE_FLASH_RSP_SIZE		1
-#define WLC_HOST_CTRL_DL_COMMIT_SESSION_CMD_SIZE	4
-#define WLC_HOST_CTRL_DL_COMMIT_SESSION_RSP_SIZE	1
+#define WLC_HOST_CTRL_DL_WRITE_FLASH_RSP_SIZE 1
+#define WLC_HOST_CTRL_DL_COMMIT_SESSION_CMD_SIZE 4
+#define WLC_HOST_CTRL_DL_COMMIT_SESSION_RSP_SIZE 1
 
 /* WLC_CHG_CTRL_ENABLE constants */
-#define WLC_CHG_CTRL_ENABLE_CMD_SIZE		2
-#define WLC_CHG_CTRL_ENABLE_RSP_SIZE		1
+#define WLC_CHG_CTRL_ENABLE_CMD_SIZE 2
+#define WLC_CHG_CTRL_ENABLE_RSP_SIZE 1
 
 /* WLC_CHG_CTRL_DISABLE constants */
-#define WLC_CHG_CTRL_DISABLE_CMD_SIZE		0
-#define WLC_CHG_CTRL_DISABLE_RSP_SIZE		1
-#define WLC_CHG_CTRL_DISABLE_EVT_SIZE		1
+#define WLC_CHG_CTRL_DISABLE_CMD_SIZE 0
+#define WLC_CHG_CTRL_DISABLE_RSP_SIZE 1
+#define WLC_CHG_CTRL_DISABLE_EVT_SIZE 1
 
 /* WLC_CHG_CTRL_DEVICE_STATE constants */
-#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_DETECTED		0x00
-#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_DEACTIVATED		0x01
-#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_DEVICE_LOST		0x02
-#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_DEVICE_BAD_VERSION	0x03
-#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_DOCKED			0x04
-#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_UNDOCKED		0x05
-#define WLC_CHG_CTRL_DEVICE_STATE_EVT_SIZE_DETECTED		8
-#define WLC_CHG_CTRL_DEVICE_STATE_EVT_SIZE			1
+#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_DETECTED 0x00
+#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_DEACTIVATED 0x01
+#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_DEVICE_LOST 0x02
+#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_DEVICE_BAD_VERSION 0x03
+#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_DOCKED 0x04
+#define WLC_CHG_CTRL_DEVICE_STATE_DEVICE_UNDOCKED 0x05
+#define WLC_CHG_CTRL_DEVICE_STATE_EVT_SIZE_DETECTED 8
+#define WLC_CHG_CTRL_DEVICE_STATE_EVT_SIZE 1
 
 /* WLC_CHG_CTRL_CHARGING_STATE constants */
-#define WLC_CHG_CTRL_CHARGING_STATE_CHARGE_STARTED		0x00
-#define WLC_CHG_CTRL_CHARGING_STATE_CHARGE_ENDED		0x01
-#define WLC_CHG_CTRL_CHARGING_STATE_CHARGE_STOPPED		0x02
-#define WLC_CHG_CTRL_CHARGING_STATE_EVT_SIZE			1
+#define WLC_CHG_CTRL_CHARGING_STATE_CHARGE_STARTED 0x00
+#define WLC_CHG_CTRL_CHARGING_STATE_CHARGE_ENDED 0x01
+#define WLC_CHG_CTRL_CHARGING_STATE_CHARGE_STOPPED 0x02
+#define WLC_CHG_CTRL_CHARGING_STATE_EVT_SIZE 1
 
 /* WLC_HOST_CTRL_DUMP_STATUS constants */
-#define WLC_HOST_CTRL_DUMP_STATUS_CMD_SIZE	1
+#define WLC_HOST_CTRL_DUMP_STATUS_CMD_SIZE 1
 
 /* WLC_CHG_CTRL_CHARGING_INFO constants */
-#define WLC_CHG_CTRL_CHARGING_INFO_CMD_SIZE	0
-#define WLC_CHG_CTRL_CHARGING_INFO_RSP_SIZE	2
-#define WLC_CHG_CTRL_CHARGING_INFO_EVT_SIZE	5
+#define WLC_CHG_CTRL_CHARGING_INFO_CMD_SIZE 0
+#define WLC_CHG_CTRL_CHARGING_INFO_RSP_SIZE 2
+#define WLC_CHG_CTRL_CHARGING_INFO_EVT_SIZE 5
 
 /* Status Codes */
 enum wlc_host_status {
-	WLC_HOST_STATUS_OK				= 0x00,
-	WLC_HOST_STATUS_PARAMETER_ERROR			= 0x01,
-	WLC_HOST_STATUS_STATE_ERROR			= 0x02,
-	WLC_HOST_STATUS_VALUE_ERROR			= 0x03,
-	WLC_HOST_STATUS_REJECTED			= 0x04,
-	WLC_HOST_STATUS_RESOURCE_ERROR			= 0x10,
-	WLC_HOST_STATUS_TXLDO_ERROR			= 0x11,
-	WLC_HOST_STATUS_ANTENNA_SELECTION_ERROR		= 0x12,
-	WLC_HOST_STATUS_BIST_FAILED			= 0x20,
-	WLC_HOST_STATUS_BIST_NO_WLC_CAP			= 0x21,
-	WLC_HOST_STATUS_BIST_TXLDO_CURRENT_OVERFLOW	= 0x22,
-	WLC_HOST_STATUS_BIST_TXLDO_CURRENT_UNDERFLOW	= 0x23,
-	WLC_HOST_STATUS_FW_VERSION_ERROR		= 0x30,
-	WLC_HOST_STATUS_FW_VERIFICATION_ERROR		= 0x31,
-	WLC_HOST_STATUS_NTAG_BLOCK_PARAMETER_ERROR	= 0x32,
-	WLC_HOST_STATUS_NTAG_READ_ERROR			= 0x33,
+	WLC_HOST_STATUS_OK = 0x00,
+	WLC_HOST_STATUS_PARAMETER_ERROR = 0x01,
+	WLC_HOST_STATUS_STATE_ERROR = 0x02,
+	WLC_HOST_STATUS_VALUE_ERROR = 0x03,
+	WLC_HOST_STATUS_REJECTED = 0x04,
+	WLC_HOST_STATUS_RESOURCE_ERROR = 0x10,
+	WLC_HOST_STATUS_TXLDO_ERROR = 0x11,
+	WLC_HOST_STATUS_ANTENNA_SELECTION_ERROR = 0x12,
+	WLC_HOST_STATUS_BIST_FAILED = 0x20,
+	WLC_HOST_STATUS_BIST_NO_WLC_CAP = 0x21,
+	WLC_HOST_STATUS_BIST_TXLDO_CURRENT_OVERFLOW = 0x22,
+	WLC_HOST_STATUS_BIST_TXLDO_CURRENT_UNDERFLOW = 0x23,
+	WLC_HOST_STATUS_FW_VERSION_ERROR = 0x30,
+	WLC_HOST_STATUS_FW_VERIFICATION_ERROR = 0x31,
+	WLC_HOST_STATUS_NTAG_BLOCK_PARAMETER_ERROR = 0x32,
+	WLC_HOST_STATUS_NTAG_READ_ERROR = 0x33,
 };
 
 struct ctn730_msg {
@@ -118,4 +118,4 @@ struct ctn730_msg {
 	uint8_t payload[];
 } __packed;
 
-#endif  /* __CROS_EC_CTN730_H */
+#endif /* __CROS_EC_CTN730_H */