py/scheduler: Convert mp_sched_full and mp_sched_num_pending to macros.

So they are guaranteed to be inlined within functions like
mp_sched_schedule which may be located in a special memory region.

2 files changed, 6 insertions, 8 deletions

diff --git a/py/runtime.h b/py/runtime.h
index 53aed4429..0bf988b90 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -71,9 +71,7 @@ void mp_handle_pending_tail(mp_uint_t atomic_state);
 #if MICROPY_ENABLE_SCHEDULER
 void mp_sched_lock(void);
 void mp_sched_unlock(void);
-static inline unsigned int mp_sched_num_pending(void) {
-    return MP_STATE_VM(sched_len);
-}
+#define mp_sched_num_pending() (MP_STATE_VM(sched_len))
 bool mp_sched_schedule(mp_obj_t function, mp_obj_t arg);
 #endif
 
diff --git a/py/scheduler.c b/py/scheduler.c
index 06d7b36c2..6b138a631 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -45,14 +45,14 @@ void MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(mp_keyboard_interrupt)(void) {
 
 #define IDX_MASK(i) ((i) & (MICROPY_SCHEDULER_DEPTH - 1))
 
-static inline bool mp_sched_full(void) {
+// This is a macro so it is guaranteed to be inlined in functions like
+// mp_sched_schedule that may be located in a special memory region.
+#define mp_sched_full() (mp_sched_num_pending() == MICROPY_SCHEDULER_DEPTH)
+
+static inline bool mp_sched_empty(void) {
     MP_STATIC_ASSERT(MICROPY_SCHEDULER_DEPTH <= 255); // MICROPY_SCHEDULER_DEPTH must fit in 8 bits
     MP_STATIC_ASSERT((IDX_MASK(MICROPY_SCHEDULER_DEPTH) == 0)); // MICROPY_SCHEDULER_DEPTH must be a power of 2
 
-    return mp_sched_num_pending() == MICROPY_SCHEDULER_DEPTH;
-}
-
-static inline bool mp_sched_empty(void) {
     return mp_sched_num_pending() == 0;
 }