summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Short <keithshort@chromium.org>2022-01-28 10:01:57 -0700
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-03-29 18:05:04 +0000
commitae6930a3cc844343b979040720a0239beeb87abe (patch)
tree6aa14b8e27f6f811529c3e038fd515120251bf07
parent00ed1b4cc993b61d7753b966bafbcafe5acf9e19 (diff)
downloadchrome-ec-ae6930a3cc844343b979040720a0239beeb87abe.tar.gz
hooks: add HOOK_PRIO_PRE_DEFAULT
Add the HOOK_PRIO_PRE_DEFAULT alias for (HOOK_PRIO_DEFAULT-1). This more clearly identifies the intent of this priority level. BUG=none BRANCH=none TEST=compare_build.sh Signed-off-by: Keith Short <keithshort@chromium.org> Change-Id: I96d2a9951b3585ea07c28aa518204d1e20f306de Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3553676 Reviewed-by: Sam Hurst <shurst@google.com>
-rw-r--r--common/power_button.c2
-rw-r--r--include/hooks.h1
-rw-r--r--zephyr/projects/corsola/src/usbc_config.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/common/power_button.c b/common/power_button.c
index a24b073fa7..20c468301c 100644
--- a/common/power_button.c
+++ b/common/power_button.c
@@ -141,7 +141,7 @@ DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, pb_chipset_shutdown,
* Slightly higher than handle_pending_reboot because
* it may clear AP_IDLE flag.
*/
- HOOK_PRIO_DEFAULT - 1);
+ HOOK_PRIO_PRE_DEFAULT);
#endif
/**
diff --git a/include/hooks.h b/include/hooks.h
index 8d4fae576f..a8a69c18cb 100644
--- a/include/hooks.h
+++ b/include/hooks.h
@@ -14,6 +14,7 @@ enum hook_priority {
/* Generic values across all hooks */
HOOK_PRIO_FIRST = 1, /* Highest priority */
HOOK_PRIO_DEFAULT = 5000, /* Default priority */
+ HOOK_PRIO_PRE_DEFAULT = HOOK_PRIO_DEFAULT - 1,
HOOK_PRIO_LAST = 9999, /* Lowest priority */
/* Specific hook vales for HOOK_INIT */
diff --git a/zephyr/projects/corsola/src/usbc_config.c b/zephyr/projects/corsola/src/usbc_config.c
index 240e94ecba..54e5f48b25 100644
--- a/zephyr/projects/corsola/src/usbc_config.c
+++ b/zephyr/projects/corsola/src/usbc_config.c
@@ -49,7 +49,7 @@ static void baseboard_init(void)
gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usba));
#endif
}
-DECLARE_HOOK(HOOK_INIT, baseboard_init, HOOK_PRIO_DEFAULT-1);
+DECLARE_HOOK(HOOK_INIT, baseboard_init, HOOK_PRIO_PRE_DEFAULT);
__override uint8_t board_get_usb_pd_port_count(void)
{