From 3ecdb3335703bc9625ec74633f7c8f07cd0f245e Mon Sep 17 00:00:00 2001 From: SnickerSun Date: Sat, 2 Nov 2024 15:14:23 +0800 Subject: [PATCH] =?utf8?q?1029patch=20=E4=BF=AE=E5=A4=8D=20b=E6=A0=B8ipc?= =?utf8?q?=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=EF=BC=8C=E7=89=B9=E5=AE=9A?= =?utf8?q?=E6=83=85=E5=86=B5UI=E6=BB=91=E5=8A=A8=E5=8D=A1=E9=A1=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c b/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c index 3c28d5637..5493abbcb 100755 --- a/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c +++ b/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c @@ -30,7 +30,7 @@ #define PM_SLEEP_SEL_EVENT 0x777 #define PM_SLEEP_TRACE_DEF_VAL 0x5a5a #define PM_OS_US_TO_MS 1000 - +#define RTC_TIMER_INT_STATUS 0x57024010 enum { PM_SLEEP_STATE_IDLE, PM_SLEEP_STATE_GOTO_DS, @@ -301,7 +301,7 @@ void pm_enter_sleep(uint32_t sleep_ms_val) return; } rtc_times /= PM_OS_US_TO_MS; - if (sleep_ms > rtc_times && rtc_times != 0 && sleep_ms <= g_pm_sleep_threshold) { + if (sleep_ms > rtc_times && rtc_times != 0) { sleep_ms = rtc_times; } if (sleep_ms <= PM_SLEEP_THRESHOLD_WFI_ONLY_MS || pm_get_sleep_veto()) { @@ -318,8 +318,8 @@ void pm_enter_sleep(uint32_t sleep_ms_val) pm_enter_deepsleep_set_flag(); status = pm_os_irq_lock(); - if ((sleep_ms <= g_pm_sleep_threshold) || pm_get_sleep_veto()) { - pm_enter_deepsleep_cancel_flag(); + if ((sleep_ms <= g_pm_sleep_threshold) || pm_get_sleep_veto() || (readw(RTC_TIMER_INT_STATUS) == 1)){ + pm_enter_deepsleep_cancel_flag(); pm_enter_light_sleep(); } else { #if CONFIG_PM_TICKLESS_EN == YES @@ -349,8 +349,6 @@ void pm_set_mcu_dynamic_power_flag(uint8_t flag) void uapi_pm_enter_sleep(void) { - uint32_t status = pm_os_irq_lock(); uint32_t sleep_ms = pm_os_get_sleep_ms(); pm_enter_sleep(sleep_ms); - pm_os_irq_restore(status); } -- 2.17.1