diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2021-06-30 14:39:49 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-07-01 17:16:21 +0000 |
| commit | 28b95b786aca0fd6d169f292ebed4158385d2a93 (patch) | |
| tree | 8f50c89aa1ae617e70a6590a698a5bfe61aa2ae9 /common/system.c | |
| parent | 636ec31a9a2be517eb37d4dad7dfe1a192471745 (diff) | |
| download | chrome-ec-28b95b786aca0fd6d169f292ebed4158385d2a93.tar.gz | |
system: Rename reset_flags used in system_encode_save_flags
There is a variable named reset_flags, which is shared by all code
in system.c. system_encode_save_flags gives its parameter the same
name. This patch renames the local variable to remove the confusion.
There is no functionality change.
BUG=None
BRANCH=None
TEST=buildall
Change-Id: I9838d8d4c77e3a266731a840c70a77ddf1cefb25
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2998512
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'common/system.c')
| -rw-r--r-- | common/system.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/common/system.c b/common/system.c index 3502fb090d..ca99bf661a 100644 --- a/common/system.c +++ b/common/system.c @@ -58,7 +58,7 @@ struct jump_tag { /* Jump data (at end of RAM, or preceding panic data) */ static struct jump_data *jdata; -static uint32_t reset_flags; +static uint32_t reset_flags; /* EC_RESET_FLAG_* */ static int jumped_to_image; static int disable_jump; /* Disable ALL jumps if system is locked */ static int force_locked; /* Force system locked even if WP isn't enabled */ @@ -209,29 +209,29 @@ test_mockable uintptr_t system_usable_ram_end(void) return (uintptr_t)jdata - jdata->jump_tag_total; } -void system_encode_save_flags(int reset_flags, uint32_t *save_flags) +void system_encode_save_flags(int flags, uint32_t *save_flags) { *save_flags = 0; /* Save current reset reasons if necessary */ - if (reset_flags & SYSTEM_RESET_PRESERVE_FLAGS) + if (flags & SYSTEM_RESET_PRESERVE_FLAGS) *save_flags = system_get_reset_flags() | EC_RESET_FLAG_PRESERVED; /* Add in AP off flag into saved flags. */ - if (reset_flags & SYSTEM_RESET_LEAVE_AP_OFF) + if (flags & SYSTEM_RESET_LEAVE_AP_OFF) *save_flags |= EC_RESET_FLAG_AP_OFF; /* Add in stay in RO flag into saved flags. */ - if (reset_flags & SYSTEM_RESET_STAY_IN_RO) + if (flags & SYSTEM_RESET_STAY_IN_RO) *save_flags |= EC_RESET_FLAG_STAY_IN_RO; /* Add in watchdog flag into saved flags. */ - if (reset_flags & SYSTEM_RESET_AP_WATCHDOG) + if (flags & SYSTEM_RESET_AP_WATCHDOG) *save_flags |= EC_RESET_FLAG_AP_WATCHDOG; /* Save reset flag */ - if (reset_flags & (SYSTEM_RESET_HARD | SYSTEM_RESET_WAIT_EXT)) + if (flags & (SYSTEM_RESET_HARD | SYSTEM_RESET_WAIT_EXT)) *save_flags |= EC_RESET_FLAG_HARD; else *save_flags |= EC_RESET_FLAG_SOFT; |