Move GPIO specific atoms from ESP32 platform_defaultatoms.h to gpio_driver.c

Moves the atoms only needed by the GPIO driver out of ESP32 platform_defaultatoms.h and into the
gpio driver, where they are created as needed at runtime.

Signed-off-by: Winford <[email protected]>

Author: UncleGrumpy

src/platforms/esp32/components/avm_builtins/gpio_driver.c

@@ -39,7 +39,6 @@
 #include "mailbox.h"
 #include "module.h"
 #include "nifs.h"
-#include "platform_defaultatoms.h"
 #include "port.h"
 #include "scheduler.h"
 #include "term.h"
@@ -69,10 +68,14 @@ static Context *gpio_driver_create_port(GlobalContext *global, term opts);
 #endif
 
 #ifdef CONFIG_AVM_ENABLE_GPIO_PORT_DRIVER
-static const char *const gpio_atom = "\x4" "gpio";
-static const char *const gpio_driver_atom = "\xB" "gpio_driver";
+static const char *const gpio_atom = ATOM_STR("\x4", "gpio");
+static const char *const gpio_driver_atom = ATOM_STR("\xB", "gpio_driver");
+static const char *const gpio_interrupt_atom = ATOM_STR("\xE", "gpio_interrupt");
 #endif
 
+static const char *const high_atom = ATOM_STR("\x4", "high");
+static const char *const low_atom = ATOM_STR("\x3", "low");
+
 static const AtomStringIntPair pin_mode_table[] = {
     { ATOM_STR("\x5", "input"), GPIO_MODE_INPUT },
     { ATOM_STR("\x6", "output"), GPIO_MODE_OUTPUT },
@@ -101,6 +104,16 @@ static const AtomStringIntPair pin_level_table[] = {
     SELECT_INT_DEFAULT(GPIOPinInvalid)
 };
 
+static const AtomStringIntPair int_trigger_table[] = {
+    { ATOM_STR("\x4", "none"), GPIO_INTR_DISABLE },
+    { ATOM_STR("\x6", "rising"), GPIO_INTR_POSEDGE },
+    { ATOM_STR("\x7", "falling"), GPIO_INTR_NEGEDGE },
+    { ATOM_STR("\x4", "both"), GPIO_INTR_ANYEDGE },
+    { ATOM_STR("\x3", "low"), GPIO_INTR_LOW_LEVEL },
+    { ATOM_STR("\x4", "high"), GPIO_INTR_HIGH_LEVEL },
+    SELECT_INT_DEFAULT(GPIO_INTR_MAX)
+};
+
 enum gpio_cmd
 {
     GPIOInvalidCmd = 0,
@@ -286,7 +299,7 @@ static inline term gpio_digital_read(term gpio_num_term)
 
     avm_int_t level = gpio_get_level(gpio_num);
 
-    return level ? HIGH_ATOM : LOW_ATOM;
+    return level ? globalcontext_make_atom(glb, high_atom) : globalcontext_make_atom(glb, low_atom);
 }
 
 #ifdef CONFIG_AVM_ENABLE_GPIO_PORT_DRIVER
@@ -371,7 +384,7 @@ EventListener *gpio_interrupt_callback(GlobalContext *glb, EventListener *listen
     BEGIN_WITH_STACK_HEAP(1 + 2, heap);
 
     term int_msg = term_alloc_tuple(2, &heap);
-    term_put_tuple_element(int_msg, 0, GPIO_INTERRUPT_ATOM);
+    term_put_tuple_element(int_msg, 0, globalcontext_make_atom(glb, gpio_interrupt_atom));
     term_put_tuple_element(int_msg, 1, term_from_int32(gpio_num));
 
     globalcontext_send_message(glb, listening_pid, int_msg);
@@ -484,34 +497,9 @@ static term gpiodriver_set_int(Context *ctx, int32_t target_pid, term cmd)
 
 
     /* TODO: GPIO specific atoms should be removed from platform_defaultatoms and constructed within this driver */
-    gpio_int_type_t interrupt_type;
-    switch (trigger) {
-        case NONE_ATOM:
-            interrupt_type = GPIO_INTR_DISABLE;
-            break;
-
-        case RISING_ATOM:
-            interrupt_type = GPIO_INTR_POSEDGE;
-            break;
-
-        case FALLING_ATOM:
-            interrupt_type = GPIO_INTR_NEGEDGE;
-            break;
-
-        case BOTH_ATOM:
-            interrupt_type = GPIO_INTR_ANYEDGE;
-            break;
-
-        case LOW_ATOM:
-            interrupt_type = GPIO_INTR_LOW_LEVEL;
-            break;
-
-        case HIGH_ATOM:
-            interrupt_type = GPIO_INTR_HIGH_LEVEL;
-            break;
-
-        default:
-            return ERROR_ATOM;
+    gpio_int_type_t interrupt_type = interop_atom_term_select_int(int_trigger_table, trigger, ctx->global);
+    if(UNLIKELY(interrupt_type == GPIO_INTR_MAX)) {
+        return BADARG_ATOM;
     }
 
     if (trigger != NONE_ATOM) {
@@ -570,6 +558,7 @@ static term gpiodriver_remove_int(Context *ctx, term cmd)
         return ERROR_ATOM;
     }
 
+
     return unregister_interrupt_listener(ctx, gpio_num);
 }
 

src/platforms/esp32/components/avm_sys/include/platform_defaultatoms.h

@@ -23,17 +23,9 @@
 
 #include "defaultatoms.h"
 
-#define READ_ATOM_INDEX (PLATFORM_ATOMS_BASE_INDEX + 0)
-#define GPIO_INTERRUPT_ATOM_INDEX (PLATFORM_ATOMS_BASE_INDEX + 1)
-#define RISING_ATOM_INDEX (PLATFORM_ATOMS_BASE_INDEX + 2)
-#define FALLING_ATOM_INDEX (PLATFORM_ATOMS_BASE_INDEX + 3)
-#define BOTH_ATOM_INDEX (PLATFORM_ATOMS_BASE_INDEX + 4)
-#define LOW_ATOM_INDEX (PLATFORM_ATOMS_BASE_INDEX + 5)
-#define HIGH_ATOM_INDEX (PLATFORM_ATOMS_BASE_INDEX + 6)
+#define ESP32_ATOM_INDEX (PLATFORM_ATOMS_BASE_INDEX + 0)
 
-#define ESP32_ATOM_INDEX (PLATFORM_ATOMS_BASE_INDEX + 7)
-
-#define SOCKET_ATOMS_BASE_INDEX (PLATFORM_ATOMS_BASE_INDEX + 8)
+#define SOCKET_ATOMS_BASE_INDEX (PLATFORM_ATOMS_BASE_INDEX + 1)
 #define PROTO_ATOM_INDEX (SOCKET_ATOMS_BASE_INDEX + 0)
 #define UDP_ATOM_INDEX (SOCKET_ATOMS_BASE_INDEX + 1)
 #define TCP_ATOM_INDEX (SOCKET_ATOMS_BASE_INDEX + 2)
@@ -77,14 +69,6 @@
 #define DEFAULT_ATOM_INDEX (UART_ATOMS_BASE_INDEX + 11)
 #define EVENT_QUEUE_LEN_ATOM_INDEX (UART_ATOMS_BASE_INDEX + 12)
 
-#define READ_ATOM TERM_FROM_ATOM_INDEX(READ_ATOM_INDEX)
-#define GPIO_INTERRUPT_ATOM TERM_FROM_ATOM_INDEX(GPIO_INTERRUPT_ATOM_INDEX)
-#define RISING_ATOM TERM_FROM_ATOM_INDEX(RISING_ATOM_INDEX)
-#define FALLING_ATOM TERM_FROM_ATOM_INDEX(FALLING_ATOM_INDEX)
-#define BOTH_ATOM TERM_FROM_ATOM_INDEX(BOTH_ATOM_INDEX)
-#define LOW_ATOM TERM_FROM_ATOM_INDEX(LOW_ATOM_INDEX)
-#define HIGH_ATOM TERM_FROM_ATOM_INDEX(HIGH_ATOM_INDEX)
-
 #define ESP32_ATOM TERM_FROM_ATOM_INDEX(ESP32_ATOM_INDEX)
 
 // socket

src/platforms/esp32/components/avm_sys/platform_defaultatoms.c

@@ -20,14 +20,6 @@
 
 #include "platform_defaultatoms.h"
 
-static const char *const read_atom = "\x4" "read";
-static const char *const gpio_interrupt_atom = "\xE" "gpio_interrupt";
-static const char *const rising_atom = "\x6" "rising";
-static const char *const falling_atom = "\x7" "falling";
-static const char *const both_atom = "\x4" "both";
-static const char *const low_atom = "\x3" "low";
-static const char *const high_atom = "\x4" "high";
-
 static const char *const esp32_atom = "\x5" "esp32";
 
 static const char *const proto_atom = "\x5" "proto";
@@ -77,14 +69,6 @@ void platform_defaultatoms_init(GlobalContext *glb)
 {
     int ok = 1;
 
-    ok &= globalcontext_insert_atom(glb, read_atom) == READ_ATOM_INDEX;
-    ok &= globalcontext_insert_atom(glb, gpio_interrupt_atom) == GPIO_INTERRUPT_ATOM_INDEX;
-    ok &= globalcontext_insert_atom(glb, rising_atom) == RISING_ATOM_INDEX;
-    ok &= globalcontext_insert_atom(glb, falling_atom) == FALLING_ATOM_INDEX;
-    ok &= globalcontext_insert_atom(glb, both_atom) == BOTH_ATOM_INDEX;
-    ok &= globalcontext_insert_atom(glb, low_atom) == LOW_ATOM_INDEX;
-    ok &= globalcontext_insert_atom(glb, high_atom) == HIGH_ATOM_INDEX;
-
     ok &= globalcontext_insert_atom(glb, esp32_atom) == ESP32_ATOM_INDEX;
 
     ok &= globalcontext_insert_atom(glb, proto_atom) == PROTO_ATOM_INDEX;