diff options
| author | Evan Green <evgreen@chromium.org> | 2019-07-19 16:20:45 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-05 00:47:36 +0000 |
| commit | 0128582fe62b51a74a4c6c5a91e9c5118e70e376 (patch) | |
| tree | 7d8d96c756da853b87d36497ba649b1fc8dad398 /board/twinkie/simpletrace.c | |
| parent | a41fea6b7df1c83072140c0da9e07f09a8b032e4 (diff) | |
| download | chrome-ec-0128582fe62b51a74a4c6c5a91e9c5118e70e376.tar.gz | |
printf: Convert %T to %pT
In order to be more compliant to standards, and ultimately turn on
compile-time printf format validation, switch the non-standard %T
into %pT, which takes a pointer to a 64-bit timestamp as an argument.
For convenience, define PRINTF_TIMESTAMP_NOW, which will use the
current time as the timestamp value, rather than forcing everyone
to pass a pointer to get_time().val.
For a couple of instances, simply use CPRINTS instead.
BUG=chromium:984041
TEST=make -j buildall
BRANCH=None
Cq-Depend:chrome-internal:1473305
Change-Id: I83e45b55a95ea27256dc147544ae3f7e39acc5dd
Signed-off-by: Evan Green <evgreen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1704216
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board/twinkie/simpletrace.c')
| -rw-r--r-- | board/twinkie/simpletrace.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/board/twinkie/simpletrace.c b/board/twinkie/simpletrace.c index 750d5f67c7..f68a09adcf 100644 --- a/board/twinkie/simpletrace.c +++ b/board/twinkie/simpletrace.c @@ -111,7 +111,7 @@ static void print_packet(int head, uint32_t *payload) const char *prole; if (trace_mode == TRACE_MODE_RAW) { - ccprintf("%T[%04x]", head); + ccprintf("%pT[%04x]", PRINTF_TIMESTAMP_NOW, head); for (i = 0; i < cnt; i++) ccprintf(" %08x", payload[i]); ccputs("\n"); @@ -119,7 +119,8 @@ static void print_packet(int head, uint32_t *payload) } name = cnt ? data_msg_name[typ] : ctrl_msg_name[typ]; prole = head & (PD_ROLE_SOURCE << 8) ? "SRC" : "SNK"; - ccprintf("%T %s/%d [%04x]%s", prole, id, head, name); + ccprintf("%pT %s/%d [%04x]%s", + PRINTF_TIMESTAMP_NOW, prole, id, head, name); if (!cnt) { /* Control message : we are done */ ccputs("\n"); return; @@ -150,11 +151,11 @@ static void print_packet(int head, uint32_t *payload) static void print_error(enum pd_rx_errors err) { if (err == PD_RX_ERR_INVAL) - ccprintf("%T TMOUT\n"); + ccprintf("%pT TMOUT\n", PRINTF_TIMESTAMP_NOW); else if (err == PD_RX_ERR_HARD_RESET) - ccprintf("%T HARD-RST\n"); + ccprintf("%pT HARD-RST\n", PRINTF_TIMESTAMP_NOW); else if (err == PD_RX_ERR_UNSUPPORTED_SOP) - ccprintf("%T SOP*\n"); + ccprintf("%pT SOP*\n", PRINTF_TIMESTAMP_NOW); else ccprintf("ERR %d\n", err); } |