From 4f0b979b36f02c7e8cbb8438a7f4e9f83cbf5d3e Mon Sep 17 00:00:00 2001 From: Namyoon Woo Date: Wed, 21 Apr 2021 10:31:34 -0700 Subject: ccdstate: add 'KeepAlive' line in output BUG=b:186004390 TEST=checked 'ccdstate' output in Octopus: > ccdstate AP: on AP UART: on EC: on Servo: undetectable Rdd: connected KeepAlive: disabled CCD EXT: enabled State flags: UARTAP+TX UARTEC+TX I2C SPI USBEC+TX CCD ports blocked: (none) > > > rddkeepalive true Forcing Rdd detect keepalive > > > ccdstate AP: off AP UART: off EC: on Servo: undetectable Rdd: connected KeepAlive: enabled CCD EXT: enabled State flags: UARTEC+TX I2C SPI USBEC+TX CCD ports blocked: (none) > > rddkeepalive Rdd: connected KeepAlive: enabled > > rddkeepalive false Using actual Rdd state > > rddkeepalive Rdd: connected KeepAlive: disabled Signed-off-by: Namyoon Woo Change-Id: Ib0517a62ddd97f334cc62530abdb8fe612ac998c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2844339 Tested-by: Namyoon Woo Reviewed-by: Mary Ruthven Reviewed-by: Vadim Bendebury Commit-Queue: Namyoon Woo --- board/cr50/rdd.c | 2 +- chip/g/rdd.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/cr50/rdd.c b/board/cr50/rdd.c index 228f076831..9ef0624313 100644 --- a/board/cr50/rdd.c +++ b/board/cr50/rdd.c @@ -462,8 +462,8 @@ static int command_ccd_state(int argc, char **argv) print_ap_state(); print_ap_uart_state(); print_ec_state(); - print_rdd_state(); print_servo_state(); + print_rdd_state(); ccprintf("CCD EXT: %s\n", ccd_ext_is_enabled() ? "enabled" : "disabled"); diff --git a/chip/g/rdd.c b/chip/g/rdd.c index 140414ec3b..5d154ecae0 100644 --- a/chip/g/rdd.c +++ b/chip/g/rdd.c @@ -55,10 +55,10 @@ uint8_t rdd_is_detected(void) void print_rdd_state(void) { - ccprintf("Rdd: %s%s\n", - force_detected ? "keepalive" : device_state_name(state), - ccd_get_flag(CCD_FLAG_RDDKEEPALIVE_AT_BOOT) ? " (atboot)" : - ""); + ccprintf("Rdd: %s\n", device_state_name(state)); + ccprintf("KeepAlive: %sabled%s\n", force_detected ? "en" : "dis", + ccd_get_flag(CCD_FLAG_RDDKEEPALIVE_AT_BOOT) ? " (atboot)" : + ""); } /** -- cgit v1.2.1