diff options
author | Jack Rosenthal <jrosenth@chromium.org> | 2019-07-16 03:23:59 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-07-17 11:19:54 +0000 |
commit | cb59e6d1dc263a35c9f1f97e042aef8dce71a3a3 (patch) | |
tree | 64ff9f0fb2625cbacecf351844ec25e587717a43 /common | |
parent | 03ca813082a84001ce5e78c81da841a60c234975 (diff) | |
download | chrome-ec-cb59e6d1dc263a35c9f1f97e042aef8dce71a3a3.tar.gz |
cleanup: refactor CPRINTF("[%T ...]\n") to CPRINTS
Looking at where the non-standard %T printf modifier is used in EC
codebase, the majority is cases where CPRINTS could have been used
instead of CPRINTF. This is a somewhat-mechanical refactor of these
cases, which will make implementing a standard printf easier.
BUG=chromium:984041
BRANCH=none
TEST=buildall
Change-Id: I75ea0be261bfbfa50fb850a0a37fe2ca6ab67cb9
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1703128
Reviewed-by: Evan Green <evgreen@chromium.org>
Diffstat (limited to 'common')
-rw-r--r-- | common/battery.c | 6 | ||||
-rw-r--r-- | common/gesture.c | 15 | ||||
-rw-r--r-- | common/host_command_master.c | 22 | ||||
-rw-r--r-- | common/keyboard_test.c | 2 | ||||
-rw-r--r-- | common/tpm_registers.c | 4 | ||||
-rw-r--r-- | common/usb_update.c | 3 |
6 files changed, 27 insertions, 25 deletions
diff --git a/common/battery.c b/common/battery.c index 3b8f0e8cd6..7f00e186ec 100644 --- a/common/battery.c +++ b/common/battery.c @@ -305,9 +305,9 @@ static void pending_cutoff_deferred(void) rv = board_cut_off_battery(); if (rv == EC_RES_SUCCESS) - CPRINTF("[%T Battery cut off succeeded.]\n"); + CPRINTS("Battery cut off succeeded."); else - CPRINTF("[%T Battery cut off failed!]\n"); + CPRINTS("Battery cut off failed!"); } DECLARE_DEFERRED(pending_cutoff_deferred); @@ -373,7 +373,7 @@ static int command_cutoff(int argc, char **argv) rv = board_cut_off_battery(); if (rv == EC_RES_SUCCESS) { - ccprintf("[%T Battery cut off]\n"); + ccprints("Battery cut off"); battery_cutoff_state = BATTERY_CUTOFF_STATE_CUT_OFF; return EC_SUCCESS; } diff --git a/common/gesture.c b/common/gesture.c index 35eddd0daa..b5e3c99851 100644 --- a/common/gesture.c +++ b/common/gesture.c @@ -261,14 +261,15 @@ static int gesture_tap_for_battery(void) CPRINTS("tap st %d->%d, error div by 0", state_p, state); else - CPRINTF("[%T tap st %d->%d, st_cnt %-3d ", - state_p, state, state_cnt); - CPRINTF("Z_in:Z_out %-3d, Z_in:XY_in %-3d ", + CPRINTS("tap st %d->%d, st_cnt %-3d " + "Z_in:Z_out %-3d, Z_in:XY_in %-3d " + "dZ_in %-8.3d, dZ_in_max %-8.3d, " + "dZ_out %-8.3d", + state_p, state, state_cnt, delta_z_inner / delta_z_outer, - delta_z_inner / delta_xy_inner); - CPRINTF("dZ_in %-8.3d, dZ_in_max %-8.3d, " - "dZ_out %-8.3d]\n", - delta_z_inner, delta_z_inner_max, + delta_z_inner / delta_xy_inner, + delta_z_inner, + delta_z_inner_max, delta_z_outer); } diff --git a/common/host_command_master.c b/common/host_command_master.c index 899b442977..3786ecc235 100644 --- a/common/host_command_master.c +++ b/common/host_command_master.c @@ -16,6 +16,7 @@ /* Console output macros */ #define CPUTS(outstr) cputs(CC_HOSTCMD, outstr) +#define CPRINTS(format, args...) cprints(CC_HOSTCMD, format, ## args) #define CPRINTF(format, args...) cprintf(CC_HOSTCMD, format, ## args) /* Number of attempts for each PD host command */ @@ -86,7 +87,7 @@ static int pd_host_command_internal(int command, int version, i2c_set_timeout(I2C_PORT_PD_MCU, 0); if (ret) { i2c_lock(I2C_PORT_PD_MCU, 0); - CPRINTF("[%T i2c transaction 1 failed: %d]\n", ret); + CPRINTS("i2c transaction 1 failed: %d", ret); return -EC_RES_BUS_ERROR; } @@ -97,8 +98,8 @@ static int pd_host_command_internal(int command, int version, i2c_xfer_unlocked(I2C_PORT_PD_MCU, CONFIG_USB_PD_I2C_SLAVE_ADDR, 0, 0, &resp_buf[2], 1, I2C_XFER_STOP); i2c_lock(I2C_PORT_PD_MCU, 0); - CPRINTF("[%T response size is too large %d > %d]\n", - resp_len, insize + sizeof(rs)); + CPRINTS("response size is too large %d > %d", + resp_len, insize + sizeof(rs)); return -EC_RES_RESPONSE_TOO_BIG; } @@ -108,15 +109,14 @@ static int pd_host_command_internal(int command, int version, &resp_buf[2], resp_len, I2C_XFER_STOP); i2c_lock(I2C_PORT_PD_MCU, 0); if (ret) { - CPRINTF("[%T i2c transaction 2 failed: %d]\n", ret); + CPRINTS("i2c transaction 2 failed: %d", ret); return -EC_RES_BUS_ERROR; } /* Check for host command error code */ ret = resp_buf[0]; if (ret) { - CPRINTF("[%T command 0x%02x returned error %d]\n", command, - ret); + CPRINTS("command 0x%02x returned error %d", command, ret); return -ret; } @@ -128,17 +128,17 @@ static int pd_host_command_internal(int command, int version, } if (rs.struct_version != EC_HOST_RESPONSE_VERSION) { - CPRINTF("[%T PD response version mismatch]\n"); + CPRINTS("PD response version mismatch"); return -EC_RES_INVALID_RESPONSE; } if (rs.reserved) { - CPRINTF("[%T PD response reserved != 0]\n"); + CPRINTS("PD response reserved != 0"); return -EC_RES_INVALID_RESPONSE; } if (rs.data_len > insize) { - CPRINTF("[%T PD returned too much data]\n"); + CPRINTS("PD returned too much data"); return -EC_RES_RESPONSE_TOO_BIG; } @@ -151,8 +151,8 @@ static int pd_host_command_internal(int command, int version, if ((uint8_t)sum) { - CPRINTF("[%T command 0x%02x bad checksum returned: " - "%d]\n", command, sum); + CPRINTS("command 0x%02x bad checksum returned: %d", + command, sum); return -EC_RES_INVALID_CHECKSUM; } diff --git a/common/keyboard_test.c b/common/keyboard_test.c index 55fa37d4b7..34c04e7304 100644 --- a/common/keyboard_test.c +++ b/common/keyboard_test.c @@ -60,7 +60,7 @@ static const struct keyscan_item *keyscan_seq_get(void) ksi++; } - ccprintf("%T: keyscan_seq done, upto=%d\n", keyscan_seq_upto); + ccprints("keyscan_seq done, upto=%d", keyscan_seq_upto); keyscan_seq_upto = -1; keyscan_seq_cur = NULL; return NULL; diff --git a/common/tpm_registers.c b/common/tpm_registers.c index 62aa4ce23e..e7cfeff547 100644 --- a/common/tpm_registers.c +++ b/common/tpm_registers.c @@ -603,14 +603,14 @@ static void tpm_init(void) _plat__SetNvAvail(); endorse_result = tpm_endorse(); - ccprintf("[%T Endorsement %s]\n", + ccprints("Endorsement %s", (endorse_result == mnf_success) ? "succeeded" : "failed"); if (chip_factory_mode()) { underrun_char |= endorse_result; - ccprintf("[%T Setting underrun character to 0x%x]\n", + ccprints("Setting underrun character to 0x%x", underrun_char); sps_tx_status(underrun_char); } diff --git a/common/usb_update.c b/common/usb_update.c index d9786b268b..64875fd798 100644 --- a/common/usb_update.c +++ b/common/usb_update.c @@ -223,7 +223,8 @@ static int try_vendor_command(struct consumer const *consumer, size_t count) switch (subcommand) { case UPDATE_EXTRA_CMD_IMMEDIATE_RESET: - CPRINTF("[%T Rebooting!]\n\n\n"); + CPRINTS("Rebooting!"); + CPRINTF("\n\n"); cflush(); system_reset(SYSTEM_RESET_MANUALLY_TRIGGERED); /* Unreachable, unless something bad happens. */ |