From cb59e6d1dc263a35c9f1f97e042aef8dce71a3a3 Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Tue, 16 Jul 2019 03:23:59 -0600 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1703128 Reviewed-by: Evan Green --- baseboard/kalista/baseboard.c | 2 +- board/fizz/board.c | 2 +- common/battery.c | 6 +++--- common/gesture.c | 15 ++++++++------- common/host_command_master.c | 22 +++++++++++----------- common/keyboard_test.c | 2 +- common/tpm_registers.c | 4 ++-- common/usb_update.c | 3 ++- driver/accel_lis2dh.c | 8 ++++---- driver/accelgyro_lsm6ds0.c | 5 +++-- driver/accelgyro_lsm6dsm.c | 10 ++++------ driver/gyro_l3gd20h.c | 6 +++--- test/button.c | 2 +- 13 files changed, 44 insertions(+), 43 deletions(-) diff --git a/baseboard/kalista/baseboard.c b/baseboard/kalista/baseboard.c index 7cf73be3e6..f3d552c96b 100644 --- a/baseboard/kalista/baseboard.c +++ b/baseboard/kalista/baseboard.c @@ -515,7 +515,7 @@ int fan_percent_to_rpm(int fan, int pct) if (fan_table[current_level].rpm != fan_get_rpm_target(FAN_CH(fan))) - cprintf(CC_THERMAL, "[%T Setting fan RPM to %d]\n", + cprints(CC_THERMAL, "Setting fan RPM to %d", fan_table[current_level].rpm); return fan_table[current_level].rpm; diff --git a/board/fizz/board.c b/board/fizz/board.c index 4e51c9851c..70ee2a70c7 100644 --- a/board/fizz/board.c +++ b/board/fizz/board.c @@ -818,7 +818,7 @@ int fan_percent_to_rpm(int fan, int pct) if (fan_table[current_level].rpm != fan_get_rpm_target(FAN_CH(fan))) - cprintf(CC_THERMAL, "[%T Setting fan RPM to %d]\n", + cprints(CC_THERMAL, "Setting fan RPM to %d", fan_table[current_level].rpm); return fan_table[current_level].rpm; 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. */ diff --git a/driver/accel_lis2dh.c b/driver/accel_lis2dh.c index 771128c4f8..9c982d9ac0 100644 --- a/driver/accel_lis2dh.c +++ b/driver/accel_lis2dh.c @@ -21,6 +21,7 @@ #include "driver/stm_mems_common.h" #define CPUTS(outstr) cputs(CC_ACCEL, outstr) +#define CPRINTS(format, args...) cprints(CC_ACCEL, format, ## args) #define CPRINTF(format, args...) cprintf(CC_ACCEL, format, ## args) /** @@ -123,7 +124,7 @@ static int is_data_ready(const struct motion_sensor_t *s, int *ready) ret = st_raw_read8(s->port, s->addr, LIS2DH_STATUS_REG, &tmp); if (ret != EC_SUCCESS) { - CPRINTF("[%T %s type:0x%X RS Error]", s->name, s->type); + CPRINTS("%s type:0x%X RS Error", s->name, s->type); return ret; } @@ -156,8 +157,7 @@ static int read(const struct motion_sensor_t *s, intv3_t v) ret = st_raw_read_n(s->port, s->addr, LIS2DH_OUT_X_L_ADDR, raw, OUT_XYZ_SIZE); if (ret != EC_SUCCESS) { - CPRINTF("[%T %s type:0x%X RD XYZ Error]", - s->name, s->type); + CPRINTS("%s type:0x%X RD XYZ Error", s->name, s->type); return ret; } @@ -241,7 +241,7 @@ static int init(const struct motion_sensor_t *s) err_unlock: mutex_unlock(s->mutex); - CPRINTF("[%T %s: MS Init type:0x%X Error]\n", s->name, s->type); + CPRINTS("%s: MS Init type:0x%X Error", s->name, s->type); return ret; } diff --git a/driver/accelgyro_lsm6ds0.c b/driver/accelgyro_lsm6ds0.c index 5f1b66717a..664fcc7e88 100644 --- a/driver/accelgyro_lsm6ds0.c +++ b/driver/accelgyro_lsm6ds0.c @@ -19,6 +19,7 @@ #include "util.h" #define CPUTS(outstr) cputs(CC_ACCEL, outstr) +#define CPRINTS(format, args...) cprints(CC_ACCEL, format, ## args) #define CPRINTF(format, args...) cprintf(CC_ACCEL, format, ## args) /* @@ -306,7 +307,7 @@ static int is_data_ready(const struct motion_sensor_t *s, int *ready) ret = raw_read8(s->port, s->addr, LSM6DS0_STATUS_REG, &tmp); if (ret != EC_SUCCESS) { - CPRINTF("[%T %s type:0x%X RS Error]", s->name, s->type); + CPRINTS("%s type:0x%X RS Error", s->name, s->type); return ret; } @@ -346,7 +347,7 @@ static int read(const struct motion_sensor_t *s, intv3_t v) ret = i2c_read_block(s->port, s->addr, xyz_reg, raw, 6); if (ret != EC_SUCCESS) { - CPRINTF("[%T %s type:0x%X RD XYZ Error]", + CPRINTS("%s type:0x%X RD XYZ Error", s->name, s->type); return ret; } diff --git a/driver/accelgyro_lsm6dsm.c b/driver/accelgyro_lsm6dsm.c index e5166eccc9..b4ba92a0e8 100644 --- a/driver/accelgyro_lsm6dsm.c +++ b/driver/accelgyro_lsm6dsm.c @@ -284,7 +284,7 @@ static int fifo_next(struct lsm6dsm_data *private) * Not expected we are supposed to be called to process FIFO * data. */ - CPRINTF("[%T FIFO empty pattern]\n"); + CPRINTS("FIFO empty pattern"); return FIFO_DEV_INVALID; } @@ -477,10 +477,8 @@ static int irq_handler(struct motion_sensor_t *s, uint32_t *event) if (ret != EC_SUCCESS) return ret; last_fifo_read_ts = __hw_clock_source_read(); - if (fsts.len & (LSM6DSM_FIFO_DATA_OVR | LSM6DSM_FIFO_FULL)) { - CPRINTF("[%T %s FIFO Overrun: %04x]\n", - s->name, fsts.len); - } + if (fsts.len & (LSM6DSM_FIFO_DATA_OVR | LSM6DSM_FIFO_FULL)) + CPRINTS("%s FIFO Overrun: %04x", s->name, fsts.len); if (!IS_FSTS_EMPTY(fsts)) ret = load_fifo(s, &fsts, &last_fifo_read_ts); @@ -655,7 +653,7 @@ static int is_data_ready(const struct motion_sensor_t *s, int *ready) ret = st_raw_read8(s->port, s->addr, LSM6DSM_STATUS_REG, &tmp); if (ret != EC_SUCCESS) { - CPRINTF("[%T %s type:0x%X RS Error]", s->name, s->type); + CPRINTS("%s type:0x%X RS Error", s->name, s->type); return ret; } diff --git a/driver/gyro_l3gd20h.c b/driver/gyro_l3gd20h.c index 44ee89c9a3..4fcaf15ed0 100644 --- a/driver/gyro_l3gd20h.c +++ b/driver/gyro_l3gd20h.c @@ -17,6 +17,7 @@ #include "util.h" #define CPUTS(outstr) cputs(CC_ACCEL, outstr) +#define CPRINTS(format, args...) cprints(CC_ACCEL, format, ## args) #define CPRINTF(format, args...) cprintf(CC_ACCEL, format, ## args) /* @@ -301,7 +302,7 @@ static int is_data_ready(const struct motion_sensor_t *s, int *ready) ret = raw_read8(s->port, s->addr, L3GD20_STATUS_REG, &tmp); if (ret != EC_SUCCESS) { - CPRINTF("[%T %s type:0x%X RS Error]", s->name, s->type); + CPRINTS("%s type:0x%X RS Error", s->name, s->type); return ret; } @@ -338,8 +339,7 @@ static int read(const struct motion_sensor_t *s, intv3_t v) i2c_block_read(s->port, s->addr, xyz_reg, raw, 6); if (ret != EC_SUCCESS) { - CPRINTF("[%T %s type:0x%X RD XYZ Error]", - s->name, s->type); + CPRINTS("%s type:0x%X RD XYZ Error", s->name, s->type); return ret; } diff --git a/test/button.c b/test/button.c index eb6a8cf916..29cbbce93e 100644 --- a/test/button.c +++ b/test/button.c @@ -146,7 +146,7 @@ static void button_test_init(void) { int i; - ccprintf("[%T Setting button GPIOs to inactive state.]\n"); + ccprints("Setting button GPIOs to inactive state"); for (i = 0; i < BUTTON_COUNT; i++) gpio_set_level(buttons[i].gpio, !(buttons[i].flags & BUTTON_FLAG_ACTIVE_HIGH)); -- cgit v1.2.1