extmod/moduselect: Use configurable EVENT_POLL_HOOK instead of WFI.

dpgeorge · dpgeorge · commit 2d329c4a5658 · 2016-12-02T16:40:39.000+11:00
To make moduselect be usable by any port.
diff --git a/cc3200/mpconfigport.h b/cc3200/mpconfigport.h
@@ -194,6 +194,7 @@ typedef long            mp_off_t;
 
 #define MICROPY_BEGIN_ATOMIC_SECTION()              disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)           enable_irq(state)
+#define MICROPY_EVENT_POLL_HOOK                     __WFI();
 
 // assembly functions to handle critical sections, interrupt
 // disabling/enabling and sleep mode enter/exit
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
@@ -172,7 +172,7 @@ STATIC mp_obj_t select_select(uint n_args, const mp_obj_t *args) {
             mp_map_deinit(&poll_map);
             return mp_obj_new_tuple(3, list_array);
         }
-        __WFI();
+        MICROPY_EVENT_POLL_HOOK
     }
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_select_obj, 3, 4, select_select);
@@ -264,7 +264,7 @@ STATIC mp_obj_t poll_poll(uint n_args, const mp_obj_t *args) {
             }
             return ret_list;
         }
-        __WFI();
+        MICROPY_EVENT_POLL_HOOK
     }
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_poll_obj, 1, 3, poll_poll);
diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h
@@ -262,6 +262,7 @@ static inline mp_uint_t disable_irq(void) {
 
 #define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
+#define MICROPY_EVENT_POLL_HOOK            __WFI();
 
 // There is no classical C heap in bare-metal ports, only Python
 // garbage-collected heap. For completeness, emulate C heap via

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ STATIC mp_obj_t select_select(uint n_args, const mp_obj_t *args) {`
`172`	`172`	`mp_map_deinit(&poll_map);`
`173`	`173`	`return mp_obj_new_tuple(3, list_array);`
`174`	`174`	`}`
`175`		`- __WFI();`
	`175`	`+ MICROPY_EVENT_POLL_HOOK`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_select_obj, 3, 4, select_select);`
`@@ -264,7 +264,7 @@ STATIC mp_obj_t poll_poll(uint n_args, const mp_obj_t *args) {`
`264`	`264`	`}`
`265`	`265`	`return ret_list;`
`266`	`266`	`}`
`267`		`- __WFI();`
	`267`	`+ MICROPY_EVENT_POLL_HOOK`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_poll_obj, 1, 3, poll_poll);`