Merge pull request #10379 from jepler/event-hook

mpconfig: Use RUN_BACKGROUND_TASKS as the micropython event hook

Author: dhalbert

py/circuitpy_mpconfig.h

@@ -453,6 +453,7 @@ void background_callback_run_all(void);
 
 #define MICROPY_VM_HOOK_LOOP RUN_BACKGROUND_TASKS;
 #define MICROPY_VM_HOOK_RETURN RUN_BACKGROUND_TASKS;
+#define MICROPY_INTERNAL_EVENT_HOOK (RUN_BACKGROUND_TASKS)
 
 // CIRCUITPY_AUTORELOAD_DELAY_MS = 0 will completely disable autoreload.
 #ifndef CIRCUITPY_AUTORELOAD_DELAY_MS

py/scheduler.c

@@ -277,10 +277,6 @@ void mp_event_wait_indefinite(void) {
     MICROPY_EVENT_POLL_HOOK
     #else
     mp_event_handle_nowait();
-
-    // CIRCUITPY-CHANGE: don't starve CircuitPython background tasks
-    RUN_BACKGROUND_TASKS;
-
     MICROPY_INTERNAL_WFE(-1);
     #endif
 }
@@ -293,10 +289,6 @@ void mp_event_wait_ms(mp_uint_t timeout_ms) {
     MICROPY_EVENT_POLL_HOOK
     #else
     mp_event_handle_nowait();
-
-    // CIRCUITPY-CHANGE: don't starve CircuitPython background tasks
-    RUN_BACKGROUND_TASKS;
-
     MICROPY_INTERNAL_WFE(timeout_ms);
     #endif
 }