soc:Added names to anonymous register structs

For typedef volatile struct in components/soc/esp32/include/soc

Merges https://github.com/espressif/esp-idf/pull/3199

diff --git a/components/soc/esp32/include/soc/apb_ctrl_struct.h b/components/soc/esp32/include/soc/apb_ctrl_struct.h
index a871af842126269c7b8ad4cbdade354fa3597a49..c0cb8711b2a78d2307b41bd8370c4d0ada609a45 100644 (file)
--- a/components/soc/esp32/include/soc/apb_ctrl_struct.h
+++ b/components/soc/esp32/include/soc/apb_ctrl_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef struct {
+typedef struct apb_ctrl_dev_s {
     union {
         struct {
             volatile uint32_t pre_div:       10;

diff --git a/components/soc/esp32/include/soc/can_struct.h b/components/soc/esp32/include/soc/can_struct.h
index fd9609344d5a5e97b47d1b2cce0cad1e3f31942b..3a7912bd4ceea27b245f8ad63cd6d503e0d79f21 100644 (file)
--- a/components/soc/esp32/include/soc/can_struct.h
+++ b/components/soc/esp32/include/soc/can_struct.h
@@ -139,7 +139,7 @@ typedef union {
     uint32_t val;
 } can_err_code_cap_reg_t;
 
-typedef struct {
+typedef struct can_acc_filter_s {
     can_reg_t code_reg[4];
     can_reg_t mask_reg[4];
     uint32_t reserved32[5];
@@ -166,7 +166,7 @@ typedef union {
 
 /* ---------------------------- Register Layout ------------------------------ */
 
-typedef volatile struct {
+typedef volatile struct can_dev_s {
     //Configuration and Control Registers
     can_mode_reg_t mode_reg;                                /* Address 0 */
     can_cmd_reg_t command_reg;                              /* Address 1 */

diff --git a/components/soc/esp32/include/soc/gpio_sd_struct.h b/components/soc/esp32/include/soc/gpio_sd_struct.h
index 4b82be052caab25b7a2e4aa1068cc94a6f080bd9..9981a2eed7f683ddd3cf5ed0f2df05ce4963defb 100644 (file)
--- a/components/soc/esp32/include/soc/gpio_sd_struct.h
+++ b/components/soc/esp32/include/soc/gpio_sd_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct gpio_sd_dev_s {
     union {
         struct {
             uint32_t duty:        8;

diff --git a/components/soc/esp32/include/soc/gpio_struct.h b/components/soc/esp32/include/soc/gpio_struct.h
index 15038fed3ff61c4c1ad6b7af3c65ca3f40ce7ab2..add6e741a6c883c08ae5cbdefa9d0750189ff0d0 100644 (file)
--- a/components/soc/esp32/include/soc/gpio_struct.h
+++ b/components/soc/esp32/include/soc/gpio_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct gpio_dev_s {
     uint32_t bt_select;                             /*NA*/
     uint32_t out;                                   /*GPIO0~31 output value*/
     uint32_t out_w1ts;                              /*GPIO0~31 output value write 1 to set*/

diff --git a/components/soc/esp32/include/soc/hinf_struct.h b/components/soc/esp32/include/soc/hinf_struct.h
index 8e46f5397d0b21bf7d841d03a01ce113790ea23d..d04d07ea2e0637d6e4319a7d3daffe70a8801675 100644 (file)
--- a/components/soc/esp32/include/soc/hinf_struct.h
+++ b/components/soc/esp32/include/soc/hinf_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct hinf_dev_s {
     union {
         struct {
             uint32_t user_id_fn1:  16;

diff --git a/components/soc/esp32/include/soc/host_struct.h b/components/soc/esp32/include/soc/host_struct.h
index 6c350abfc3abff4a9c7f6bd6ed6579bb24c2346e..057d009baf2aea28404d9716e192a2cdb849a88e 100644 (file)
--- a/components/soc/esp32/include/soc/host_struct.h
+++ b/components/soc/esp32/include/soc/host_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct host_dev_s {
     uint32_t reserved_0;
     uint32_t reserved_4;
     uint32_t reserved_8;

diff --git a/components/soc/esp32/include/soc/i2c_struct.h b/components/soc/esp32/include/soc/i2c_struct.h
index c60bb1e7c18f5d61d667bee3d13fb3189533b9d2..3b17aeb463fd27ee40ec0142ddbff37c974c75dd 100644 (file)
--- a/components/soc/esp32/include/soc/i2c_struct.h
+++ b/components/soc/esp32/include/soc/i2c_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct i2c_dev_s {
     union {
         struct {
             uint32_t period:14;             /*This register is used to configure the  low level width of SCL clock.*/

diff --git a/components/soc/esp32/include/soc/i2s_struct.h b/components/soc/esp32/include/soc/i2s_struct.h
index aa92bb75fea896a4be9a2d0d8c944b44d2e4b8d9..df8baf1dace9d183ab706435dfb893527f23c8d7 100644 (file)
--- a/components/soc/esp32/include/soc/i2s_struct.h
+++ b/components/soc/esp32/include/soc/i2s_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct i2s_dev_s {
     uint32_t reserved_0;
     uint32_t reserved_4;
     union {

diff --git a/components/soc/esp32/include/soc/ledc_struct.h b/components/soc/esp32/include/soc/ledc_struct.h
index d07e059f2097cc5f6f5fe74c4637f1cb268ab195..a9f505b8f42195c596c85907899ca4fa8eb0e7bf 100644 (file)
--- a/components/soc/esp32/include/soc/ledc_struct.h
+++ b/components/soc/esp32/include/soc/ledc_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct ledc_dev_s {
     struct {
         struct {
             union {

diff --git a/components/soc/esp32/include/soc/mcpwm_struct.h b/components/soc/esp32/include/soc/mcpwm_struct.h
index 1d5110bf8c9bd159bafd099e4d6d92e4bd044967..287998d6635740cb3744d3adc3ef56d06da6a66e 100644 (file)
--- a/components/soc/esp32/include/soc/mcpwm_struct.h
+++ b/components/soc/esp32/include/soc/mcpwm_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct mcpwm_dev_s {
     union {
         struct {
             uint32_t prescale: 8;                  /*Period of PWM_clk = 6.25ns * (PWM_CLK_PRESCALE + 1)*/

diff --git a/components/soc/esp32/include/soc/pcnt_struct.h b/components/soc/esp32/include/soc/pcnt_struct.h
index a551835bb8faa30c8c7c890aa8d9715a7d16dda6..caeb02ac23eb09cacdba50ef6c06d3deaa913f7a 100644 (file)
--- a/components/soc/esp32/include/soc/pcnt_struct.h
+++ b/components/soc/esp32/include/soc/pcnt_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct pcnt_dev_s {
     struct{
         union {
             struct {

diff --git a/components/soc/esp32/include/soc/rmt_struct.h b/components/soc/esp32/include/soc/rmt_struct.h
index bc4cd7a2ec52f9cd9a34dee2aa394769445c5aac..9736a28a7760331839eb735082321ae6bec77aa2 100644 (file)
--- a/components/soc/esp32/include/soc/rmt_struct.h
+++ b/components/soc/esp32/include/soc/rmt_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct rmt_dev_s {
     uint32_t data_ch[8];                                /*The R/W ram address for channel0-7 by apb fifo access.
                                                         Note that in some circumstances, data read from the FIFO may get lost. As RMT memory area accesses using the RMTMEM method do not have this issue
                                                         and provide all the functionality that the FIFO register has, it is encouraged to use that instead.*/
@@ -235,7 +235,7 @@ typedef volatile struct {
 } rmt_dev_t;
 extern rmt_dev_t RMT;
 
-typedef struct {
+typedef struct rmt_item32_s {
     union {
         struct {
             uint32_t duration0 :15;
@@ -248,7 +248,7 @@ typedef struct {
 } rmt_item32_t;
 
 //Allow access to RMT memory using RMTMEM.chan[0].data32[8]
-typedef volatile struct {
+typedef volatile struct rmt_mem_s {
     struct {
         union {
             rmt_item32_t data32[64];

diff --git a/components/soc/esp32/include/soc/rtc.h b/components/soc/esp32/include/soc/rtc.h
index a528bdd15de74edfca7539b9e7beb587b86d0038..12f65caf9aa25d10c9b2125bb9bbc48e1e678a72 100644 (file)
--- a/components/soc/esp32/include/soc/rtc.h
+++ b/components/soc/esp32/include/soc/rtc.h
@@ -88,7 +88,7 @@ typedef enum {
 /**
  * @brief CPU clock configuration structure
  */
-typedef struct {
+typedef struct rtc_cpu_freq_config_s {
     rtc_cpu_freq_src_t source;      //!< The clock from which CPU clock is derived
     uint32_t source_freq_mhz;       //!< Source clock frequency
     uint32_t div;                   //!< Divider, freq_mhz = source_freq_mhz / div
@@ -127,7 +127,7 @@ typedef enum {
 /**
  * Initialization parameters for rtc_clk_init
  */
-typedef struct {
+typedef struct rtc_clk_config_s {
     rtc_xtal_freq_t xtal_freq : 8;      //!< Main XTAL frequency
     rtc_cpu_freq_t cpu_freq_mhz : 10;   //!< CPU frequency to set, in MHz
     rtc_fast_freq_t fast_freq : 1;      //!< RTC_FAST_CLK frequency to set
@@ -535,7 +535,7 @@ void rtc_clk_wait_for_slow_cycle();
 /**
  * @brief sleep configuration for rtc_sleep_init function
  */
-typedef struct {
+typedef struct rtc_sleep_config_s {
     uint32_t lslp_mem_inf_fpu : 1;      //!< force normal voltage in sleep mode (digital domain memory)
     uint32_t rtc_mem_inf_fpu : 1;       //!< force normal voltage in sleep mode (RTC memory)
     uint32_t rtc_mem_inf_follow_cpu : 1;//!< keep low voltage in sleep mode (even if ULP/touch is used)
@@ -657,7 +657,7 @@ uint32_t rtc_sleep_start(uint32_t wakeup_opt, uint32_t reject_opt);
 /**
  * RTC power and clock control initialization settings
  */
-typedef struct {
+typedef struct rtc_config_s {
     uint32_t ck8m_wait : 8;         //!< Number of rtc_fast_clk cycles to wait for 8M clock to be ready
     uint32_t xtal_wait : 8;         //!< Number of rtc_fast_clk cycles to wait for XTAL clock to be ready
     uint32_t pll_wait : 8;          //!< Number of rtc_fast_clk cycles to wait for PLL to be ready
@@ -693,7 +693,7 @@ void rtc_init(rtc_config_t cfg);
 /**
  * Structure describing vddsdio configuration
  */
-typedef struct {
+typedef struct rtc_vddsdio_config_s {
     uint32_t force : 1;     //!< If 1, use configuration from RTC registers; if 0, use EFUSE/bootstrapping pins.
     uint32_t enable : 1;    //!< Enable VDDSDIO regulator
     uint32_t tieh  : 1;     //!< Select VDDSDIO voltage. One of RTC_VDDSDIO_TIEH_1_8V, RTC_VDDSDIO_TIEH_3_3V

diff --git a/components/soc/esp32/include/soc/rtc_cntl_struct.h b/components/soc/esp32/include/soc/rtc_cntl_struct.h
index 17a2d180382eefa9d8618466d9ee598342eab0e9..b7d2e8bd0fcc9ab06148498e4a429225b98d7eda 100644 (file)
--- a/components/soc/esp32/include/soc/rtc_cntl_struct.h
+++ b/components/soc/esp32/include/soc/rtc_cntl_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct rtc_cntl_dev_s {
     union {
         struct {
             uint32_t sw_stall_appcpu_c0:  2;             /*{reg_sw_stall_appcpu_c1[5:0]   reg_sw_stall_appcpu_c0[1:0]}  == 0x86 will stall APP CPU*/

diff --git a/components/soc/esp32/include/soc/rtc_io_struct.h b/components/soc/esp32/include/soc/rtc_io_struct.h
index d82f1bd8c048dde7653af9de988a8fa46d30fc59..785ec6c5d8f66378123fe27d5878ae0a583633b5 100644 (file)
--- a/components/soc/esp32/include/soc/rtc_io_struct.h
+++ b/components/soc/esp32/include/soc/rtc_io_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct rtc_io_dev_s {
     union {
         struct {
             uint32_t reserved0:        14;

diff --git a/components/soc/esp32/include/soc/sdmmc_struct.h b/components/soc/esp32/include/soc/sdmmc_struct.h
index 17b8b3f24f79e1aa290bb5c410f4177e7252fa5f..8a3bd8fcf6f1da62ff670606a7cc6a9a012e329f 100644 (file)
--- a/components/soc/esp32/include/soc/sdmmc_struct.h
+++ b/components/soc/esp32/include/soc/sdmmc_struct.h
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-typedef struct {
+typedef struct sdmmc_desc_s {
     uint32_t reserved1: 1;
     uint32_t disable_int_on_completion: 1;
     uint32_t last_descriptor: 1;
@@ -47,7 +47,7 @@ typedef struct {
 _Static_assert(sizeof(sdmmc_desc_t) == 16, "invalid size of sdmmc_desc_t structure");
 
 
-typedef struct {
+typedef struct sdmmc_hw_cmd_s {
     uint32_t cmd_index: 6;          ///< Command index
     uint32_t response_expect: 1;    ///< set if response is expected
     uint32_t response_long: 1;      ///< 0: short response expected, 1: long response expected
@@ -76,7 +76,7 @@ typedef struct {
 _Static_assert(sizeof(sdmmc_hw_cmd_t) == 4, "invalid size of sdmmc_cmd_t structure");
 
 
-typedef volatile struct {
+typedef volatile struct sdmmc_dev_s {
     union {
         struct {
             uint32_t controller_reset: 1;

diff --git a/components/soc/esp32/include/soc/sens_struct.h b/components/soc/esp32/include/soc/sens_struct.h
index f572148cd1d26c6873d3c088f6938b6d86af10a0..f0d892ce82e629c361ccc52e5801596fd6d36f03 100644 (file)
--- a/components/soc/esp32/include/soc/sens_struct.h
+++ b/components/soc/esp32/include/soc/sens_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct sens_dev_s {
     union {
         struct {
             uint32_t sar1_clk_div:      8;

diff --git a/components/soc/esp32/include/soc/slc_struct.h b/components/soc/esp32/include/soc/slc_struct.h
index 55506a5b436c00715f71fdf2467f6921a6466e63..90edd22946df73d79f30c7a12b2533507443466a 100644 (file)
--- a/components/soc/esp32/include/soc/slc_struct.h
+++ b/components/soc/esp32/include/soc/slc_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct slc_dev_s {
     union {
         struct {
             uint32_t slc0_tx_rst:         1;

diff --git a/components/soc/esp32/include/soc/spi_struct.h b/components/soc/esp32/include/soc/spi_struct.h
index 3e36c81c905e5b97f59ba06bd00e44f4dd4b777a..63acaeefd637739c935c53221e9832b26545bdad 100644 (file)
--- a/components/soc/esp32/include/soc/spi_struct.h
+++ b/components/soc/esp32/include/soc/spi_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct spi_dev_s {
     union {
         struct {
             uint32_t reserved0: 16;                         /*reserved*/

diff --git a/components/soc/esp32/include/soc/syscon_struct.h b/components/soc/esp32/include/soc/syscon_struct.h
index 4fb86f42b998f26e35616f0cc207ee667d5c3bbf..026607996442939ae1a625b93dd3d1810f6777f9 100644 (file)
--- a/components/soc/esp32/include/soc/syscon_struct.h
+++ b/components/soc/esp32/include/soc/syscon_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct syscon_dev_s {
     union {
         struct {
             uint32_t pre_div:       10;

diff --git a/components/soc/esp32/include/soc/timer_group_struct.h b/components/soc/esp32/include/soc/timer_group_struct.h
index 6d312969d498c7aaa1990a6036adfc0bf2f8cbe7..4ea1abe75d4bbfe042b11384285a9e94e0db8df5 100644 (file)
--- a/components/soc/esp32/include/soc/timer_group_struct.h
+++ b/components/soc/esp32/include/soc/timer_group_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct timg_dev_s {
     struct{
         union {
             struct {

diff --git a/components/soc/esp32/include/soc/uart_struct.h b/components/soc/esp32/include/soc/uart_struct.h
index 4efd6cf9011a77e5f86e8f1b0bc6c114f2b1dc00..7dc9b5144caf1d4fcf5b1f8fd240f8b0afa5412a 100644 (file)
--- a/components/soc/esp32/include/soc/uart_struct.h
+++ b/components/soc/esp32/include/soc/uart_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct uart_dev_s {
     union {
         struct {
             uint8_t rw_byte;                 /*This register stores one byte data  read by rx fifo.*/

diff --git a/components/soc/esp32/include/soc/uhci_struct.h b/components/soc/esp32/include/soc/uhci_struct.h
index 543af215c4422010e5d8b1aedcfe474d72e3e2b7..3f42536c31dd7b96d8f2a58fd41480e5724bccda 100644 (file)
--- a/components/soc/esp32/include/soc/uhci_struct.h
+++ b/components/soc/esp32/include/soc/uhci_struct.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-typedef volatile struct {
+typedef volatile struct uhci_dev_s {
     union {
         struct {
             uint32_t in_rst:             1;                /*Set this bit to reset in link operations.*/