rmt: restructure rmt_signal_conn_t

components/driver/rmt.c

@@ -125,8 +125,8 @@ static void rmt_module_enable(void)
 {
     RMT_ENTER_CRITICAL();
     if (rmt_contex.rmt_module_enabled == false) {
-        periph_module_reset(rmt_periph_signals.module);
-        periph_module_enable(rmt_periph_signals.module);
+        periph_module_reset(rmt_periph_signals.groups[0].module);
+        periph_module_enable(rmt_periph_signals.groups[0].module);
         rmt_contex.rmt_module_enabled = true;
     }
     RMT_EXIT_CRITICAL();
@@ -137,7 +137,7 @@ static void rmt_module_disable(void)
 {
     RMT_ENTER_CRITICAL();
     if (rmt_contex.rmt_module_enabled == true) {
-        periph_module_disable(rmt_periph_signals.module);
+        periph_module_disable(rmt_periph_signals.groups[0].module);
         rmt_contex.rmt_module_enabled = false;
     }
     RMT_EXIT_CRITICAL();
@@ -533,11 +533,11 @@ esp_err_t rmt_set_gpio(rmt_channel_t channel, rmt_mode_t mode, gpio_num_t gpio_n
     if (mode == RMT_MODE_TX) {
         RMT_CHECK(RMT_IS_TX_CHANNEL(channel), RMT_CHANNEL_ERROR_STR, ESP_ERR_INVALID_ARG);
         gpio_set_direction(gpio_num, GPIO_MODE_OUTPUT);
-        esp_rom_gpio_connect_out_signal(gpio_num, rmt_periph_signals.channels[channel].tx_sig, invert_signal, 0);
+        esp_rom_gpio_connect_out_signal(gpio_num, rmt_periph_signals.groups[0].channels[channel].tx_sig, invert_signal, 0);
     } else {
         RMT_CHECK(RMT_IS_RX_CHANNEL(channel), RMT_CHANNEL_ERROR_STR, ESP_ERR_INVALID_ARG);
         gpio_set_direction(gpio_num, GPIO_MODE_INPUT);
-        esp_rom_gpio_connect_in_signal(gpio_num, rmt_periph_signals.channels[channel].rx_sig, invert_signal);
+        esp_rom_gpio_connect_in_signal(gpio_num, rmt_periph_signals.groups[0].channels[channel].rx_sig, invert_signal);
     }
     return ESP_OK;
 }
@@ -722,7 +722,7 @@ esp_err_t rmt_isr_register(void (*fn)(void *), void *arg, int intr_alloc_flags,
     RMT_CHECK((fn != NULL), RMT_ADDR_ERROR_STR, ESP_ERR_INVALID_ARG);
     RMT_CHECK(rmt_contex.rmt_driver_channels == 0, "RMT driver installed, can not install generic ISR handler", ESP_FAIL);
 
-    return esp_intr_alloc(rmt_periph_signals.irq, intr_alloc_flags, fn, arg, handle);
+    return esp_intr_alloc(rmt_periph_signals.groups[0].irq, intr_alloc_flags, fn, arg, handle);
 }
 
 esp_err_t rmt_isr_deregister(rmt_isr_handle_t handle)

components/hal/include/hal/rmt_types.h

@@ -14,12 +14,12 @@
 
 #pragma once
 
+#include "soc/soc_caps.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "soc/soc_caps.h"
-
 /**
 * @brief RMT channel ID
 *

components/soc/esp32/rmt_periph.c

@@ -17,6 +17,8 @@
 #include "soc/soc.h"
 
 const rmt_signal_conn_t rmt_periph_signals = {
+    .groups = {
+        [0] = {
             .module = PERIPH_RMT_MODULE,
             .irq = ETS_RMT_INTR_SOURCE,
             .channels = {
@@ -53,4 +55,6 @@ const rmt_signal_conn_t rmt_periph_signals = {
                     .rx_sig = RMT_SIG_IN7_IDX
                 }
             }
+        }
+    }
 };

components/soc/esp32c3/rmt_periph.c

@@ -16,6 +16,8 @@
 #include "soc/gpio_sig_map.h"
 
 const rmt_signal_conn_t rmt_periph_signals = {
+    .groups = {
+        [0] = {
             .module = PERIPH_RMT_MODULE,
             .irq = ETS_RMT_INTR_SOURCE,
             .channels = {
@@ -36,4 +38,6 @@ const rmt_signal_conn_t rmt_periph_signals = {
                     .rx_sig = RMT_SIG_IN1_IDX
                 },
             }
+        }
+    }
 };

components/soc/esp32s2/rmt_periph.c

@@ -16,6 +16,8 @@
 #include "soc/gpio_sig_map.h"
 
 const rmt_signal_conn_t rmt_periph_signals = {
+    .groups = {
+        [0] = {
             .module = PERIPH_RMT_MODULE,
             .irq = ETS_RMT_INTR_SOURCE,
             .channels = {
@@ -36,4 +38,6 @@ const rmt_signal_conn_t rmt_periph_signals = {
                     .rx_sig = RMT_SIG_IN3_IDX
                 }
             }
+        }
+    }
 };

components/soc/esp32s3/rmt_periph.c

@@ -16,6 +16,8 @@
 #include "soc/gpio_sig_map.h"
 
 const rmt_signal_conn_t rmt_periph_signals = {
+    .groups = {
+        [0] = {
             .module = PERIPH_RMT_MODULE,
             .irq = ETS_RMT_INTR_SOURCE,
             .channels = {
@@ -52,4 +54,6 @@ const rmt_signal_conn_t rmt_periph_signals = {
                     .rx_sig = RMT_SIG_IN3_IDX
                 }
             }
+        }
+    }
 };

components/soc/include/soc/rmt_periph.h

@@ -22,14 +22,16 @@ extern "C" {
 #endif
 
 typedef struct {
+    struct {
+        const int irq;
+        const periph_module_t module;
         struct {
             struct {
                 const int tx_sig;
                 const int rx_sig;
             };
         } channels[SOC_RMT_CHANNELS_PER_GROUP];
-    const int irq;
-    const periph_module_t module;
+    } groups[SOC_RMT_GROUPS];
 } rmt_signal_conn_t;
 
 extern const rmt_signal_conn_t rmt_periph_signals;