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 <youcheng@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1520574
Tested-by: Yu-Ping Wu <yupingso@chromium.org>
Commit-Ready: Yu-Ping Wu <yupingso@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Yilun Lin <yllin@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>

2 files changed, 17 insertions, 17 deletions

diff --git a/chip/mec1322/flash.c b/chip/mec1322/flash.c
index 2cd8dd156d..b6ab76113b 100644
--- a/chip/mec1322/flash.c
+++ b/chip/mec1322/flash.c
@@ -241,7 +241,7 @@ int flash_physical_restore_state(void)
 	 * If we have already jumped between images, an earlier image could
 	 * have applied write protection. Nothing additional needs to be done.
 	 */
-	if (reset_flags & RESET_FLAG_SYSJUMP) {
+	if (reset_flags & EC_RESET_FLAG_SYSJUMP) {
 		prev = (const struct flash_wp_state *)system_get_jump_tag(
 				FLASH_SYSJUMP_TAG, &version, &size);
 		if (prev && version == FLASH_HOOK_VERSION &&
diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c
index 13bb83920b..e50d97bc6d 100644
--- a/chip/mec1322/system.c
+++ b/chip/mec1322/system.c
@@ -44,16 +44,16 @@ static void check_reset_cause(void)
 	* BIT[6] determine VCC1 reset
 	*/
 	if (rst_sts & MEC1322_PWR_RST_STS_VCC1)
-		flags |= RESET_FLAG_RESET_PIN;
+		flags |= EC_RESET_FLAG_RESET_PIN;
 
 
 	flags |= MEC1322_VBAT_RAM(HIBDATA_INDEX_SAVED_RESET_FLAGS);
 	MEC1322_VBAT_RAM(HIBDATA_INDEX_SAVED_RESET_FLAGS) = 0;
 
-	if ((status & MEC1322_VBAT_STS_WDT) && !(flags & (RESET_FLAG_SOFT |
-					    RESET_FLAG_HARD |
-					    RESET_FLAG_HIBERNATE)))
-		flags |= RESET_FLAG_WATCHDOG;
+	if ((status & MEC1322_VBAT_STS_WDT) && !(flags & (EC_RESET_FLAG_SOFT |
+					    EC_RESET_FLAG_HARD |
+					    EC_RESET_FLAG_HIBERNATE)))
+		flags |= EC_RESET_FLAG_WATCHDOG;
 
 	system_set_reset_flags(flags);
 }
@@ -68,12 +68,12 @@ int system_is_reboot_warm(void)
 	check_reset_cause();
 	reset_flags = system_get_reset_flags();
 
-	if ((reset_flags & RESET_FLAG_RESET_PIN) ||
-		(reset_flags & RESET_FLAG_POWER_ON) ||
-		(reset_flags & RESET_FLAG_WATCHDOG) ||
-		(reset_flags & RESET_FLAG_HARD) ||
-		(reset_flags & RESET_FLAG_SOFT) ||
-		(reset_flags & RESET_FLAG_HIBERNATE))
+	if ((reset_flags & EC_RESET_FLAG_RESET_PIN) ||
+		(reset_flags & EC_RESET_FLAG_POWER_ON) ||
+		(reset_flags & EC_RESET_FLAG_WATCHDOG) ||
+		(reset_flags & EC_RESET_FLAG_HARD) ||
+		(reset_flags & EC_RESET_FLAG_SOFT) ||
+		(reset_flags & EC_RESET_FLAG_HIBERNATE))
 		return 0;
 	else
 		return 1;
@@ -113,17 +113,17 @@ void _system_reset(int flags, int wake_from_hibernate)
 
 	/* Save current reset reasons if necessary */
 	if (flags & SYSTEM_RESET_PRESERVE_FLAGS)
-		save_flags = system_get_reset_flags() | RESET_FLAG_PRESERVED;
+		save_flags = system_get_reset_flags() | EC_RESET_FLAG_PRESERVED;
 
 	if (flags & SYSTEM_RESET_LEAVE_AP_OFF)
-		save_flags |= RESET_FLAG_AP_OFF;
+		save_flags |= EC_RESET_FLAG_AP_OFF;
 
 	if (wake_from_hibernate)
-		save_flags |= RESET_FLAG_HIBERNATE;
+		save_flags |= EC_RESET_FLAG_HIBERNATE;
 	else if (flags & SYSTEM_RESET_HARD)
-		save_flags |= RESET_FLAG_HARD;
+		save_flags |= EC_RESET_FLAG_HARD;
 	else
-		save_flags |= RESET_FLAG_SOFT;
+		save_flags |= EC_RESET_FLAG_SOFT;
 
 	chip_save_reset_flags(save_flags);