Merges with gpio mux

ibr-cm · May 30, 2018 · 74600d6 · 74600d6
2 parents f49432a + dfe8bac
commit 74600d6
Show file tree

Hide file tree

Showing 49 changed files with 417 additions and 85 deletions.
diff --git a/cpu/atmega_common/periph/gpio.c b/cpu/atmega_common/periph/gpio.c
@@ -161,9 +161,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     uint8_t pin_num = _pin_num(pin);
 
     if ((_port_num(pin) == PORT_D && pin_num > 3)

diff --git a/cpu/cc2538/include/periph_cpu.h b/cpu/cc2538/include/periph_cpu.h
@@ -48,6 +48,14 @@ extern "C" {
 typedef uint32_t gpio_t;
 /** @} */
 
+/**
+ * @name    Define a custom type for cb_mux cbid
+ * @{
+ */
+#define HAVE_CB_MUX_CBID_T
+typedef uint32_t cb_mux_cbid_t;
+/** @} */
+
 /**
  * @name    Power management configuration
  * @{

diff --git a/cpu/cc2538/periph/gpio.c b/cpu/cc2538/periph/gpio.c
@@ -118,9 +118,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     if (gpio_init(pin, mode) != 0) {
         return -1;
     }

diff --git a/cpu/cc26x0/periph/gpio.c b/cpu/cc26x0/periph/gpio.c
@@ -51,9 +51,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                   gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     int init = gpio_init(pin, mode);
     if (init != 0)
         return init;

diff --git a/cpu/efm32/include/periph_cpu.h b/cpu/efm32/include/periph_cpu.h
@@ -129,6 +129,14 @@ typedef struct {
 typedef uint32_t gpio_t;
 /** @} */
 
+/**
+ * @name    Define a custom type for cb_mux cbid
+ * @{
+ */
+#define HAVE_CB_MUX_CBID_T
+typedef uint32_t cb_mux_cbid_t;
+/** @} */
+
 /**
  * @brief   Definition of a fitting UNDEF value.
  */

diff --git a/cpu/efm32/periph/gpio.c b/cpu/efm32/periph/gpio.c
@@ -72,9 +72,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     int result = gpio_init(pin, mode);
 
     if (result != 0) {

diff --git a/cpu/ezr32wg/include/periph_cpu.h b/cpu/ezr32wg/include/periph_cpu.h
@@ -69,6 +69,14 @@ typedef struct {
 typedef uint32_t gpio_t;
 /** @} */
 
+/**
+ * @name    Define a custom type for cb_mux cbid
+ * @{
+ */
+#define HAVE_CB_MUX_CBID_T
+typedef uint32_t cb_mux_cbid_t;
+/** @} */
+
 /**
  * @brief   Definition of a fitting UNDEF value
  */

diff --git a/cpu/ezr32wg/periph/gpio.c b/cpu/ezr32wg/periph/gpio.c
@@ -80,9 +80,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                    gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     uint32_t pin_pos = _pin_pos(pin);
 
     /* configure as input */

diff --git a/cpu/kinetis/include/periph_cpu.h b/cpu/kinetis/include/periph_cpu.h
@@ -38,6 +38,14 @@ extern "C" {
 typedef uint16_t gpio_t;
 /** @} */
 
+/**
+ * @name    Define a custom type for cb_mux cbid
+ * @{
+ */
+#define HAVE_CB_MUX_CBID_T
+typedef uint16_t cb_mux_cbid_t;
+/** @} */
+
 /**
  * @brief   Definition of a fitting UNDEF value
  */

diff --git a/cpu/kinetis/periph/gpio.c b/cpu/kinetis/periph/gpio.c
@@ -197,9 +197,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     if (gpio_init(pin, mode) < 0) {
         return -1;
     }

diff --git a/cpu/lm4f120/include/periph_cpu.h b/cpu/lm4f120/include/periph_cpu.h
@@ -37,6 +37,14 @@ typedef uint32_t gpio_t;
 #define GPIO_PIN(x,y) ((gpio_t)((x<<4) | y))
 /** @} */
 
+/**
+ * @name    Define a custom type for cb_mux cbid
+ * @{
+ */
+#define HAVE_CB_MUX_CBID_T
+typedef uint32_t cb_mux_cbid_t;
+/** @} */
+
 #ifndef DOXYGEN
 /**
  * @brief   Override GPIO modes

diff --git a/cpu/lm4f120/periph/gpio.c b/cpu/lm4f120/periph/gpio.c
@@ -161,9 +161,12 @@ void isr_gpio_portf(void){
     _isr_gpio(5);
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     const uint8_t port_num = _port_num(pin);
     const uint32_t port_addr = _port_base[port_num];
     const uint32_t icr_reg_addr = port_addr + GPIO_ICR_R_OFF;

diff --git a/cpu/lpc1768/include/periph_cpu.h b/cpu/lpc1768/include/periph_cpu.h
@@ -36,6 +36,14 @@ extern "C" {
 typedef uint8_t gpio_t;
 /** @} */
 
+/**
+ * @name    Define a custom type for cb_mux cbid
+ * @{
+ */
+#define HAVE_CB_MUX_CBID_T
+typedef uint8_t cb_mux_cbid_t;
+/** @} */
+
 /**
  * @brief   Define a custom GPIO_PIN macro for the lpc1768
  */

diff --git a/cpu/lpc1768/periph/gpio.c b/cpu/lpc1768/periph/gpio.c
@@ -127,9 +127,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     /* only certain pins can be used as interrupt pins */
     if (_port(pin) != 0 && _port(pin) != 2) {
         return -1;

diff --git a/cpu/lpc2387/periph/gpio.c b/cpu/lpc2387/periph/gpio.c
@@ -93,9 +93,12 @@ int gpio_init_mux(unsigned pin, unsigned mux)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                    gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     (void)mode;
 
     DEBUG("gpio_init_int(): pin %u\n", pin);

diff --git a/cpu/mips_pic32_common/periph/gpio.c b/cpu/mips_pic32_common/periph/gpio.c
@@ -172,9 +172,10 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    (void)entry;
     (void)pin;
     (void)mode;
     (void)flank;

diff --git a/cpu/msp430fxyz/include/periph_cpu.h b/cpu/msp430fxyz/include/periph_cpu.h
@@ -34,6 +34,14 @@ extern "C" {
 typedef uint16_t gpio_t;
 /** @} */
 
+/**
+ * @name    Define a custom type for cb_mux cbid
+ * @{
+ */
+#define HAVE_CB_MUX_CBID_T
+typedef uint16_t cb_mux_cbid_t;
+/** @} */
+
 /**
  * @brief   Definition of a fitting UNDEF value
  */

diff --git a/cpu/msp430fxyz/periph/gpio.c b/cpu/msp430fxyz/periph/gpio.c
@@ -99,9 +99,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                    gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     msp_port_isr_t *port = _isr_port(pin);
 
     /* check if port, pull resistor and flank configuration are valid */

diff --git a/cpu/native/periph/gpio.c b/cpu/native/periph/gpio.c
@@ -26,8 +26,10 @@ int gpio_init(gpio_t pin, gpio_mode_t mode) {
   return -1;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg){
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
+{
+  (void) entry;
   (void) pin;
   (void) mode;
   (void) flank;

diff --git a/cpu/nrf5x_common/periph/gpio.c b/cpu/nrf5x_common/periph/gpio.c
@@ -84,9 +84,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     /* disable external interrupt in case one is active */
     NRF_GPIOTE->INTENSET &= ~(GPIOTE_INTENSET_IN0_Msk);
     /* save callback */

diff --git a/cpu/sam0_common/include/periph_cpu_common.h b/cpu/sam0_common/include/periph_cpu_common.h
@@ -49,6 +49,14 @@ extern "C" {
 typedef uint32_t gpio_t;
 /** @} */
 
+/**
+ * @name    Define a custom type for cb_mux cbid
+ * @{
+ */
+#define HAVE_CB_MUX_CBID_T
+typedef uint32_t cb_mux_cbid_t;
+/** @} */
+
 /**
  * @brief   Definition of a fitting UNDEF value
  */

diff --git a/cpu/sam0_common/periph/gpio.c b/cpu/sam0_common/periph/gpio.c
@@ -111,9 +111,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     int exti = _exti(pin);
 
     /* make sure EIC channel is valid */

diff --git a/cpu/sam3/include/periph_cpu.h b/cpu/sam3/include/periph_cpu.h
@@ -35,6 +35,14 @@ extern "C" {
 typedef uint32_t gpio_t;
 /** @} */
 
+/**
+ * @name    Define a custom type for cb_mux cbid
+ * @{
+ */
+#define HAVE_CB_MUX_CBID_T
+typedef uint32_t cb_mux_cbid_t;
+/** @} */
+
 /**
  * @brief Definition of a fitting UNDEF value
  */

diff --git a/cpu/sam3/periph/gpio.c b/cpu/sam3/periph/gpio.c
@@ -191,9 +191,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     Pio *port = _port(pin);
     int pin_num = _pin_num(pin);
     int port_num = _port_num(pin);

diff --git a/cpu/stm32_common/include/periph_cpu_common.h b/cpu/stm32_common/include/periph_cpu_common.h
@@ -120,6 +120,14 @@ typedef enum {
 #define HAVE_GPIO_T
 typedef uint32_t gpio_t;
 /** @} */
+
+/**
+ * @name    Define a custom type for cb_mux cbid
+ * @{
+ */
+#define HAVE_CB_MUX_CBID_T
+typedef uint32_t cb_mux_cbid_t;
+/** @} */
 #endif
 
 /**

diff --git a/cpu/stm32_common/periph/gpio.c b/cpu/stm32_common/periph/gpio.c
@@ -102,9 +102,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     return 0;
 }
 
-int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
-                  gpio_cb_t cb, void *arg)
+int gpio_init_int(gpio_int_t *entry, gpio_t pin, gpio_mode_t mode,
+                  gpio_flank_t flank, gpio_cb_t cb, void *arg)
 {
+    /* FIXME: utilize gpio.h/cb_mux API change */
+    (void)entry;
+
     int pin_num = _pin_num(pin);
     int port_num = _port_num(pin);