pbio/os: Move IRQ hooks to platform.

Proceed to make pbio more independent from MicroPython.

Also restore them as static inline as they used to be
prior to #298
which reduces build size.

Author: laurensvalk

bricks/_common_stm32/mpconfigport.h

@@ -24,7 +24,7 @@ typedef unsigned mp_uint_t; // must be pointer size
 
 typedef long mp_off_t;
 
-#include <pbio/os.h>
+#include "pbio_os_config.h"
 
 #define MICROPY_BEGIN_ATOMIC_SECTION()     pbio_os_hook_disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)  pbio_os_hook_enable_irq(state)

bricks/_common_stm32/mphalport.c

@@ -24,20 +24,6 @@ void pb_stack_get_info(char **sstack, char **estack) {
     *estack = (char *)&_estack;
 }
 
-pbio_os_irq_flags_t pbio_os_hook_disable_irq(void) {
-    mp_uint_t flags = __get_PRIMASK();
-    __disable_irq();
-    return flags;
-}
-
-void pbio_os_hook_enable_irq(pbio_os_irq_flags_t flags) {
-    __set_PRIMASK(flags);
-}
-
-void pbio_os_hook_wait_for_interrupt(pbio_os_irq_flags_t flags) {
-    __WFI();
-}
-
 // using "internal" pbdrv variable
 extern volatile uint32_t pbdrv_clock_ticks;
 

bricks/ev3/mpconfigport.h

@@ -79,7 +79,7 @@ typedef unsigned mp_uint_t; // must be pointer size
 
 typedef long mp_off_t;
 
-#include <pbio/os.h>
+#include "pbio_os_config.h"
 
 #define MICROPY_BEGIN_ATOMIC_SECTION()     pbio_os_hook_disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)  pbio_os_hook_enable_irq(state)

bricks/ev3/mphalport.c

@@ -18,31 +18,13 @@
 #include "py/mpconfig.h"
 #include "py/stream.h"
 
-#include <tiam1808/armv5/am1808/interrupt.h>
-
 void pb_stack_get_info(char **sstack, char **estack) {
     extern uint32_t _estack;
     extern uint32_t _sstack;
     *sstack = (char *)&_sstack;
     *estack = (char *)&_estack;
 }
 
-pbio_os_irq_flags_t pbio_os_hook_disable_irq(void) {
-    return IntDisable();
-}
-
-void pbio_os_hook_enable_irq(pbio_os_irq_flags_t flags) {
-    IntEnable(flags);
-}
-
-void pbio_os_hook_wait_for_interrupt(pbio_os_irq_flags_t flags) {
-    __asm volatile (
-        "mov	r0, #0\n"
-        "mcr	p15, 0, r0, c7, c0, 4\n"        /* wait for interrupt */
-        ::: "r0"
-        );
-}
-
 // Core delay function that does an efficient sleep and may switch thread context.
 // If IRQs are enabled then we must have the GIL.
 void mp_hal_delay_ms(mp_uint_t Delay) {

bricks/nxt/mpconfigport.h

@@ -79,7 +79,7 @@ typedef long mp_off_t;
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 
-#include <pbio/os.h>
+#include "pbio_os_config.h"
 
 #define MICROPY_BEGIN_ATOMIC_SECTION()     pbio_os_hook_disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)  pbio_os_hook_enable_irq(state)

bricks/nxt/mphalport.c

@@ -4,10 +4,8 @@
 
 #include <stdint.h>
 
-#include <at91sam7s256.h>
 #include <contiki.h>
 
-#include <nxos/interrupts.h>
 #include <nxos/drivers/systick.h>
 #include <nxos/drivers/bt.h>
 
@@ -20,19 +18,6 @@
 #include "py/mpconfig.h"
 #include "py/stream.h"
 
-pbio_os_irq_flags_t pbio_os_hook_disable_irq(void) {
-    return nx_interrupts_disable();
-}
-
-void pbio_os_hook_enable_irq(pbio_os_irq_flags_t flags) {
-    nx_interrupts_enable(flags);
-}
-
-void pbio_os_hook_wait_for_interrupt(pbio_os_irq_flags_t flags) {
-    // disable the processor clock which puts it in Idle Mode.
-    AT91C_BASE_PMC->PMC_SCDR = AT91C_PMC_PCK;
-}
-
 void pb_stack_get_info(char **sstack, char **estack) {
     extern uint32_t __stack_start__;
     extern uint32_t __stack_end__;

bricks/virtualhub/mp_port.c

@@ -14,6 +14,8 @@
 
 #include <contiki.h>
 
+#include "pbio_os_config.h"
+
 #include <pbio/main.h>
 #include <pbio/os.h>
 #include <pbsys/core.h>

lib/pbio/include/pbio/os.h

@@ -279,29 +279,4 @@ void pbio_os_process_start(pbio_os_process_t *process, pbio_os_process_func_t fu
 
 void pbio_os_process_init(pbio_os_process_t *process, pbio_os_process_func_t func);
 
-/**
- * Disables interrupts and returns the previous interrupt state.
- *
- * Must be implemented by the platform.
- *
- * @return  The previous interrupt state.
- */
-pbio_os_irq_flags_t pbio_os_hook_disable_irq(void);
-
-/**
- * Enables interrupts.
- *
- * Must be implemented by the platform.
- *
- * @param [in]  flags  The previous interrupt state.
- */
-void pbio_os_hook_enable_irq(pbio_os_irq_flags_t flags);
-
-/**
- * Waits for an interrupt.
- *
- * Must be implemented by the platform.
- */
-void pbio_os_hook_wait_for_interrupt(pbio_os_irq_flags_t flags);
-
 #endif // _PBIO_OS_H_

lib/pbio/platform/city_hub/pbio_os_config.h

@@ -0,0 +1,19 @@
+#include <stdint.h>
+
+#include "stm32f0xx.h"
+
+typedef uint32_t pbio_os_irq_flags_t;
+
+static inline pbio_os_irq_flags_t pbio_os_hook_disable_irq(void) {
+    uint32_t flags = __get_PRIMASK();
+    __disable_irq();
+    return flags;
+}
+
+static inline void pbio_os_hook_enable_irq(pbio_os_irq_flags_t flags) {
+    __set_PRIMASK(flags);
+}
+
+static inline void pbio_os_hook_wait_for_interrupt(pbio_os_irq_flags_t flags) {
+    __WFI();
+}

lib/pbio/platform/essential_hub/pbio_os_config.h

@@ -0,0 +1,19 @@
+#include <stdint.h>
+
+#include "stm32f4xx.h"
+
+typedef uint32_t pbio_os_irq_flags_t;
+
+static inline pbio_os_irq_flags_t pbio_os_hook_disable_irq(void) {
+    uint32_t flags = __get_PRIMASK();
+    __disable_irq();
+    return flags;
+}
+
+static inline void pbio_os_hook_enable_irq(pbio_os_irq_flags_t flags) {
+    __set_PRIMASK(flags);
+}
+
+static inline void pbio_os_hook_wait_for_interrupt(pbio_os_irq_flags_t flags) {
+    __WFI();
+}