From ac95bde627c820282ea5c8e40c3b2f94caee8f0c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Sat, 4 Apr 2026 11:49:22 -1000
Subject: [PATCH] Move RP2040 wakeable_delay to wake.cpp (file-scope state for
 alarm callback)

---
 esphome/core/wake.cpp | 39 +++++++++++++++++++++++++++++++++++++++
 esphome/core/wake.h   | 30 ++----------------------------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/esphome/core/wake.cpp b/esphome/core/wake.cpp
index ddc377d191..d09918af4c 100644
--- a/esphome/core/wake.cpp
+++ b/esphome/core/wake.cpp
@@ -30,6 +30,45 @@ volatile bool g_main_loop_woke = false;
 void IRAM_ATTR wake_loop_any_context() { wake_loop_impl_(); }
 #endif
 
+// === RP2040 — wakeable_delay (needs file-scope state for alarm callback) ===
+#ifdef USE_RP2040
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+static volatile bool s_delay_expired = false;
+
+static int64_t alarm_callback_(alarm_id_t id, void *user_data) {
+  (void) id;
+  (void) user_data;
+  s_delay_expired = true;
+  __sev();
+  return 0;
+}
+
+namespace internal {
+void wakeable_delay(uint32_t ms) {
+  if (ms == 0) {
+    yield();
+    return;
+  }
+  if (g_main_loop_woke) {
+    g_main_loop_woke = false;
+    return;
+  }
+  s_delay_expired = false;
+  alarm_id_t alarm = add_alarm_in_ms(ms, alarm_callback_, nullptr, true);
+  if (alarm <= 0) {
+    delay(ms);
+    return;
+  }
+  while (!g_main_loop_woke && !s_delay_expired) {
+    __wfe();
+  }
+  if (!s_delay_expired)
+    cancel_alarm(alarm);
+  g_main_loop_woke = false;
+}
+}  // namespace internal
+#endif  // USE_RP2040
+
 // === Host (UDP loopback socket) ===
 #ifdef USE_HOST
 void wake_loop_threadsafe() {
diff --git a/esphome/core/wake.h b/esphome/core/wake.h
index 82375f4c0c..961edf5adb 100644
--- a/esphome/core/wake.h
+++ b/esphome/core/wake.h
@@ -89,35 +89,9 @@ inline void wake_loop_threadsafe() {
   __sev();
 }
 
+/// RP2040 wakeable delay uses file-scope state (alarm callback + flag) — defined in wake.cpp.
 namespace internal {
-inline void wakeable_delay(uint32_t ms) {
-  static volatile bool s_delay_expired = false;
-  if (ms == 0) {
-    yield();
-    return;
-  }
-  if (g_main_loop_woke) {
-    g_main_loop_woke = false;
-    return;
-  }
-  s_delay_expired = false;
-  auto alarm_cb = [](alarm_id_t, void *) -> int64_t {
-    s_delay_expired = true;
-    __sev();
-    return 0;
-  };
-  alarm_id_t alarm = add_alarm_in_ms(ms, alarm_cb, nullptr, true);
-  if (alarm <= 0) {
-    delay(ms);
-    return;
-  }
-  while (!g_main_loop_woke && !s_delay_expired) {
-    __wfe();
-  }
-  if (!s_delay_expired)
-    cancel_alarm(alarm);
-  g_main_loop_woke = false;
-}
+void wakeable_delay(uint32_t ms);
 }  // namespace internal
 
 // === Host (UDP loopback socket) ===