pbio/drv/button_gpio: Convert process to pbio/os.

Author: laurensvalk

lib/pbio/drv/button/button_gpio.c

@@ -5,35 +5,16 @@
 
 #if PBDRV_CONFIG_BUTTON_GPIO
 
-#include <contiki.h>
+#include <stddef.h>
 
 #include <pbdrv/gpio.h>
 #include <pbio/button.h>
 #include <pbio/config.h>
 #include <pbio/error.h>
+#include <pbio/os.h>
 
 #include "button_gpio.h"
 
-#if PBDRV_CONFIG_BUTTON_GPIO_DEBOUNCE
-
-PROCESS(pbdrv_button_process, "button");
-
-static pbio_button_flags_t pbdrv_button_state;
-
-#endif // PBDRV_CONFIG_BUTTON_GPIO_DEBOUNCE
-
-void pbdrv_button_init(void) {
-    for (int i = 0; i < PBDRV_CONFIG_BUTTON_GPIO_NUM_BUTTON; i++) {
-        const pbdrv_button_gpio_platform_t *platform = &pbdrv_button_gpio_platform[i];
-        pbdrv_gpio_set_pull(&platform->gpio, platform->pull);
-        pbdrv_gpio_input(&platform->gpio);
-    }
-
-    #if PBDRV_CONFIG_BUTTON_GPIO_DEBOUNCE
-    process_start(&pbdrv_button_process);
-    #endif
-}
-
 /**
  * Reads the current button state.
  * @returns Flags that reflect the current button state.
@@ -52,26 +33,24 @@ static pbio_button_flags_t pbdrv_button_gpio_read(void) {
     return flags;
 }
 
-pbio_button_flags_t pbdrv_button_get_pressed(void) {
-    #if PBDRV_CONFIG_BUTTON_GPIO_DEBOUNCE
-    return pbdrv_button_state;
-    #else
-    return pbdrv_button_gpio_read();
-    #endif
-}
-
 #if PBDRV_CONFIG_BUTTON_GPIO_DEBOUNCE
 
-PROCESS_THREAD(pbdrv_button_process, ev, data) {
-    static struct etimer timer;
+static pbio_button_flags_t pbdrv_button_state;
+
+static pbio_os_process_t pbdrv_button_process;
+
+pbio_error_t pbdrv_button_process_thread(pbio_os_state_t *state, void *context) {
+
+    static pbio_os_timer_t timer;
+
     static pbio_button_flags_t prev, next;
 
-    PROCESS_BEGIN();
+    PBIO_OS_ASYNC_BEGIN(state);
 
-    etimer_set(&timer, 10);
+    pbio_os_timer_set(&timer, 10);
 
     for (;;) {
-        PROCESS_WAIT_EVENT_UNTIL(ev == PROCESS_EVENT_TIMER && etimer_expired(&timer));
+        PBIO_OS_AWAIT_UNTIL(state, pbio_os_timer_is_expired(&timer));
 
         next = pbdrv_button_gpio_read();
 
@@ -82,12 +61,33 @@ PROCESS_THREAD(pbdrv_button_process, ev, data) {
 
         prev = next;
 
-        etimer_reset(&timer);
+        pbio_os_timer_extend(&timer);
     }
 
-    PROCESS_END();
+    // Unreachable
+    PBIO_OS_ASYNC_END(PBIO_ERROR_FAILED);
 }
 
 #endif // PBDRV_CONFIG_BUTTON_GPIO_DEBOUNCE
 
+pbio_button_flags_t pbdrv_button_get_pressed(void) {
+    #if PBDRV_CONFIG_BUTTON_GPIO_DEBOUNCE
+    return pbdrv_button_state;
+    #else
+    return pbdrv_button_gpio_read();
+    #endif
+}
+
+void pbdrv_button_init(void) {
+    for (int i = 0; i < PBDRV_CONFIG_BUTTON_GPIO_NUM_BUTTON; i++) {
+        const pbdrv_button_gpio_platform_t *platform = &pbdrv_button_gpio_platform[i];
+        pbdrv_gpio_set_pull(&platform->gpio, platform->pull);
+        pbdrv_gpio_input(&platform->gpio);
+    }
+
+    #if PBDRV_CONFIG_BUTTON_GPIO_DEBOUNCE
+    pbio_os_process_start(&pbdrv_button_process, pbdrv_button_process_thread, NULL);
+    #endif
+}
+
 #endif // PBDRV_CONFIG_BUTTON_GPIO