Merge branch 'refactor/split_esp32c5_soc_include_folder' into 'master'

refactor(soc): sort esp32c5 soc headers See merge request espressif/esp-idf!33321
2024-10-11 18:22:44 +08:00
parent 45705167e5 82f4add36d
commit a74730e4df
125 changed files with 3 additions and 3 deletions
--- a/components/soc/esp32c5/include/soc/soc.h
+++ b/components/soc/esp32c5/include/soc/soc.h
@@ -12,7 +12,7 @@
 #endif

 #include "esp_bit_defs.h"
-#include "reg_base.h"
+#include "soc/reg_base.h"

 #define PRO_CPU_NUM (0)

--- a/components/soc/esp32c5/include/soc/system_reg.h
+++ b/components/soc/esp32c5/include/soc/system_reg.h
@@ -7,6 +7,6 @@
 #include "soc/hp_system_reg.h"

 // TODO: IDF-5720
-#include "intpri_reg.h"
+#include "soc/intpri_reg.h"
 #define SYSTEM_CPU_INTR_FROM_CPU_0_REG INTPRI_CPU_INTR_FROM_CPU_0_REG
 #define SYSTEM_CPU_INTR_FROM_CPU_0 INTPRI_CPU_INTR_FROM_CPU_0
--- a/components/soc/esp32c5/register/soc/.gitkeep
+++ b/components/soc/esp32c5/register/soc/.gitkeep
--- a/components/soc/esp32c5/register/soc/aes_reg.h
+++ b/components/soc/esp32c5/register/soc/aes_reg.h
--- a/components/soc/esp32c5/register/soc/aes_struct.h
+++ b/components/soc/esp32c5/register/soc/aes_struct.h
--- a/components/soc/esp32c5/register/soc/ahb_dma_reg.h
+++ b/components/soc/esp32c5/register/soc/ahb_dma_reg.h
--- a/components/soc/esp32c5/register/soc/ahb_dma_struct.h
+++ b/components/soc/esp32c5/register/soc/ahb_dma_struct.h
--- a/components/soc/esp32c5/register/soc/apb_saradc_reg.h
+++ b/components/soc/esp32c5/register/soc/apb_saradc_reg.h
--- a/components/soc/esp32c5/register/soc/apb_saradc_struct.h
+++ b/components/soc/esp32c5/register/soc/apb_saradc_struct.h
--- a/components/soc/esp32c5/register/soc/assist_debug_reg.h
+++ b/components/soc/esp32c5/register/soc/assist_debug_reg.h
--- a/components/soc/esp32c5/register/soc/assist_debug_struct.h
+++ b/components/soc/esp32c5/register/soc/assist_debug_struct.h
--- a/components/soc/esp32c5/register/soc/bitscrambler_reg.h
+++ b/components/soc/esp32c5/register/soc/bitscrambler_reg.h
--- a/components/soc/esp32c5/register/soc/bitscrambler_struct.h
+++ b/components/soc/esp32c5/register/soc/bitscrambler_struct.h
--- a/components/soc/esp32c5/register/soc/cache_reg.h
+++ b/components/soc/esp32c5/register/soc/cache_reg.h
--- a/components/soc/esp32c5/register/soc/cache_struct.h
+++ b/components/soc/esp32c5/register/soc/cache_struct.h
--- a/components/soc/esp32c5/register/soc/ds_reg.h
+++ b/components/soc/esp32c5/register/soc/ds_reg.h
--- a/components/soc/esp32c5/register/soc/ds_struct.h
+++ b/components/soc/esp32c5/register/soc/ds_struct.h
--- a/components/soc/esp32c5/register/soc/ecc_mult_reg.h
+++ b/components/soc/esp32c5/register/soc/ecc_mult_reg.h
--- a/components/soc/esp32c5/register/soc/ecc_mult_struct.h
+++ b/components/soc/esp32c5/register/soc/ecc_mult_struct.h
--- a/components/soc/esp32c5/register/soc/ecdsa_reg.h
+++ b/components/soc/esp32c5/register/soc/ecdsa_reg.h
--- a/components/soc/esp32c5/register/soc/ecdsa_struct.h
+++ b/components/soc/esp32c5/register/soc/ecdsa_struct.h
--- a/components/soc/esp32c5/register/soc/efuse_reg.h
+++ b/components/soc/esp32c5/register/soc/efuse_reg.h
--- a/components/soc/esp32c5/register/soc/efuse_struct.h
+++ b/components/soc/esp32c5/register/soc/efuse_struct.h
--- a/components/soc/esp32c5/register/soc/gpio_reg.h
+++ b/components/soc/esp32c5/register/soc/gpio_reg.h
--- a/components/soc/esp32c5/register/soc/gpio_struct.h
+++ b/components/soc/esp32c5/register/soc/gpio_struct.h
--- a/components/soc/esp32c5/register/soc/hmac_reg.h
+++ b/components/soc/esp32c5/register/soc/hmac_reg.h
--- a/components/soc/esp32c5/register/soc/hmac_struct.h
+++ b/components/soc/esp32c5/register/soc/hmac_struct.h
--- a/components/soc/esp32c5/register/soc/hp_apm_reg.h
+++ b/components/soc/esp32c5/register/soc/hp_apm_reg.h
--- a/components/soc/esp32c5/register/soc/hp_apm_struct.h
+++ b/components/soc/esp32c5/register/soc/hp_apm_struct.h
--- a/components/soc/esp32c5/register/soc/hp_system_reg.h
+++ b/components/soc/esp32c5/register/soc/hp_system_reg.h
--- a/components/soc/esp32c5/register/soc/hp_system_struct.h
+++ b/components/soc/esp32c5/register/soc/hp_system_struct.h
--- a/components/soc/esp32c5/register/soc/huk_reg.h
+++ b/components/soc/esp32c5/register/soc/huk_reg.h
--- a/components/soc/esp32c5/register/soc/huk_struct.h
+++ b/components/soc/esp32c5/register/soc/huk_struct.h
--- a/components/soc/esp32c5/register/soc/i2c_ana_mst_reg.h
+++ b/components/soc/esp32c5/register/soc/i2c_ana_mst_reg.h
--- a/components/soc/esp32c5/register/soc/i2c_reg.h
+++ b/components/soc/esp32c5/register/soc/i2c_reg.h
--- a/components/soc/esp32c5/register/soc/i2c_struct.h
+++ b/components/soc/esp32c5/register/soc/i2c_struct.h
--- a/components/soc/esp32c5/register/soc/i2s_reg.h
+++ b/components/soc/esp32c5/register/soc/i2s_reg.h
--- a/components/soc/esp32c5/register/soc/i2s_struct.h
+++ b/components/soc/esp32c5/register/soc/i2s_struct.h
--- a/components/soc/esp32c5/register/soc/ieee802154_reg.h
+++ b/components/soc/esp32c5/register/soc/ieee802154_reg.h
--- a/components/soc/esp32c5/register/soc/ieee802154_struct.h
+++ b/components/soc/esp32c5/register/soc/ieee802154_struct.h
--- a/components/soc/esp32c5/register/soc/interrupt_matrix_reg.h
+++ b/components/soc/esp32c5/register/soc/interrupt_matrix_reg.h
--- a/components/soc/esp32c5/register/soc/interrupt_matrix_struct.h
+++ b/components/soc/esp32c5/register/soc/interrupt_matrix_struct.h
--- a/components/soc/esp32c5/register/soc/intpri_reg.h
+++ b/components/soc/esp32c5/register/soc/intpri_reg.h
--- a/components/soc/esp32c5/register/soc/intpri_struct.h
+++ b/components/soc/esp32c5/register/soc/intpri_struct.h
--- a/components/soc/esp32c5/register/soc/io_mux_reg.h
+++ b/components/soc/esp32c5/register/soc/io_mux_reg.h
--- a/components/soc/esp32c5/register/soc/io_mux_struct.h
+++ b/components/soc/esp32c5/register/soc/io_mux_struct.h
--- a/components/soc/esp32c5/register/soc/keymng_reg.h
+++ b/components/soc/esp32c5/register/soc/keymng_reg.h
--- a/components/soc/esp32c5/register/soc/keymng_struct.h
+++ b/components/soc/esp32c5/register/soc/keymng_struct.h
--- a/components/soc/esp32c5/register/soc/ledc_reg.h
+++ b/components/soc/esp32c5/register/soc/ledc_reg.h
--- a/components/soc/esp32c5/register/soc/ledc_struct.h
+++ b/components/soc/esp32c5/register/soc/ledc_struct.h
--- a/components/soc/esp32c5/register/soc/lp_analog_peri_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_analog_peri_reg.h
--- a/components/soc/esp32c5/register/soc/lp_analog_peri_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_analog_peri_struct.h
--- a/components/soc/esp32c5/register/soc/lp_aon_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_aon_reg.h
--- a/components/soc/esp32c5/register/soc/lp_aon_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_aon_struct.h
--- a/components/soc/esp32c5/register/soc/lp_apm0_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_apm0_reg.h
--- a/components/soc/esp32c5/register/soc/lp_apm0_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_apm0_struct.h
--- a/components/soc/esp32c5/register/soc/lp_apm_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_apm_reg.h
--- a/components/soc/esp32c5/register/soc/lp_apm_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_apm_struct.h
--- a/components/soc/esp32c5/register/soc/lp_clkrst_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_clkrst_reg.h
--- a/components/soc/esp32c5/register/soc/lp_clkrst_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_clkrst_struct.h
--- a/components/soc/esp32c5/register/soc/lp_gpio_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_gpio_reg.h
--- a/components/soc/esp32c5/register/soc/lp_gpio_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_gpio_struct.h
--- a/components/soc/esp32c5/register/soc/lp_i2c_ana_mst_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_i2c_ana_mst_reg.h
--- a/components/soc/esp32c5/register/soc/lp_i2c_ana_mst_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_i2c_ana_mst_struct.h
--- a/components/soc/esp32c5/register/soc/lp_i2c_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_i2c_reg.h
--- a/components/soc/esp32c5/register/soc/lp_i2c_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_i2c_struct.h
--- a/components/soc/esp32c5/register/soc/lp_iomux_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_iomux_reg.h
--- a/components/soc/esp32c5/register/soc/lp_iomux_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_iomux_struct.h
--- a/components/soc/esp32c5/register/soc/lp_tee_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_tee_reg.h
--- a/components/soc/esp32c5/register/soc/lp_tee_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_tee_struct.h
--- a/components/soc/esp32c5/register/soc/lp_timer_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_timer_reg.h
--- a/components/soc/esp32c5/register/soc/lp_timer_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_timer_struct.h
--- a/components/soc/esp32c5/register/soc/lp_uart_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_uart_reg.h
--- a/components/soc/esp32c5/register/soc/lp_uart_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_uart_struct.h
--- a/components/soc/esp32c5/register/soc/lp_wdt_reg.h
+++ b/components/soc/esp32c5/register/soc/lp_wdt_reg.h
--- a/components/soc/esp32c5/register/soc/lp_wdt_struct.h
+++ b/components/soc/esp32c5/register/soc/lp_wdt_struct.h
--- a/components/soc/esp32c5/register/soc/lpperi_reg.h
+++ b/components/soc/esp32c5/register/soc/lpperi_reg.h
--- a/components/soc/esp32c5/register/soc/lpperi_struct.h
+++ b/components/soc/esp32c5/register/soc/lpperi_struct.h
--- a/components/soc/esp32c5/register/soc/mcpwm_reg.h
+++ b/components/soc/esp32c5/register/soc/mcpwm_reg.h
--- a/components/soc/esp32c5/register/soc/mcpwm_struct.h
+++ b/components/soc/esp32c5/register/soc/mcpwm_struct.h
--- a/components/soc/esp32c5/register/soc/mem_monitor_reg.h
+++ b/components/soc/esp32c5/register/soc/mem_monitor_reg.h
--- a/components/soc/esp32c5/register/soc/mem_monitor_struct.h
+++ b/components/soc/esp32c5/register/soc/mem_monitor_struct.h
--- a/components/soc/esp32c5/register/soc/parl_io_reg.h
+++ b/components/soc/esp32c5/register/soc/parl_io_reg.h
--- a/components/soc/esp32c5/register/soc/parl_io_struct.h
+++ b/components/soc/esp32c5/register/soc/parl_io_struct.h
--- a/components/soc/esp32c5/register/soc/pau_reg.h
+++ b/components/soc/esp32c5/register/soc/pau_reg.h
--- a/components/soc/esp32c5/register/soc/pau_struct.h
+++ b/components/soc/esp32c5/register/soc/pau_struct.h
--- a/components/soc/esp32c5/register/soc/pcnt_reg.h
+++ b/components/soc/esp32c5/register/soc/pcnt_reg.h
--- a/components/soc/esp32c5/register/soc/pcnt_struct.h
+++ b/components/soc/esp32c5/register/soc/pcnt_struct.h
--- a/components/soc/esp32c5/register/soc/pcr_reg.h
+++ b/components/soc/esp32c5/register/soc/pcr_reg.h
--- a/components/soc/esp32c5/register/soc/pcr_struct.h
+++ b/components/soc/esp32c5/register/soc/pcr_struct.h
--- a/components/soc/esp32c5/register/soc/pmu_reg.h
+++ b/components/soc/esp32c5/register/soc/pmu_reg.h
--- a/components/soc/esp32c5/register/soc/pmu_struct.h
+++ b/components/soc/esp32c5/register/soc/pmu_struct.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif

-#include "soc.h"
+#include "soc/soc.h"
 #include "soc/pmu_reg.h"

 typedef union {
--- a/components/soc/esp32c5/register/soc/pvt_reg.h
+++ b/components/soc/esp32c5/register/soc/pvt_reg.h
--- a/components/soc/esp32c5/register/soc/pvt_struct.h
+++ b/components/soc/esp32c5/register/soc/pvt_struct.h
--- a/components/soc/esp32c5/register/soc/reg_base.h
+++ b/components/soc/esp32c5/register/soc/reg_base.h
--- a/components/soc/esp32c5/register/soc/rmt_reg.h
+++ b/components/soc/esp32c5/register/soc/rmt_reg.h
--- a/components/soc/esp32c5/register/soc/rmt_struct.h
+++ b/components/soc/esp32c5/register/soc/rmt_struct.h
--- a/components/soc/esp32c5/register/soc/rsa_reg.h
+++ b/components/soc/esp32c5/register/soc/rsa_reg.h
--- a/components/soc/esp32c5/register/soc/rsa_struct.h
+++ b/components/soc/esp32c5/register/soc/rsa_struct.h
--- a/components/soc/esp32c5/register/soc/sha_reg.h
+++ b/components/soc/esp32c5/register/soc/sha_reg.h
--- a/Show More
+++ b/Show More