From 555a4470c7e6373cb6d5397ea5e9278317bcb008 Mon Sep 17 00:00:00 2001 From: You-Cheng Syu Date: Tue, 9 Apr 2019 13:04:34 +0800 Subject: include: Move RESET_FLAG_* into ec_commands.h as EC_RESET_FLAG_* RESET_FLAGS_* are used when setting/reading the field ec_reset_flags of struct ec_response_uptime_info, which is defined in ec_commands.h. So it might be better to put those macros there. To be consistent with the other macros in the file, add "EC_" prefixes to them. BUG=b:109900671,b:118654976 BRANCH=none TEST=make buildall -j Cq-Depend: chrome-internal:1054910, chrome-internal:1054911, chrome-internal:1045539 Change-Id: If72ec25f1b34d8d46b74479fb4cd09252102aafa Signed-off-by: You-Cheng Syu Reviewed-on: https://chromium-review.googlesource.com/1520574 Tested-by: Yu-Ping Wu Commit-Ready: Yu-Ping Wu Legacy-Commit-Queue: Commit Bot Reviewed-by: Yilun Lin Reviewed-by: Daisuke Nojiri --- chip/nrf51/system.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'chip/nrf51') diff --git a/chip/nrf51/system.c b/chip/nrf51/system.c index 6a3b0888c5..dc7bff2059 100644 --- a/chip/nrf51/system.c +++ b/chip/nrf51/system.c @@ -7,6 +7,7 @@ #include "common.h" #include "console.h" +#include "ec_commands.h" #include "registers.h" #include "system.h" #include "task.h" @@ -50,22 +51,22 @@ static void check_reset_cause(void) uint32_t raw_cause = NRF51_POWER_RESETREAS; if (raw_cause & NRF51_POWER_RESETREAS_RESETPIN) - flags |= RESET_FLAG_RESET_PIN; + flags |= EC_RESET_FLAG_RESET_PIN; if (raw_cause & NRF51_POWER_RESETREAS_DOG) - flags |= RESET_FLAG_WATCHDOG; + flags |= EC_RESET_FLAG_WATCHDOG; /* Note that the programmer uses a soft reset in debug mode. */ if (raw_cause & NRF51_POWER_RESETREAS_SREQ) - flags |= RESET_FLAG_SOFT; + flags |= EC_RESET_FLAG_SOFT; if (raw_cause & (NRF51_POWER_RESETREAS_OFF | NRF51_POWER_RESETREAS_LPCOMP)) - flags |= RESET_FLAG_WAKE_PIN; + flags |= EC_RESET_FLAG_WAKE_PIN; if (raw_cause & (NRF51_POWER_RESETREAS_LOCKUP | NRF51_POWER_RESETREAS_DIF)) - flags |= RESET_FLAG_OTHER; + flags |= EC_RESET_FLAG_OTHER; system_set_reset_flags(flags); -- cgit v1.2.1