all: Using xxx_periph.h

Using xxx_periph.h in whole IDF instead of xxx_reg.h, xxx_struct.h, xxx_channel.h ... .

Cleaned up header files from unnecessary headers (releated to soc/... headers).

diff --git a/components/app_trace/app_trace.c b/components/app_trace/app_trace.c
index e9b832f0c2fb32c8e5a50e4c2af141c2d8c9b932..5a577a70dc8a55d6c4b700db35fa48d5437fd6d9 100644 (file)
--- a/components/app_trace/app_trace.c
+++ b/components/app_trace/app_trace.c
@@ -160,8 +160,7 @@
 #include "soc/dport_reg.h"
 #include "eri.h"
 #include "trax.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "freertos/FreeRTOS.h"
 #include "esp_app_trace.h"
 

diff --git a/components/app_trace/gcov/gcov_rtio.c b/components/app_trace/gcov/gcov_rtio.c
index 7798890c1c6ef171e0d4c129834d0df5b15e62c3..41306b288122e0807ba00b368c96ea7bc3167778 100644 (file)
--- a/components/app_trace/gcov/gcov_rtio.c
+++ b/components/app_trace/gcov/gcov_rtio.c
@@ -18,8 +18,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "soc/cpu.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "esp_app_trace.h"
 #include "esp_private/dbg_stubs.h"
 

diff --git a/components/app_update/esp_ota_ops.c b/components/app_update/esp_ota_ops.c
index edc70ca6f88edd33cd2ec2c1892ec642be27509f..df6d8a9066d8269f6078c2e2ad450c626728b335 100644 (file)
--- a/components/app_update/esp_ota_ops.c
+++ b/components/app_update/esp_ota_ops.c
@@ -34,7 +34,6 @@
 #include "esp_ota_ops.h"
 #include "sys/queue.h"
 #include "esp32/rom/crc.h"
-#include "soc/dport_reg.h"
 #include "esp_log.h"
 #include "esp_flash_partitions.h"
 #include "bootloader_common.h"

diff --git a/components/bootloader_support/include/esp_flash_encrypt.h b/components/bootloader_support/include/esp_flash_encrypt.h
index 59eca33b24624e3a452a7160f00ab6301bde7dcf..fd8c9fed0b959ef144e53258cf4e2064f9943a24 100644 (file)
--- a/components/bootloader_support/include/esp_flash_encrypt.h
+++ b/components/bootloader_support/include/esp_flash_encrypt.h
@@ -20,7 +20,7 @@
 #ifndef BOOTLOADER_BUILD
 #include "esp_spi_flash.h"
 #endif
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 
 /**
  * @file esp_partition.h

diff --git a/components/bootloader_support/include/esp_secure_boot.h b/components/bootloader_support/include/esp_secure_boot.h
index 17b405e4fabd844a563cf54338de70a429580ed4..299c4959d21ecbeee869129b1c6fab6915a7cc39 100644 (file)
--- a/components/bootloader_support/include/esp_secure_boot.h
+++ b/components/bootloader_support/include/esp_secure_boot.h
@@ -15,7 +15,7 @@
 
 #include <stdbool.h>
 #include <esp_err.h>
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 
 #include "sdkconfig.h"
 

diff --git a/components/bootloader_support/src/bootloader_clock.c b/components/bootloader_support/src/bootloader_clock.c
index 2ab92d2af504af7fa1573642515509852c57f4ad..fda86b20733ec79c7d616b514f18fae4dc32a826 100644 (file)
--- a/components/bootloader_support/src/bootloader_clock.c
+++ b/components/bootloader_support/src/bootloader_clock.c
@@ -16,8 +16,7 @@
 #include "soc/soc.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/efuse_periph.h"
 
 void bootloader_clock_configure()
 {

diff --git a/components/bootloader_support/src/bootloader_common.c b/components/bootloader_support/src/bootloader_common.c
index e584ea3df759dcf6bf5d29e1e7ec2a7aef9cca30..ed0169a960148a8cd4245687fca6eef89f9b02a0 100644 (file)
--- a/components/bootloader_support/src/bootloader_common.c
+++ b/components/bootloader_support/src/bootloader_common.c
@@ -17,16 +17,13 @@
 #include "sdkconfig.h"
 #include "esp_err.h"
 #include "esp_log.h"
-#include "esp32/rom/spi_flash.h"
 #include "esp32/rom/crc.h"
-#include "esp32/rom/ets_sys.h"
 #include "esp32/rom/gpio.h"
 #include "esp_secure_boot.h"
 #include "esp_flash_partitions.h"
 #include "bootloader_flash.h"
 #include "bootloader_common.h"
 #include "soc/gpio_periph.h"
-#include "soc/efuse_reg.h"
 #include "soc/rtc.h"
 #include "esp_image_format.h"
 #include "bootloader_sha.h"

diff --git a/components/bootloader_support/src/bootloader_init.c b/components/bootloader_support/src/bootloader_init.c
index 0733f6f7efd46f2827067f56238869466e0bb54b..cae9c57e5439d6e2981ac547a8754f3e43138323 100644 (file)
--- a/components/bootloader_support/src/bootloader_init.c
+++ b/components/bootloader_support/src/bootloader_init.c
@@ -33,12 +33,12 @@
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
 #include "soc/gpio_periph.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/rtc_wdt.h"
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 
 #include "sdkconfig.h"
 #include "esp_image_format.h"

diff --git a/components/bootloader_support/src/bootloader_random.c b/components/bootloader_support/src/bootloader_random.c
index eb34d6add2ea1a7f2de56fe5333c6b39f922ec8a..4ea86df52c83fa849b1315b3d1103cab576ba1f0 100644 (file)
--- a/components/bootloader_support/src/bootloader_random.c
+++ b/components/bootloader_support/src/bootloader_random.c
@@ -14,11 +14,11 @@
 #include "bootloader_random.h"
 #include "soc/cpu.h"
 #include "soc/wdev_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
-#include "soc/syscon_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
+#include "soc/syscon_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/i2s_periph.h"
 #include "esp_log.h"
 
 #ifndef BOOTLOADER_BUILD

diff --git a/components/bootloader_support/src/bootloader_utility.c b/components/bootloader_support/src/bootloader_utility.c
index d3555318109ae16073fd5cd6756c8bacce6c41d3..4500c723aa0b30ff53efcbd7888a0da9e4b9e3fa 100644 (file)
--- a/components/bootloader_support/src/bootloader_utility.c
+++ b/components/bootloader_support/src/bootloader_utility.c
@@ -33,12 +33,10 @@
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
-#include "soc/gpio_reg.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/gpio_periph.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 
 #include "sdkconfig.h"
 #include "esp_image_format.h"

diff --git a/components/bootloader_support/src/esp32/bootloader_sha.c b/components/bootloader_support/src/esp32/bootloader_sha.c
index 646a8d35a1f184745631627b40f0f33430f0743b..f42c8b66340d5c758b9b086d47e16d4a23021457 100644 (file)
--- a/components/bootloader_support/src/esp32/bootloader_sha.c
+++ b/components/bootloader_support/src/esp32/bootloader_sha.c
@@ -17,8 +17,7 @@
 #include <assert.h>
 #include <sys/param.h>
 #include "esp32/rom/sha.h"
-#include "soc/dport_reg.h"
-#include "soc/hwcrypto_reg.h"
+#include "soc/hwcrypto_periph.h"
 #include "esp32/rom/ets_sys.h" // TO REMOVE
 
 static uint32_t words_hashed;

diff --git a/components/bootloader_support/src/esp32/secure_boot.c b/components/bootloader_support/src/esp32/secure_boot.c
index 5de905e3b76c5f319cad9e8a40b3525886ea9d72..e0da118304ec6e0d9f4ca8a11a7de982fd3b413c 100644 (file)
--- a/components/bootloader_support/src/esp32/secure_boot.c
+++ b/components/bootloader_support/src/esp32/secure_boot.c
@@ -22,10 +22,8 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/secure_boot.h"
 
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
 
 #include "sdkconfig.h"
 

diff --git a/components/bootloader_support/src/flash_qio_mode.c b/components/bootloader_support/src/flash_qio_mode.c
index af8c714521bd0012b7739da3533708fe87a930b7..db486c73e382b035832e82b9063a2214bbc95b80 100644 (file)
--- a/components/bootloader_support/src/flash_qio_mode.c
+++ b/components/bootloader_support/src/flash_qio_mode.c
@@ -18,9 +18,8 @@
 #include "esp_err.h"
 #include "esp32/rom/spi_flash.h"
 #include "esp32/rom/efuse.h"
-#include "soc/spi_struct.h"
-#include "soc/spi_reg.h"
-#include "soc/efuse_reg.h"
+#include "soc/spi_periph.h"
+#include "soc/efuse_periph.h"
 #include "sdkconfig.h"
 
 /* SPI flash controller */

diff --git a/components/bt/bt.c b/components/bt/bt.c
index 96f968bc084387f907ec71bd63c9b8d9938f25ed..2c665f20acf6994ade480bc2bf61c6bd95c417b0 100644 (file)
--- a/components/bt/bt.c
+++ b/components/bt/bt.c
@@ -40,7 +40,6 @@
 #include "esp_ipc.h"
 #include "driver/periph_ctrl.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
 #include "soc/soc_memory_layout.h"
 #include "esp32/clk.h"
 #include "esp_coexist_internal.h"

diff --git a/components/driver/can.c b/components/driver/can.c
index 25b91ebaf8e43a3d7ea44073cc1afed8fcc8d7a8..6001e65f2262d4cf2190add795d976f872db9bb9 100644 (file)
--- a/components/driver/can.c
+++ b/components/driver/can.c
@@ -21,8 +21,7 @@
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
 #include "esp_pm.h"
-#include "soc/dport_reg.h"
-#include "soc/can_struct.h"
+#include "soc/can_periph.h"
 #include "driver/gpio.h"
 #include "driver/periph_ctrl.h"
 #include "driver/can.h"

diff --git a/components/driver/gpio.c b/components/driver/gpio.c
index eda39c3f3213a8c08fb648e723ea8def4d1f7f78..2cb6512c527bf527a95cb191dc9cce881433b65d 100644 (file)
--- a/components/driver/gpio.c
+++ b/components/driver/gpio.c
@@ -13,15 +13,13 @@
 // limitations under the License.
 #include <esp_types.h>
 #include "esp_err.h"
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/xtensa_api.h"
 #include "driver/gpio.h"
 #include "driver/rtc_io.h"
 #include "soc/soc.h"
-#include "esp_log.h"
 #include "soc/gpio_periph.h"
+#include "esp_log.h"
 
 static const char* GPIO_TAG = "gpio";
 #define GPIO_CHECK(a, str, ret_val) \

diff --git a/components/driver/i2c.c b/components/driver/i2c.c
index 2b3a48e63c565f8b645f4ac617207ea78fe289a9..c2f9e5ba7793d0a36676fa5e7323e762bcf912a6 100644 (file)
--- a/components/driver/i2c.c
+++ b/components/driver/i2c.c
@@ -23,9 +23,7 @@
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
 #include "freertos/ringbuf.h"
-#include "soc/dport_reg.h"
-#include "soc/i2c_struct.h"
-#include "soc/i2c_reg.h"
+#include "soc/i2c_periph.h"
 #include "driver/i2c.h"
 #include "driver/gpio.h"
 #include "driver/periph_ctrl.h"

diff --git a/components/driver/i2s.c b/components/driver/i2s.c
index 5f83c21a55c0674d3e2ccce98cc7328160ef8045..02322b341a55cc9bb486e5bf688a92de5c0500dd 100644 (file)
--- a/components/driver/i2s.c
+++ b/components/driver/i2s.c
@@ -19,12 +19,9 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 
-#include "soc/dport_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
 #include "soc/rtc.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "esp32/rom/lldesc.h"
 
 #include "driver/gpio.h"

diff --git a/components/driver/include/driver/adc.h b/components/driver/include/driver/adc.h
index b5a9a9848e3b92fcdc9c703d7e4e9d179f667eaf..91eb18fd2fe55ff30fa3a4036bae5d117bb95bba 100644 (file)
--- a/components/driver/include/driver/adc.h
+++ b/components/driver/include/driver/adc.h
@@ -23,7 +23,7 @@ extern "C" {
 #include <stdbool.h>
 #include "esp_err.h"
 #include "driver/gpio.h"
-#include "soc/adc_channel.h"
+#include "soc/adc_periph.h"
 
 typedef enum {
     ADC_ATTEN_DB_0   = 0,  /*!<The input voltage of ADC will be reduced to about 1/1 */

diff --git a/components/driver/include/driver/dac.h b/components/driver/include/driver/dac.h
index f921d98f146e9f7872f3eb68f06284a22b12cbda..1e60263c2f526e30b701f3829859e082f175c2bb 100644 (file)
--- a/components/driver/include/driver/dac.h
+++ b/components/driver/include/driver/dac.h
@@ -21,7 +21,7 @@ extern "C" {
 
 #include <stdint.h>
 #include "esp_err.h"
-#include "soc/dac_channel.h"
+#include "soc/dac_periph.h"
 
 typedef enum {
     DAC_CHANNEL_1 = 1,  /*!< DAC channel 1 is GPIO25 */

diff --git a/components/driver/include/driver/i2s.h b/components/driver/include/driver/i2s.h
index 2160bcfcdd7262abebe5ec6fac15daeda85471c0..59c11978e5daa31e5752665c29dd733f93faa126 100644 (file)
--- a/components/driver/include/driver/i2s.h
+++ b/components/driver/include/driver/i2s.h
@@ -16,12 +16,10 @@
 #define _DRIVER_I2S_H_
 #include "esp_err.h"
 #include <esp_types.h>
-#include "soc/gpio_reg.h"
 #include "soc/soc.h"
-#include "soc/i2s_struct.h"
-#include "soc/i2s_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2s_periph.h"
+#include "soc/rtc_periph.h"
 #include "esp32/rom/gpio.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"

diff --git a/components/driver/include/driver/mcpwm.h b/components/driver/include/driver/mcpwm.h
index 6e4edac458c14170cd15f5edad33d21674a18276..03483cc4ad6ff90c0ef0cbbf52bb26ace7646710 100644 (file)
--- a/components/driver/include/driver/mcpwm.h
+++ b/components/driver/include/driver/mcpwm.h
@@ -20,7 +20,6 @@
 #include "driver/gpio.h"
 #include "driver/periph_ctrl.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/components/driver/include/driver/pcnt.h b/components/driver/include/driver/pcnt.h
index ce32050e5618ff2672ccc5039ba28fc58d6fc15b..76202cf902a3ed92d51bf37c2d224b50922c0b8e 100644 (file)
--- a/components/driver/include/driver/pcnt.h
+++ b/components/driver/include/driver/pcnt.h
@@ -8,11 +8,8 @@
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "soc/soc.h"
-#include "soc/pcnt_reg.h"
-#include "soc/pcnt_struct.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/pcnt_periph.h"
 #include "driver/gpio.h"
-#include "esp_intr_alloc.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/components/driver/include/driver/periph_ctrl.h b/components/driver/include/driver/periph_ctrl.h
index 9689a8cb21c913dcd8a8fa6d1565b663a1c9097c..a659e793ffc7d4836860f85505736c8b3005803e 100644 (file)
--- a/components/driver/include/driver/periph_ctrl.h
+++ b/components/driver/include/driver/periph_ctrl.h
@@ -15,9 +15,6 @@
 #ifndef _DRIVER_PERIPH_CTRL_H_
 #define _DRIVER_PERIPH_CTRL_H_
 
-#include "esp_err.h"
-#include "soc/soc.h"
-#include "soc/dport_reg.h"
 #include "soc/periph_defs.h"
 
 #ifdef __cplusplus

diff --git a/components/driver/include/driver/rmt.h b/components/driver/include/driver/rmt.h
index 87916b3756b0fea77535d692aba69370891f4d7d..f177c82b3b1f9afaf03da4d1dd9b992868142e90 100644 (file)
--- a/components/driver/include/driver/rmt.h
+++ b/components/driver/include/driver/rmt.h
@@ -15,9 +15,7 @@
 #ifndef _DRIVER_RMT_CTRL_H_
 #define _DRIVER_RMT_CTRL_H_
 #include "esp_err.h"
-#include "soc/rmt_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/rmt_struct.h"
+#include "soc/rmt_periph.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"

diff --git a/components/driver/include/driver/rtc_io.h b/components/driver/include/driver/rtc_io.h
index 4e84ea1da270546b5ca710fbcbc29c6c869a494a..c636f61cc17a291aa99875d3eb0d49b26bc9c876 100644 (file)
--- a/components/driver/include/driver/rtc_io.h
+++ b/components/driver/include/driver/rtc_io.h
@@ -18,7 +18,6 @@
 #include <stdint.h>
 #include "esp_err.h"
 #include "driver/gpio.h"
-#include "soc/rtc_gpio_channel.h"
 #include "soc/rtc_periph.h"
 #ifdef __cplusplus
 extern "C" {

diff --git a/components/driver/include/driver/sigmadelta.h b/components/driver/include/driver/sigmadelta.h
index 76237c193d3574fabb56969a0c11784d13b6e37a..93388f0dead8180607088baa7d18a0220d4a7fa5 100644 (file)
--- a/components/driver/include/driver/sigmadelta.h
+++ b/components/driver/include/driver/sigmadelta.h
@@ -15,8 +15,7 @@
 #ifndef __DRIVER_SIGMADELTA_H__
 #define __DRIVER_SIGMADELTA_H__
 #include <esp_types.h>
-#include "soc/gpio_sd_struct.h"
-#include "soc/gpio_sd_reg.h"
+#include "soc/sigmadelta_periph.h"
 #include "driver/gpio.h"
 
 #ifdef _cplusplus

diff --git a/components/driver/include/driver/timer.h b/components/driver/include/driver/timer.h
index 48e2b98908d318f8e18ff8d80f7e999200348bf8..cbf2a5bd231bfa16c0f5ed08bc84959f29be52c2 100644 (file)
--- a/components/driver/include/driver/timer.h
+++ b/components/driver/include/driver/timer.h
@@ -17,8 +17,7 @@
 #include "esp_err.h"
 #include "esp_attr.h"
 #include "soc/soc.h"
-#include "soc/timer_group_reg.h"
-#include "soc/timer_group_struct.h"
+#include "soc/timer_periph.h"
 #include "esp_intr_alloc.h"
 
 #ifdef __cplusplus

diff --git a/components/driver/include/driver/touch_pad.h b/components/driver/include/driver/touch_pad.h
index 8d8c72040a60623214cdb3ec0c487859e4b47bdb..0c3884ded9935b4af18cc63011ee4f9329ba9049 100644 (file)
--- a/components/driver/include/driver/touch_pad.h
+++ b/components/driver/include/driver/touch_pad.h
@@ -17,10 +17,9 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "esp_intr_alloc.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "soc/touch_channel.h"
+#include "soc/touch_periph.h"
 
 typedef enum {
     TOUCH_PAD_NUM0 = 0, /*!< Touch pad channel 0 is GPIO4 */

diff --git a/components/driver/include/driver/uart.h b/components/driver/include/driver/uart.h
index e716e542458a927994c3dd069751d906bfe2a36e..4f0c8c1ca178860e5fb3fa171176caef04d0fa89 100644 (file)
--- a/components/driver/include/driver/uart.h
+++ b/components/driver/include/driver/uart.h
@@ -20,8 +20,7 @@
 extern "C" {
 #endif
 
-#include "soc/uart_reg.h"
-#include "soc/uart_struct.h"
+#include "soc/uart_periph.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
 #include "driver/periph_ctrl.h"
@@ -32,7 +31,6 @@ extern "C" {
 #include "freertos/queue.h"
 #include "freertos/ringbuf.h"
 #include <esp_types.h>
-#include "soc/uart_channel.h"
 
 #define UART_FIFO_LEN           (128)        /*!< Length of the hardware FIFO buffers */
 #define UART_INTR_MASK          0x1ff        /*!< Mask of all UART interrupts */

diff --git a/components/driver/ledc.c b/components/driver/ledc.c
index 996e1dbbd4b224eda60da1dfbb675474eb6e1e48..92a055cbc0c80c932a1e0657ee6b21d0f06bd447 100644 (file)
--- a/components/driver/ledc.c
+++ b/components/driver/ledc.c
@@ -13,15 +13,12 @@
 // limitations under the License.
 #include <esp_types.h>
 #include <string.h>
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/gpio_periph.h"
 #include "driver/ledc.h"
-#include "soc/ledc_reg.h"
-#include "soc/ledc_struct.h"
+#include "soc/ledc_periph.h"
 #include "esp_log.h"
 
 static const char* LEDC_TAG = "ledc";

diff --git a/components/driver/mcpwm.c b/components/driver/mcpwm.c
index 761176ecfb3759c2ddfdad4c93830395bb10fc7c..714855ea5aecac7930f78d5d1a8aad491bfac789 100644 (file)
--- a/components/driver/mcpwm.c
+++ b/components/driver/mcpwm.c
@@ -15,16 +15,12 @@
 #include <stdio.h>
 #include "esp_log.h"
 #include "esp_err.h"
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
-#include "soc/io_mux_reg.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/mcpwm_periph.h"
+#include "soc/gpio_periph.h"
 #include "driver/mcpwm.h"
 #include "driver/periph_ctrl.h"
 

diff --git a/components/driver/pcnt.c b/components/driver/pcnt.c
index b91cb5965bec755f885ba6e1857b5786c3ecf915..249a7f82881d9234f0e67b0373c34d13d77848c9 100644 (file)
--- a/components/driver/pcnt.c
+++ b/components/driver/pcnt.c
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "esp_log.h"
-#include "esp_intr_alloc.h"
 #include "driver/pcnt.h"
 #include "driver/periph_ctrl.h"
 

diff --git a/components/driver/periph_ctrl.c b/components/driver/periph_ctrl.c
index 522c8d587f3d7ee6171f53d0f26f59dd556c8f46..65ece09e188b51a821ea6b30d8dbfa1f352f7bf7 100644 (file)
--- a/components/driver/periph_ctrl.c
+++ b/components/driver/periph_ctrl.c
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include <esp_types.h>
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"

diff --git a/components/driver/rmt.c b/components/driver/rmt.c
index af345a49426c7a8e255e5ceaced29fcad52abd3e..10605d2e24ec084ad0975b4a599d5e51015e46c4 100644 (file)
--- a/components/driver/rmt.c
+++ b/components/driver/rmt.c
@@ -21,9 +21,7 @@
 #include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
-#include "esp_intr_alloc.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/rmt_struct.h"
+#include "soc/gpio_periph.h"
 #include "driver/periph_ctrl.h"
 #include "driver/rmt.h"
 #include "soc/soc_memory_layout.h"

diff --git a/components/driver/rtc_module.c b/components/driver/rtc_module.c
index 296c183c77b8634b542322f2e6b7d25a0ff00dc2..eae2871993f436f470d3a4cc55d780c7060423c6 100644 (file)
--- a/components/driver/rtc_module.c
+++ b/components/driver/rtc_module.c
@@ -17,14 +17,9 @@
 #include <ctype.h>
 #include "esp32/rom/ets_sys.h"
 #include "esp_log.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/rtc_io_struct.h"
-#include "soc/sens_reg.h"
-#include "soc/sens_struct.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_cntl_struct.h"
-#include "soc/syscon_reg.h"
-#include "soc/syscon_struct.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
+#include "soc/syscon_periph.h"
 #include "soc/rtc.h"
 #include "rtc_io.h"
 #include "touch_pad.h"

diff --git a/components/driver/sdio_slave.c b/components/driver/sdio_slave.c
index 1e5814a17e1105019080fcff162d568a71b62170..1bd805c8e40dd5a428facdd5c3d49c1df0de7441 100644 (file)
--- a/components/driver/sdio_slave.c
+++ b/components/driver/sdio_slave.c
@@ -91,10 +91,8 @@ The driver of FIFOs works as below:
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
-#include "soc/dport_access.h"
-#include "soc/dport_reg.h"
 #include "soc/soc_memory_layout.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
 #include "freertos/semphr.h"
 #include "xtensa/core-macros.h"
 #include "driver/periph_ctrl.h"

diff --git a/components/driver/sdmmc_host.c b/components/driver/sdmmc_host.c
index ff3431fd832d6a26e3410fd2f94943bc4a0ce97a..7a8969fd21e3a34cd5a4cd00825b8c0bb53ffada 100644 (file)
--- a/components/driver/sdmmc_host.c
+++ b/components/driver/sdmmc_host.c
@@ -17,7 +17,7 @@
 #include <sys/param.h>
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
 #include "esp32/rom/gpio.h"
 #include "driver/gpio.h"
 #include "driver/sdmmc_host.h"

diff --git a/components/driver/sdspi_transaction.c b/components/driver/sdspi_transaction.c
index 3e74a68b818db713732568440c22f8ead7b82730..f8dec0a2eeefc27c2dded47f97d767097842e9c1 100644 (file)
--- a/components/driver/sdspi_transaction.c
+++ b/components/driver/sdspi_transaction.c
@@ -16,8 +16,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "sys/lock.h"
-#include "soc/sdmmc_reg.h"
-#include "soc/sdmmc_periph.h"
 #include "driver/sdmmc_types.h"
 #include "driver/sdmmc_defs.h"
 #include "driver/sdmmc_host.h"

diff --git a/components/driver/sigmadelta.c b/components/driver/sigmadelta.c
index d68071bf7469e8034fcfc466e4755b63268f189e..bc29813150d2662b2d3cc47002d09d9d339a24de 100644 (file)
--- a/components/driver/sigmadelta.c
+++ b/components/driver/sigmadelta.c
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "esp_log.h"
-#include "soc/soc.h"
-#include "driver/periph_ctrl.h"
 #include "driver/sigmadelta.h"
 
 static const char* SIGMADELTA_TAG = "SIGMADELTA";

diff --git a/components/driver/spi_common.c b/components/driver/spi_common.c
index de786a61ba875aeef80b971508cf7d20801fa1e1..6677ef65628a6c04eb075370b0ce50ed51e241e8 100644 (file)
--- a/components/driver/spi_common.c
+++ b/components/driver/spi_common.c
@@ -15,13 +15,10 @@
 
 #include <string.h>
 #include "driver/spi_master.h"
-#include "soc/dport_reg.h"
 #include "soc/spi_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_types.h"
 #include "esp_attr.h"
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "soc/soc.h"

diff --git a/components/driver/spi_master.c b/components/driver/spi_master.c
index 94d875f90e9f87e359441a321753861f9239f9cf..90382fd01a350633d6609ebf5d91728aa52c6d3a 100644 (file)
--- a/components/driver/spi_master.c
+++ b/components/driver/spi_master.c
@@ -121,13 +121,11 @@ We have two bits to control the interrupt:
 #include <string.h>
 #include "driver/spi_common.h"
 #include "driver/spi_master.h"
-#include "soc/dport_reg.h"
 #include "soc/spi_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_types.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp_pm.h"
@@ -135,12 +133,9 @@ We have two bits to control the interrupt:
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
-#include "soc/soc.h"
 #include "soc/soc_memory_layout.h"
-#include "soc/dport_reg.h"
 #include "esp32/rom/lldesc.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
 #include "esp_heap_caps.h"
 #include "stdatomic.h"
 #include "sdkconfig.h"

diff --git a/components/driver/spi_slave.c b/components/driver/spi_slave.c
index b4a15c158ef52ec789b7c4ad4866593c8b5ee2a4..f9f792a2807d8baebdb8411abf697716db5a0ae3 100644 (file)
--- a/components/driver/spi_slave.c
+++ b/components/driver/spi_slave.c
@@ -18,13 +18,11 @@
 #include <soc/lldesc.h>
 #include "driver/spi_common.h"
 #include "driver/spi_slave.h"
-#include "soc/dport_reg.h"
 #include "soc/spi_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_types.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp_pm.h"
@@ -32,12 +30,9 @@
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
-#include "soc/soc.h"
 #include "soc/soc_memory_layout.h"
-#include "soc/dport_reg.h"
 #include "esp32/rom/lldesc.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
 #include "esp_heap_caps.h"
 
 static const char *SPI_TAG = "spi_slave";

diff --git a/components/driver/test/test_i2c.c b/components/driver/test/test_i2c.c
index 48aea2a4b7e58d6571ed1172208e1e102a1b2710..e445c8b34057305c840b85633149bd78a25cb5b1 100644 (file)
--- a/components/driver/test/test_i2c.c
+++ b/components/driver/test/test_i2c.c
@@ -11,9 +11,8 @@
 #include "driver/i2c.h"
 #include "esp_attr.h"
 #include "esp_log.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/i2c_struct.h"
-#include "soc/i2c_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2c_periph.h"
 #include "esp_system.h"
 #include "driver/pcnt.h"
 

diff --git a/components/driver/test/test_ledc.c b/components/driver/test/test_ledc.c
index 93632d8e57c0b7828101f91d4bbbb83a2da8d2c0..d0e35851d8251350ca2c6c677292030d16b929b9 100644 (file)
--- a/components/driver/test/test_ledc.c
+++ b/components/driver/test/test_ledc.c
@@ -20,8 +20,7 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/ledc_reg.h"
-#include "soc/ledc_struct.h"
+#include "soc/ledc_periph.h"
 #include "esp_system.h"
 #include "driver/pcnt.h"
 #include "driver/ledc.h"

diff --git a/components/driver/test/test_pcnt.c b/components/driver/test/test_pcnt.c
index 35917363ea9440b65023d2d22fee0b29bb935b53..ae5656a846988a0ad9371ab1f0f2b62a7e5a23f1 100644 (file)
--- a/components/driver/test/test_pcnt.c
+++ b/components/driver/test/test_pcnt.c
@@ -20,7 +20,7 @@
 #include "driver/ledc.h"
 #include "esp_attr.h"
 #include "esp_log.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/gpio_periph.h"
 #include "unity.h"
 #include "esp32/rom/ets_sys.h"
 

diff --git a/components/driver/test/test_pwm.c b/components/driver/test/test_pwm.c
index d6458488054b5834ce6106507d106b191cbbd233..b787f8e3abb4c644fe3ce7da74d1d2b61d41651d 100644 (file)
--- a/components/driver/test/test_pwm.c
+++ b/components/driver/test/test_pwm.c
@@ -20,8 +20,7 @@
 #include "test_utils.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 #include "freertos/queue.h"
 #include "esp_attr.h"
 #include "esp_log.h"

diff --git a/components/driver/test/test_rmt.c b/components/driver/test/test_rmt.c
index 57c2247afc543e28d9b7fe7114eda75127534a21..7b186b2c5b6165d90c0206d1a8d5a1002265492a 100644 (file)
--- a/components/driver/test/test_rmt.c
+++ b/components/driver/test/test_rmt.c
@@ -13,7 +13,7 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "driver/periph_ctrl.h"
-#include "soc/rmt_reg.h"
+#include "soc/rmt_periph.h"
 
 static const char* TAG = "RMT";
 

diff --git a/components/driver/test/test_spi_master.c b/components/driver/test/test_spi_master.c
index 82b9fcc9e577f17e6bb270b333d9b70aa5467183..22b1961cc03cd0d07d06e7bf7e868c52c5fb283e 100644 (file)
--- a/components/driver/test/test_spi_master.c
+++ b/components/driver/test/test_spi_master.c
@@ -16,7 +16,6 @@
 #include "unity.h"
 #include "driver/spi_master.h"
 #include "driver/spi_slave.h"
-#include "soc/dport_reg.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 #include "soc/spi_periph.h"

diff --git a/components/driver/test/test_spi_sio.c b/components/driver/test/test_spi_sio.c
index df9cff1105458fea1faf7353de3f410729d3f24b..37d4065df1dc66d9f2adeaf219fcdec8278d2b4f 100644 (file)
--- a/components/driver/test/test_spi_sio.c
+++ b/components/driver/test/test_spi_sio.c
@@ -16,7 +16,6 @@
 #include "unity.h"
 #include "driver/spi_master.h"
 #include "driver/spi_slave.h"
-#include "soc/dport_reg.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 #include "soc/spi_periph.h"

diff --git a/components/driver/timer.c b/components/driver/timer.c
index 8b1532fbd0c0f4d685ca88f352ccc1450f37a4e3..6a82d87fa9d83e5d492ffc7f83a7e4028f3df6d0 100644 (file)
--- a/components/driver/timer.c
+++ b/components/driver/timer.c
@@ -15,7 +15,6 @@
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/xtensa_api.h"
 #include "driver/timer.h"

diff --git a/components/driver/uart.c b/components/driver/uart.c
index 411279e22331a38d245abf6eea8bbfe639084ff4..fffd727e7238b9a5440c609890346d3b22c344d7 100644 (file)
--- a/components/driver/uart.c
+++ b/components/driver/uart.c
@@ -15,7 +15,6 @@
 #include "esp_types.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp32/clk.h"
@@ -25,8 +24,7 @@
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
 #include "freertos/ringbuf.h"
-#include "soc/dport_reg.h"
-#include "soc/uart_struct.h"
+#include "soc/uart_periph.h"
 #include "driver/uart.h"
 #include "driver/gpio.h"
 #include "driver/uart_select.h"

diff --git a/components/efuse/src/esp_efuse_api.c b/components/efuse/src/esp_efuse_api.c
index d697a0d4c013439fb481398fdebf362e4ada460c..57a71970a396e6c33c3943cfb6cfec385e5d94d2 100644 (file)
--- a/components/efuse/src/esp_efuse_api.c
+++ b/components/efuse/src/esp_efuse_api.c
@@ -14,7 +14,7 @@
 
 #include "esp_efuse.h"
 #include "esp_efuse_utility.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "assert.h"
 #include "sdkconfig.h"
 #include "esp_efuse_table.h"

diff --git a/components/efuse/src/esp_efuse_fields.c b/components/efuse/src/esp_efuse_fields.c
index f9cb97799895eb81df82e08b4c0f69dca5d2192f..a456d7a94422bc4447662bb55b4b9183566d5036 100644 (file)
--- a/components/efuse/src/esp_efuse_fields.c
+++ b/components/efuse/src/esp_efuse_fields.c
@@ -21,7 +21,7 @@
 #include "assert.h"
 #include "esp_err.h"
 #include "esp_log.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "bootloader_random.h"
 
 const static char *TAG = "efuse";

diff --git a/components/efuse/src/esp_efuse_utility.c b/components/efuse/src/esp_efuse_utility.c
index a9401f163a652da500caa6cdedc5fcfb836d0bad..03ea2608401fc537a018548a2004af3c2879ff63 100644 (file)
--- a/components/efuse/src/esp_efuse_utility.c
+++ b/components/efuse/src/esp_efuse_utility.c
@@ -14,7 +14,7 @@
 
 #include "esp_efuse_utility.h"
 
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "esp_log.h"
 #include "assert.h"
 #include "sdkconfig.h"

diff --git a/components/efuse/test/test_efuse_coding_scheme.c b/components/efuse/test/test_efuse_coding_scheme.c
index 242702d9fd46f34ef5d8136c91f2ed6b5e42c7ea..cccacb5d6e589f3fa6756a0002285ab42a4db1a9 100644 (file)
--- a/components/efuse/test/test_efuse_coding_scheme.c
+++ b/components/efuse/test/test_efuse_coding_scheme.c
@@ -2,7 +2,7 @@
 #include <strings.h>
 #include "esp_efuse.h"
 #include "../src/esp_efuse_utility.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "unity.h"
 #include "bootloader_random.h"
 

diff --git a/components/esp32/brownout.c b/components/esp32/brownout.c
index 1e81768ef34a8b88a73f92b0bbea497fa0cbafaf..35589330fb1ef4fc044e6026d3d88d3304840ce8 100644 (file)
--- a/components/esp32/brownout.c
+++ b/components/esp32/brownout.c
@@ -19,7 +19,7 @@
 #include "sdkconfig.h"
 #include "soc/soc.h"
 #include "soc/cpu.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_private/system_internal.h"
 #include "driver/rtc_cntl.h"

diff --git a/components/esp32/cache_err_int.c b/components/esp32/cache_err_int.c
index fd17edf65d874cad00fba5300c813fb95d6fce28..079812023e28d066e08ce50586ad870c9e103e98 100644 (file)
--- a/components/esp32/cache_err_int.c
+++ b/components/esp32/cache_err_int.c
@@ -29,7 +29,6 @@
 #include "esp_attr.h"
 #include "soc/dport_reg.h"
 #include "sdkconfig.h"
-#include "esp32/dport_access.h"
 
 void esp_cache_err_int_init()
 {

diff --git a/components/esp32/clk.c b/components/esp32/clk.c
index 02a8caa1758ffdd5a3d2174ebef30e3bab9b0534..6aa2bffa70de9674f66b6845c4607bcce7fc8c03 100644 (file)
--- a/components/esp32/clk.c
+++ b/components/esp32/clk.c
@@ -25,10 +25,11 @@
 #include "esp32/rom/uart.h"
 #include "esp32/rom/rtc.h"
 #include "soc/soc.h"
+#include "soc/dport_reg.h"
 #include "soc/rtc.h"
 #include "soc/rtc_wdt.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/i2s_periph.h"
 #include "driver/periph_ctrl.h"
 #include "xtensa/core-macros.h"
 #include "bootloader_clock.h"

diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c
index f4bac3bb2b428d181317d30b13e1eca34091b2d2..e8e1100993df4729cbc946aeb895220ca730bbd7 100644 (file)
--- a/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@ -26,11 +26,10 @@
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/rtc_wdt.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 
 #include "driver/rtc_io.h"
 
@@ -48,7 +47,6 @@
 #include "esp_event.h"
 #include "esp_spi_flash.h"
 #include "esp_ipc.h"
-#include "esp32/dport_access.h"
 #include "esp_private/crosscore_int.h"
 #include "esp_log.h"
 #include "esp_vfs_dev.h"

diff --git a/components/esp32/crosscore_int.c b/components/esp32/crosscore_int.c
index 986deb2845c006b19328bc266a9ea14bcac9294f..746060e446558b11f3c1aa712d7e612415f3be58 100644 (file)
--- a/components/esp32/crosscore_int.c
+++ b/components/esp32/crosscore_int.c
@@ -17,15 +17,14 @@
 #include "esp_attr.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/uart.h"
 
 #include "soc/cpu.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/rtc_periph.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"

diff --git a/components/esp32/dport_access.c b/components/esp32/dport_access.c
index 1f1a4dda1837a491b509623c911c6e062e1e84e6..de828eb06113358b6a9ca255028043ede294143b 100644 (file)
--- a/components/esp32/dport_access.c
+++ b/components/esp32/dport_access.c
@@ -31,7 +31,7 @@
 
 #include "soc/cpu.h"
 #include "soc/dport_reg.h"
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"

diff --git a/components/esp32/gdbstub.c b/components/esp32/gdbstub.c
index 5c33045f11d936279e4d06a667490a779420b848..08623dce4c532544b77135423ecd04beeaf3fc5d 100644 (file)
--- a/components/esp32/gdbstub.c
+++ b/components/esp32/gdbstub.c
@@ -20,8 +20,8 @@
 
 #include <string.h>
 #include "esp32/rom/ets_sys.h"
-#include "soc/uart_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/uart_periph.h"
+#include "soc/gpio_periph.h"
 #include "esp_private/gdbstub.h"
 #include "esp_debug_helpers.h"
 #include "driver/gpio.h"

diff --git a/components/esp32/int_wdt.c b/components/esp32/int_wdt.c
index b384dcebacd8dd35b5f3e36ce76fddda6667a5ca..f42b9877399764358eb0ac05d82078eae009598d 100644 (file)
--- a/components/esp32/int_wdt.c
+++ b/components/esp32/int_wdt.c
@@ -26,8 +26,7 @@
 #include "esp_intr_alloc.h"
 #include "esp_attr.h"
 #include "esp_freertos_hooks.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "driver/timer.h"
 #include "driver/periph_ctrl.h"
 #include "esp_int_wdt.h"

diff --git a/components/esp32/intr_alloc.c b/components/esp32/intr_alloc.c
index 856cebb55ffed498f9d93047921b62615fd8349b..b74c4f9293e75b70c69292159ceaa9d6a274d65b 100644 (file)
--- a/components/esp32/intr_alloc.c
+++ b/components/esp32/intr_alloc.c
@@ -28,7 +28,6 @@
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
 #include "esp_attr.h"
-#include "esp_intr_alloc.h"
 #include "esp_ipc.h"
 #include <limits.h>
 #include <assert.h>

diff --git a/components/esp32/panic.c b/components/esp32/panic.c
index f27d45720984c68ed7f93a1edf2e520ad590904d..b66ba9437a71c26c4aa8df5751d603dfe974e57a 100644 (file)
--- a/components/esp32/panic.c
+++ b/components/esp32/panic.c
@@ -22,12 +22,11 @@
 #include "freertos/task.h"
 #include "freertos/xtensa_api.h"
 
-#include "soc/uart_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/uart_periph.h"
+#include "soc/gpio_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/rtc_wdt.h"

diff --git a/components/esp32/pm_trace.c b/components/esp32/pm_trace.c
index b4cebf85fe6e3d5771cea6229f49505c319d4cf3..02a636211beb4f227536f8e3c2e5690bf272c015 100644 (file)
--- a/components/esp32/pm_trace.c
+++ b/components/esp32/pm_trace.c
@@ -15,7 +15,6 @@
 
 #include "esp_private/pm_trace.h"
 #include "driver/gpio.h"
-#include "soc/gpio_reg.h"
 
 /* GPIOs to use for tracing of esp_pm events.
  * Two entries in the array for each type, one for each CPU.

diff --git a/components/esp32/reset_reason.c b/components/esp32/reset_reason.c
index f9cc0062f72e873118e7e4f7e4267a4a93815472..0b291b12ccfa5033501f7074e98529c7f0fb3aa1 100644 (file)
--- a/components/esp32/reset_reason.c
+++ b/components/esp32/reset_reason.c
@@ -15,7 +15,7 @@
 #include "esp_system.h"
 #include "esp32/rom/rtc.h"
 #include "esp_private/system_internal.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 
 static void esp_reset_reason_clear_hint();
 

diff --git a/components/esp32/sleep_modes.c b/components/esp32/sleep_modes.c
index 25d5c8594b29988b3a81ca04be70a7e45f280b73..04179d379116a8eb412445339a009b5d0170cd2b 100644 (file)
--- a/components/esp32/sleep_modes.c
+++ b/components/esp32/sleep_modes.c
@@ -27,10 +27,7 @@
 #include "esp32/rom/uart.h"
 #include "soc/cpu.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/spi_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/spi_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc_wdt.h"
 #include "soc/soc_memory_layout.h"

diff --git a/components/esp32/spiram_psram.c b/components/esp32/spiram_psram.c
index f7d88c85929bf06ad1c64f633e205d830b0e1fab..56fa95632e021f5819ca33897210e213ba929d41 100644 (file)
--- a/components/esp32/spiram_psram.c
+++ b/components/esp32/spiram_psram.c
@@ -29,10 +29,8 @@
 #include "esp32/rom/gpio.h"
 #include "esp32/rom/cache.h"
 #include "esp32/rom/efuse.h"
-#include "soc/io_mux_reg.h"
 #include "soc/dport_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "driver/gpio.h"
 #include "driver/spi_common.h"
 #include "driver/periph_ctrl.h"

diff --git a/components/esp32/spiram_psram.h b/components/esp32/spiram_psram.h
index 34c6e9f380278881abbfef72f669f7d63caa9fb1..5a5f147bf5cfbb6e34330ad4b2dcf2db482ed1ad 100644 (file)
--- a/components/esp32/spiram_psram.h
+++ b/components/esp32/spiram_psram.h
@@ -15,7 +15,7 @@
 
 #ifndef _PSRAM_H
 #define _PSRAM_H
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 #include "esp_err.h"
 #include "sdkconfig.h"
 

diff --git a/components/esp32/system_api.c b/components/esp32/system_api.c
index ce52e96fe279b1b95d4041a070e802c91c88afb5..bd81a82db798c4de3f23d81b2a1215ee71634ff3 100644 (file)
--- a/components/esp32/system_api.c
+++ b/components/esp32/system_api.c
@@ -24,11 +24,10 @@
 #include "esp32/rom/cache.h"
 #include "esp32/rom/uart.h"
 #include "soc/dport_reg.h"
-#include "soc/gpio_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
-#include "soc/timer_group_struct.h"
+#include "soc/gpio_periph.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/rtc_wdt.h"

diff --git a/components/esp32/task_wdt.c b/components/esp32/task_wdt.c
index d7edf732aad94c1cee816eab29128c3560ac0c25..86610be94a7fbc7343dc873eedc2c02b585ca698 100644 (file)
--- a/components/esp32/task_wdt.c
+++ b/components/esp32/task_wdt.c
@@ -26,11 +26,9 @@
 #include <esp_types.h>
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_attr.h"
 #include "esp_freertos_hooks.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "esp_log.h"
 #include "driver/timer.h"
 #include "driver/periph_ctrl.h"

diff --git a/components/esp32/test/test_aes_sha_rsa.c b/components/esp32/test/test_aes_sha_rsa.c
index 93210b8779f5bd2afd7d06569260bb0d5994067f..8453b68f57fc542590242f20129385b978ced13b 100644 (file)
--- a/components/esp32/test/test_aes_sha_rsa.c
+++ b/components/esp32/test/test_aes_sha_rsa.c
@@ -13,7 +13,7 @@
 #include "test_utils.h"
 #include "esp32/rom/uart.h"
 #include "esp32/rom/sha.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc.h"
 #include "esp_log.h"

diff --git a/components/esp32/test/test_ahb_arb.c b/components/esp32/test/test_ahb_arb.c
index c6bf622fba00dcdda4adc788bf74ee0b09657a88..185bbb3ddb7703e3c4c86c5adad10f315b160a09 100644 (file)
--- a/components/esp32/test/test_ahb_arb.c
+++ b/components/esp32/test/test_ahb_arb.c
@@ -14,12 +14,10 @@
 
 #include "unity.h"
 
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/gpio_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2s_periph.h"
 
 
 

diff --git a/components/esp32/test/test_dport.c b/components/esp32/test/test_dport.c
index 212c5d82bd9d9bc9405839d131dc3b4ab197cf3c..ac8498631a5c1df711b8b1177ab31e883a82cb88 100644 (file)
--- a/components/esp32/test/test_dport.c
+++ b/components/esp32/test/test_dport.c
@@ -11,7 +11,7 @@
 #include "unity.h"
 #include "test_utils.h"
 #include "esp32/rom/uart.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc.h"
 

diff --git a/components/esp32/test/test_fastbus.c b/components/esp32/test/test_fastbus.c
index 5a1ace8e11ccc849c3cf39ec2608ce769c5392b0..626e925956af1a9069758f584e56e1bf700459d3 100644 (file)
--- a/components/esp32/test/test_fastbus.c
+++ b/components/esp32/test/test_fastbus.c
@@ -9,9 +9,8 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "driver/gpio.h"
 
 

diff --git a/components/esp32/test/test_intr_alloc.c b/components/esp32/test/test_intr_alloc.c
index 4439f9bcae8f01735e1fc9fb1cfcef88d246c4d3..8255388e986d1a099297a842a3e6e2cfe714a0d9 100644 (file)
--- a/components/esp32/test/test_intr_alloc.c
+++ b/components/esp32/test/test_intr_alloc.c
@@ -12,9 +12,9 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
 #include "esp_intr_alloc.h"
 #include "driver/periph_ctrl.h"
 #include "driver/timer.h"
@@ -334,4 +334,4 @@ TEST_CASE("alloc and free isr handle on different core", "[esp32]")
     isr_alloc_free_test();
 }
 
-#endif
\ No newline at end of file
+#endif

diff --git a/components/esp32/test/test_pm.c b/components/esp32/test/test_pm.c
index ba3850daa6d0c3c88f805a132f889e74790749bf..cf031ab59c12e3bd7cafab245416cf50a360381b 100644 (file)
--- a/components/esp32/test/test_pm.c
+++ b/components/esp32/test/test_pm.c
@@ -13,9 +13,7 @@
 #include "driver/timer.h"
 #include "driver/rtc_io.h"
 #include "esp32/ulp.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_gpio_channel.h"
+#include "soc/rtc_periph.h"
 
 TEST_CASE("Can dump power management lock stats", "[pm]")
 {

diff --git a/components/esp32/test/test_reset_reason.c b/components/esp32/test/test_reset_reason.c
index 07b1b29f1037a0f8e8a65a9618a02eaa7853dc1e..9d57a7f4c024a46a1d6b8d7ebbe539b93fe97898 100644 (file)
--- a/components/esp32/test/test_reset_reason.c
+++ b/components/esp32/test/test_reset_reason.c
@@ -2,7 +2,7 @@
 #include "esp_system.h"
 #include "esp_task_wdt.h"
 #include "esp_attr.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "driver/timer.h"
 #include "esp32/rom/rtc.h"
 #include "esp_sleep.h"

diff --git a/components/esp32/test/test_sleep.c b/components/esp32/test/test_sleep.c
index fbda5f6da15ec213828e9009056dafe76c5c758b..8712bdfd061780f82ffa5cdf7d4c0d35f904d77c 100644 (file)
--- a/components/esp32/test/test_sleep.c
+++ b/components/esp32/test/test_sleep.c
@@ -4,15 +4,14 @@
 #include "esp_sleep.h"
 #include "esp32/clk.h"
 #include "driver/rtc_io.h"
-#include "soc/gpio_reg.h"
-#include "soc/rtc.h"
-#include "soc/uart_reg.h"
 #include "esp32/rom/uart.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
+#include "soc/gpio_periph.h"
+#include "soc/uart_periph.h"
 #include "soc/rtc.h"            // for wakeup trigger defines
-#include "soc/rtc_cntl_reg.h"   // for read rtc registers directly (cause)
+#include "soc/rtc_periph.h"     // for read rtc registers directly (cause)
 #include "soc/soc.h"            // for direct register read macros
 #include "esp32/rom/rtc.h"
 #include "esp_newlib.h"

diff --git a/components/esp32/test/test_spiram_cache_flush.c b/components/esp32/test/test_spiram_cache_flush.c
index 92116c3fd0d9f97e543446a117f88c1c6f9f3b8b..6e984be6ce866dc07d2825ce9c6e1761e70d5971 100644 (file)
--- a/components/esp32/test/test_spiram_cache_flush.c
+++ b/components/esp32/test/test_spiram_cache_flush.c
@@ -11,8 +11,6 @@ This code tests the interaction between PSRAM and SPI flash routines.
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/components/esp32/test/test_tsens.c b/components/esp32/test/test_tsens.c
index bff507848bfd19ecff054fd72b36baace9207b4d..1e311c6bc16e33da557fe65f7a8de63ecd69b91b 100644 (file)
--- a/components/esp32/test/test_tsens.c
+++ b/components/esp32/test/test_tsens.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include "unity.h"
 #include "esp32/rom/ets_sys.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
 
 TEST_CASE("can control TSENS using registers", "[rtc][ignore]")
 {

diff --git a/components/esp32/test/test_unal_dma.c b/components/esp32/test/test_unal_dma.c
index 7e67a89f5d14a02484bbe0b736a8c1145f997f47..91c22c6c4f4f58ad415b61d25d749275be17ba4a 100644 (file)
--- a/components/esp32/test/test_unal_dma.c
+++ b/components/esp32/test/test_unal_dma.c
@@ -14,12 +14,9 @@
 #include "freertos/xtensa_api.h"
 #include "unity.h"
 
-#include "soc/uart_reg.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/gpio_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2s_periph.h"
 
 
 #define DPORT_I2S0_CLK_EN   (BIT(4))

diff --git a/components/esp_adc_cal/esp_adc_cal.c b/components/esp_adc_cal/esp_adc_cal.c
index 66cae9fed23e85ad94142f2898e07cded8db7453..f71c086376237330ce3c9a3fced645aa9f0c20a0 100644 (file)
--- a/components/esp_adc_cal/esp_adc_cal.c
+++ b/components/esp_adc_cal/esp_adc_cal.c
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include "esp_types.h"
 #include "driver/adc.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "esp_err.h"
 #include "assert.h"
 #include "esp_adc_cal.h"

diff --git a/components/esp_event/test/test_event.c b/components/esp_event/test/test_event.c
index c5dcc868da5b70e4ad89ff0d41ce64a0f469f41c..d6d9beab751bb30ff4a1531368bafa4606b2acf6 100644 (file)
--- a/components/esp_event/test/test_event.c
+++ b/components/esp_event/test/test_event.c
@@ -9,7 +9,6 @@
 #include "freertos/task.h"
 #include "freertos/portmacro.h"
 #include "esp_log.h"
-#include "soc/timer_group_struct.h"
 #include "driver/periph_ctrl.h"
 #include "driver/timer.h"
 

diff --git a/components/esp_rom/include/esp32/rom/uart.h b/components/esp_rom/include/esp32/rom/uart.h
index a010bfbca471c2b640d50d5dcbc05ebd2d838ba7..49d0e8cf71bf38fbf62705fde089ae90c2930f64 100644 (file)
--- a/components/esp_rom/include/esp32/rom/uart.h
+++ b/components/esp_rom/include/esp32/rom/uart.h
@@ -19,7 +19,7 @@
 #include "esp_attr.h"
 #include "ets_sys.h"
 #include "soc/soc.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/components/esp_wifi/src/phy_init.c b/components/esp_wifi/src/phy_init.c
index 8bc8eba228f25cdac6f15fa2492560906e8877f9..b36b5754f3302a011c6cd256d8ad89a9257024c4 100644 (file)
--- a/components/esp_wifi/src/phy_init.c
+++ b/components/esp_wifi/src/phy_init.c
@@ -22,7 +22,6 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/rtc.h"
 #include "soc/rtc.h"
-#include "soc/dport_reg.h"
 
 #include "esp_err.h"
 #include "esp_phy_init.h"

diff --git a/components/espcoredump/src/core_dump_uart.c b/components/espcoredump/src/core_dump_uart.c
index dfc62d9a8800d2c3e0db6a62581fdeccfebc1e63..d3afbe5d054f551bc331237f69b833c1d1faa57a 100644 (file)
--- a/components/espcoredump/src/core_dump_uart.c
+++ b/components/espcoredump/src/core_dump_uart.c
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include <string.h>
-#include "soc/uart_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/uart_periph.h"
+#include "soc/gpio_periph.h"
 #include "driver/gpio.h"
 #include "esp32/clk.h"
 #include "esp_core_dump_priv.h"

diff --git a/components/ethernet/emac_dev.c b/components/ethernet/emac_dev.c
index 9a56dcd3f2c743fa90e30acc2f0e199e97926119..51b6f918d724c5cdc32886c2f93a2c62886144e1 100644 (file)
--- a/components/ethernet/emac_dev.c
+++ b/components/ethernet/emac_dev.c
@@ -19,12 +19,8 @@
 #include "esp32/rom/gpio.h"
 
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/gpio_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/emac_reg_v2.h"
-#include "soc/emac_ex_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/gpio_periph.h"
 
 #include "esp_log.h"
 #include "driver/gpio.h"

diff --git a/components/ethernet/emac_dev.h b/components/ethernet/emac_dev.h
index 3d686cf883f46219829c70fa9efb9decc1c2619d..1c44f43660f0b8469b0794589616acdf4638cd70 100644 (file)
--- a/components/ethernet/emac_dev.h
+++ b/components/ethernet/emac_dev.h
@@ -20,7 +20,7 @@ extern "C" {
 #endif
 
 #include "esp_types.h"
-#include "soc/emac_reg_v2.h"
+#include "soc/emac_periph.h"
 
 #define EMAC_INTR_ENABLE_BIT (EMAC_DMAIN_TIE | EMAC_DMAIN_RIE | EMAC_DMAIN_RBUE | EMAC_DMAIN_NISE)
 

diff --git a/components/ethernet/emac_main.c b/components/ethernet/emac_main.c
index 7b087772d0c465bc6b203c02774a66213f47f6df..89046e88994fcc5cee4552d0bff1d8b497f89406 100644 (file)
--- a/components/ethernet/emac_main.c
+++ b/components/ethernet/emac_main.c
@@ -19,13 +19,10 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/gpio.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/gpio_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/gpio_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/emac_ex_reg.h"
-#include "soc/emac_reg_v2.h"
 #include "soc/soc.h"
 
 #include "tcpip_adapter.h"

diff --git a/components/freemodbus/port/portserial.c b/components/freemodbus/port/portserial.c
index 43bc887e465f1046c433950250f3e1a0a121bf8a..54bbe8318b3663ee58d6c5a37411be9dc763345b 100644 (file)
--- a/components/freemodbus/port/portserial.c
+++ b/components/freemodbus/port/portserial.c
@@ -44,7 +44,7 @@
 #include "port.h"
 #include "driver/uart.h"
 #include "freertos/queue.h" // for queue support
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "driver/gpio.h"
 #include "esp_log.h"        // for esp_log
 #include "esp_err.h"        // for ESP_ERROR_CHECK macro

diff --git a/components/freertos/test/test_freertos.c b/components/freertos/test/test_freertos.c
index b760ba22906f119467e59d4cac90f46910e5f93e..5925b648705dbd2900b75bbb0b784c6b0811c12c 100644 (file)
--- a/components/freertos/test/test_freertos.c
+++ b/components/freertos/test/test_freertos.c
@@ -12,9 +12,8 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "driver/gpio.h"
 
 

diff --git a/components/freertos/test/test_newlib_reent.c b/components/freertos/test/test_newlib_reent.c
index 4719d40bdc4384de3330107d8617ccb750cc1a12..ea723b70a31206ce78a51ac4ba54c2081644e305 100644 (file)
--- a/components/freertos/test/test_newlib_reent.c
+++ b/components/freertos/test/test_newlib_reent.c
@@ -13,10 +13,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-
 
 volatile static int done;
 volatile static int error;

diff --git a/components/freertos/test/test_panic.c b/components/freertos/test/test_panic.c
index 336bfea37dcbd574b4cd823e659e89de66809e6e..295e0486f17593cdc25a49d47a0e1e07dc1cde6d 100644 (file)
--- a/components/freertos/test/test_panic.c
+++ b/components/freertos/test/test_panic.c
@@ -12,10 +12,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-
 
 TEST_CASE("Panic handler", "[freertos][ignore]")
 {

diff --git a/components/freertos/test/test_spinlocks.c b/components/freertos/test/test_spinlocks.c
index 3a99ebe2be8369ab0795d7d50cb178469fd8c77b..a54908f33c5712c46fe158f1c408116e84f158d2 100644 (file)
--- a/components/freertos/test/test_spinlocks.c
+++ b/components/freertos/test/test_spinlocks.c
@@ -12,9 +12,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "soc/cpu.h"
 
 #include "test_utils.h"

diff --git a/components/freertos/xtensa_vectors.S b/components/freertos/xtensa_vectors.S
index e5e63bcf15256bf6c7497af55140f57072bfd5fc..3ddad261dce2986968157d19575e31459dcab8cd 100644 (file)
--- a/components/freertos/xtensa_vectors.S
+++ b/components/freertos/xtensa_vectors.S
@@ -94,7 +94,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "esp_private/panic_reason.h"
 #include "sdkconfig.h"
 #include "soc/soc.h"
-#include "soc/dport_reg.h"
 
 /*
   Define for workaround: pin no-cpu-affinity tasks to a cpu when fpu is used.

diff --git a/components/heap/test/test_malloc.c b/components/heap/test/test_malloc.c
index bffb498d13ca9ae18573a9d4186f0e96ff951c87..1ed67ce50cf90918986c6f7bd7d4315dc61f53cb 100644 (file)
--- a/components/heap/test/test_malloc.c
+++ b/components/heap/test/test_malloc.c
@@ -12,9 +12,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "esp_heap_caps.h"
 
 #include "esp_debug_helpers.h"

diff --git a/components/mbedtls/port/esp32/aes.c b/components/mbedtls/port/esp32/aes.c
index 631ed24fe3b298214dc29b8e366e206fe6a9ed4a..0cf6c4257d766f89ce6f0ecd2a9c3533d87e2346 100644 (file)
--- a/components/mbedtls/port/esp32/aes.c
+++ b/components/mbedtls/port/esp32/aes.c
@@ -29,8 +29,7 @@
 #include "mbedtls/aes.h"
 #include "mbedtls/platform_util.h"
 #include "esp32/aes.h"
-#include "soc/dport_reg.h"
-#include "soc/hwcrypto_reg.h"
+#include "soc/hwcrypto_periph.h"
 #include <sys/lock.h>
 
 #include <freertos/FreeRTOS.h>

diff --git a/components/mbedtls/port/esp32/sha.c b/components/mbedtls/port/esp32/sha.c
index 0f8a4ca0affb0c9ae16ee06b306172e0a334bea8..7b7a0f415bcd3d45879fae2e57a705cac414fe12 100644 (file)
--- a/components/mbedtls/port/esp32/sha.c
+++ b/components/mbedtls/port/esp32/sha.c
@@ -35,8 +35,7 @@
 
 #include "esp32/sha.h"
 #include "esp32/rom/ets_sys.h"
-#include "soc/dport_reg.h"
-#include "soc/hwcrypto_reg.h"
+#include "soc/hwcrypto_periph.h"
 #include "driver/periph_ctrl.h"
 
 inline static uint32_t SHA_LOAD_REG(esp_sha_type sha_type) {

diff --git a/components/mbedtls/port/esp_bignum.c b/components/mbedtls/port/esp_bignum.c
index 3f748efb34ba6c760a87f7acca963b51cb84a43c..843c40d9b6d09268b0034cfd7d7d4eee84e468c6 100644 (file)
--- a/components/mbedtls/port/esp_bignum.c
+++ b/components/mbedtls/port/esp_bignum.c
@@ -28,17 +28,14 @@
 #include <stdlib.h>
 #include <sys/param.h>
 #include "esp32/rom/bigint.h"
-#include "soc/hwcrypto_reg.h"
+#include "soc/hwcrypto_periph.h"
 #include "esp_system.h"
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_attr.h"
 
 #include <mbedtls/bignum.h>
 
-#include "soc/dport_reg.h"
-
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"

diff --git a/components/mbedtls/test/test_apb_dport_access.c b/components/mbedtls/test/test_apb_dport_access.c
index 6cd763f947a4bbf9abafc0b816ac8c571793a23a..392effc91fa24da2ce884777213a1d6072abd4b1 100644 (file)
--- a/components/mbedtls/test/test_apb_dport_access.c
+++ b/components/mbedtls/test/test_apb_dport_access.c
@@ -6,7 +6,7 @@
 #include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "test_apb_dport_access.h"
 #include "test_utils.h"
 

diff --git a/components/newlib/test/test_time.c b/components/newlib/test/test_time.c
index 213e42c3fa62a5536e3b1347c691fd7f91d89514..92f1bf89997fc665eafd8072b0f138b9aec0610a 100644 (file)
--- a/components/newlib/test/test_time.c
+++ b/components/newlib/test/test_time.c
@@ -4,7 +4,6 @@
 #include "driver/adc.h"
 #include <time.h>
 #include <sys/time.h>
-#include "soc/rtc_cntl_reg.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"

diff --git a/components/newlib/time.c b/components/newlib/time.c
index 4458a2e66fd3fc4f4eb65ea72c4f34f0561cc693..2eb8b4b271c9227ecb56cb3b4609631d39185046 100644 (file)
--- a/components/newlib/time.c
+++ b/components/newlib/time.c
@@ -29,7 +29,6 @@
 #include "esp_timer.h"
 #include "soc/soc.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
 #include "soc/frc_timer_reg.h"
 #include "esp32/rom/ets_sys.h"
 #include "freertos/FreeRTOS.h"

diff --git a/components/sdmmc/test/test_sd.c b/components/sdmmc/test/test_sd.c
index 07965960a058c0b4ce990b3819f2c01b981c3bd6..b1b418c95c853df85a0ecf54c081a5bd916c323a 100644 (file)
--- a/components/sdmmc/test/test_sd.c
+++ b/components/sdmmc/test/test_sd.c
@@ -20,7 +20,6 @@
 #include "driver/sdmmc_host.h"
 #include "driver/sdspi_host.h"
 #include "driver/sdmmc_defs.h"
-#include "soc/gpio_reg.h"
 #include "sdmmc_cmd.h"
 #include "esp_log.h"
 #include "esp_heap_caps.h"

diff --git a/components/sdmmc/test/test_sdio.c b/components/sdmmc/test/test_sdio.c
index f4eae0598019656106cb9767b2aed7d110cbb54b..56213d71364d7eef94a596e9d188ab9cd4081dc5 100644 (file)
--- a/components/sdmmc/test/test_sdio.c
+++ b/components/sdmmc/test/test_sdio.c
@@ -23,7 +23,6 @@
 #include "driver/sdmmc_host.h"
 #include "driver/sdmmc_defs.h"
 #include "sdmmc_cmd.h"
-#include "soc/gpio_reg.h"
 #include "unity.h"
 
 /* Second ESP32 board attached as follows:

diff --git a/components/soc/esp32/cpu_util.c b/components/soc/esp32/cpu_util.c
index bc052af98aa62d1b5df7e20f0823a4bce99d595f..83ae830b943fa0a785e7bd7f2eda9e5db7c785aa 100644 (file)
--- a/components/soc/esp32/cpu_util.c
+++ b/components/soc/esp32/cpu_util.c
@@ -15,7 +15,7 @@
 #include "esp_attr.h"
 #include "soc/cpu.h"
 #include "soc/soc.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "sdkconfig.h"
 
 void IRAM_ATTR esp_cpu_stall(int cpu_id)

diff --git a/components/soc/esp32/include/soc/rtc.h b/components/soc/esp32/include/soc/rtc.h
index 12f65caf9aa25d10c9b2125bb9bbc48e1e678a72..4dd0db6e2e3bdabdaf17c797cc45fb14744dc9d8 100644 (file)
--- a/components/soc/esp32/include/soc/rtc.h
+++ b/components/soc/esp32/include/soc/rtc.h
@@ -17,6 +17,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "soc/soc.h"
+#include "soc/rtc_periph.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/components/soc/esp32/rtc_clk.c b/components/soc/esp32/rtc_clk.c
index 596ccf274ee0ec087855d7a9eb8bc8e63bd7fdd9..80a749b22e0f0147fb3914e20719976b98966d5b 100644 (file)
--- a/components/soc/esp32/rtc_clk.c
+++ b/components/soc/esp32/rtc_clk.c
@@ -21,11 +21,10 @@
 #include "esp32/rom/uart.h"
 #include "esp32/rom/gpio.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "soc/apb_ctrl_reg.h"
 #include "i2c_rtc_clk.h"
 #include "soc_log.h"

diff --git a/components/soc/esp32/rtc_clk_init.c b/components/soc/esp32/rtc_clk_init.c
index ef1485311e0938b68a791cb92a478a2c7d46909d..e62846d194fd2022782e78db09dba9e713e19dff 100644 (file)
--- a/components/soc/esp32/rtc_clk_init.c
+++ b/components/soc/esp32/rtc_clk_init.c
@@ -21,11 +21,9 @@
 #include "esp32/rom/uart.h"
 #include "esp32/rom/gpio.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/sens_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
+#include "soc/efuse_periph.h"
 #include "soc/apb_ctrl_reg.h"
 #include "i2c_rtc_clk.h"
 #include "soc_log.h"

diff --git a/components/soc/esp32/rtc_init.c b/components/soc/esp32/rtc_init.c
index 7236225d43176a69dd4e9dfa79163c757d3546dc..e0cd4ba4a3f0fc7c6c3e78ddfd121be99a82864d 100644 (file)
--- a/components/soc/esp32/rtc_init.c
+++ b/components/soc/esp32/rtc_init.c
@@ -16,10 +16,10 @@
 
 #include "soc/soc.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/gpio_reg.h"
+#include "soc/efuse_periph.h"
+#include "soc/gpio_periph.h"
 
 
 void rtc_init(rtc_config_t cfg)

diff --git a/components/soc/esp32/rtc_pm.c b/components/soc/esp32/rtc_pm.c
index e5e7377259ac1fc0c409049d4871a450e72c9970..f951ee10784c06e413fdbeb3f73cfc4578668072 100644 (file)
--- a/components/soc/esp32/rtc_pm.c
+++ b/components/soc/esp32/rtc_pm.c
@@ -15,7 +15,6 @@
 #include <stdint.h>
 #include <assert.h>
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
 
 typedef enum {
     PM_LIGHT_SLEEP = BIT(2),        /*!< WiFi PD, memory in light sleep */

diff --git a/components/soc/esp32/rtc_sleep.c b/components/soc/esp32/rtc_sleep.c
index 6b8897ae25678af48a2aaafa6ae68a520cd184a2..d903dc70ab1c315209d31df0eb85de2203c0ce3c 100644 (file)
--- a/components/soc/esp32/rtc_sleep.c
+++ b/components/soc/esp32/rtc_sleep.c
@@ -15,11 +15,10 @@
 #include <stdint.h>
 #include "soc/soc.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc.h"
-#include "soc/i2s_reg.h"
-#include "soc/timer_group_reg.h"
+#include "soc/i2s_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/bb_reg.h"
 #include "soc/nrx_reg.h"
 #include "soc/fe_reg.h"

diff --git a/components/soc/esp32/rtc_time.c b/components/soc/esp32/rtc_time.c
index 5160f8602dd18cfdb55fbcfafa6ec135f8be225a..e644775645bc1117aae45c74828b061d3586d1c9 100644 (file)
--- a/components/soc/esp32/rtc_time.c
+++ b/components/soc/esp32/rtc_time.c
@@ -15,8 +15,7 @@
 #include <stdint.h>
 #include "esp32/rom/ets_sys.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "soc_log.h"
 
 #define MHZ (1000000)

diff --git a/components/soc/esp32/sdio_slave_periph.c b/components/soc/esp32/sdio_slave_periph.c
index e7bd9d84bb70c9a0f453263ce51dc20f4db935ae..10f0c547b771d4d4cb3def3d1f5f138fd15a68c1 100644 (file)
--- a/components/soc/esp32/sdio_slave_periph.c
+++ b/components/soc/esp32/sdio_slave_periph.c
@@ -14,8 +14,7 @@
 
 #include <stdint.h>
 #include "soc/sdio_slave_periph.h"
-#include "soc/io_mux_reg.h"
-#include "soc/sdio_slave_pins.h"
+#include "soc/gpio_periph.h"
 
 // I/O slot of sdio slave:
 // 0: GPIO 6, 11, 7, 8, 9, 10,

diff --git a/components/soc/esp32/test/test_rtc_clk.c b/components/soc/esp32/test/test_rtc_clk.c
index 3f8e876994734368285fe0b445db68f440e985c9..6983035580a0358fdea8675c251b2649df8f927a 100644 (file)
--- a/components/soc/esp32/test/test_rtc_clk.c
+++ b/components/soc/esp32/test/test_rtc_clk.c
@@ -3,10 +3,9 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/uart.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/sens_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
+#include "soc/gpio_periph.h"
 #include "driver/rtc_io.h"
 #include "test_utils.h"
 #include "freertos/FreeRTOS.h"

diff --git a/components/spi_flash/spi_flash_rom_patch.c b/components/spi_flash/spi_flash_rom_patch.c
index aacc62a7f55e4e67dd532aadb93a3cbfeac76e1a..e004525855f266d06d28f37fb530bbda21f7d064 100644 (file)
--- a/components/spi_flash/spi_flash_rom_patch.c
+++ b/components/spi_flash/spi_flash_rom_patch.c
@@ -16,7 +16,7 @@
 #include "esp32/rom/gpio.h"
 #include "esp32/rom/spi_flash.h"
 #include "sdkconfig.h"
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 
 
 #define SPI_IDX   1

diff --git a/components/spi_flash/test/test_large_flash_writes.c b/components/spi_flash/test/test_large_flash_writes.c
index 3a96ac458b6c5ece8e38f70367ea2957000eae31..f530ca3788b83f28534ef77a4ea1c46efdbc3856 100644 (file)
--- a/components/spi_flash/test/test_large_flash_writes.c
+++ b/components/spi_flash/test/test_large_flash_writes.c
@@ -27,8 +27,7 @@
 #include <esp_log.h>
 #include <esp32/rom/spi_flash.h>
 #include "../cache_utils.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 
 static const uint8_t large_const_buffer[16400] = {
     203, // first byte

diff --git a/components/spi_flash/test/test_read_write.c b/components/spi_flash/test/test_read_write.c
index e46480f617929bc4d8564e146ad021a0cb74155b..ecc7e23c49c252de2996d170bd7c09ad58e4401a 100644 (file)
--- a/components/spi_flash/test/test_read_write.c
+++ b/components/spi_flash/test/test_read_write.c
@@ -25,8 +25,7 @@
 #include <esp_spi_flash.h>
 #include <esp32/rom/spi_flash.h>
 #include "../cache_utils.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "esp_heap_caps.h"
 
 /* Base offset in flash for tests. */

diff --git a/components/vfs/test/test_vfs_select.c b/components/vfs/test/test_vfs_select.c
index 341dec1c5359589c0d31d9b9df534314e6a7c4a5..c8ff500da2a7a9fe3d4ed921a7a2720aacdead4f 100644 (file)
--- a/components/vfs/test/test_vfs_select.c
+++ b/components/vfs/test/test_vfs_select.c
@@ -17,7 +17,6 @@
 #include <sys/fcntl.h>
 #include <sys/param.h>
 #include "unity.h"
-#include "soc/uart_struct.h"
 #include "freertos/FreeRTOS.h"
 #include "driver/uart.h"
 #include "esp_vfs.h"

diff --git a/components/vfs/test/test_vfs_uart.c b/components/vfs/test/test_vfs_uart.c
index 62a639aa63e9e106b3e072cf2fac3d7b4ae517b6..d46c7cb757f4e1037330c70b44e0b8ece68c9a36 100644 (file)
--- a/components/vfs/test/test_vfs_uart.c
+++ b/components/vfs/test/test_vfs_uart.c
@@ -20,7 +20,6 @@
 #include <sys/errno.h>
 #include "unity.h"
 #include "esp32/rom/uart.h"
-#include "soc/uart_struct.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"

diff --git a/components/vfs/vfs_uart.c b/components/vfs/vfs_uart.c
index fd0b028d502a0d3d9f5e90315b925da5e894fec0..147c54cb70ddb867fe97f80ded3927fa5e523c96 100644 (file)
--- a/components/vfs/vfs_uart.c
+++ b/components/vfs/vfs_uart.c
@@ -22,7 +22,6 @@
 #include "esp_vfs.h"
 #include "esp_vfs_dev.h"
 #include "esp_attr.h"
-#include "soc/uart_struct.h"
 #include "driver/uart.h"
 #include "sdkconfig.h"
 #include "driver/uart_select.h"

diff --git a/examples/peripherals/mcpwm/mcpwm_basic_config/main/mcpwm_basic_config_example.c b/examples/peripherals/mcpwm/mcpwm_basic_config/main/mcpwm_basic_config_example.c
index 3fc02e6dade094eed8adef5a198b4fa8164f6cb0..58fe18889ad882089b5f7603ccf0e6cd6002a106 100644 (file)
--- a/examples/peripherals/mcpwm/mcpwm_basic_config/main/mcpwm_basic_config_example.c
+++ b/examples/peripherals/mcpwm/mcpwm_basic_config/main/mcpwm_basic_config_example.c
@@ -21,8 +21,7 @@
 #include "esp_attr.h"
 #include "soc/rtc.h"
 #include "driver/mcpwm.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 
 #define MCPWM_EN_CARRIER 0   //Make this 1 to test carrier submodule of mcpwm, set high frequency carrier parameters
 #define MCPWM_EN_DEADTIME 0  //Make this 1 to test deadtime submodule of mcpwm, set deadtime value and deadtime mode

diff --git a/examples/peripherals/mcpwm/mcpwm_bldc_control/main/mcpwm_bldc_control_hall_sensor_example.c b/examples/peripherals/mcpwm/mcpwm_bldc_control/main/mcpwm_bldc_control_hall_sensor_example.c
index 58c4b06cbef231fe39ed9a151b6e33daaa0f0ab2..ecef139cc62929c51b35373378bd2d24dea8947c 100644 (file)
--- a/examples/peripherals/mcpwm/mcpwm_bldc_control/main/mcpwm_bldc_control_hall_sensor_example.c
+++ b/examples/peripherals/mcpwm/mcpwm_bldc_control/main/mcpwm_bldc_control_hall_sensor_example.c
@@ -23,8 +23,7 @@
 #include "esp_attr.h"
 #include "soc/rtc.h"
 #include "driver/mcpwm.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 
 #define INITIAL_DUTY 10.0   //initial duty cycle is 10.0%
 #define MCPWM_GPIO_INIT 0   //select which function to use to initialize gpio signals

diff --git a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/mcpwm_brushed_dc_control_example.c b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/mcpwm_brushed_dc_control_example.c
index 00b5ddd06a6bd44d0313df66be53ce8ac4c1c004..2c721e77a2ea4f2061e229755898c12a225bc02b 100644 (file)
--- a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/mcpwm_brushed_dc_control_example.c
+++ b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/mcpwm_brushed_dc_control_example.c
@@ -20,8 +20,7 @@
 #include "esp_attr.h"
 
 #include "driver/mcpwm.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 
 #define GPIO_PWM0A_OUT 15   //Set GPIO 15 as PWM0A
 #define GPIO_PWM0B_OUT 16   //Set GPIO 16 as PWM0B
@@ -93,4 +92,4 @@ void app_main()
 {
     printf("Testing brushed motor...\n");
     xTaskCreate(mcpwm_example_brushed_motor_control, "mcpwm_examlpe_brushed_motor_control", 4096, NULL, 5, NULL);
-}
\ No newline at end of file
+}

diff --git a/examples/peripherals/mcpwm/mcpwm_servo_control/main/mcpwm_servo_control_example.c b/examples/peripherals/mcpwm/mcpwm_servo_control/main/mcpwm_servo_control_example.c
index 1a7557379fa17d42a7eacb4b5a758eaccd7a0ea0..2a944e5daf4e8d3261693df3c6cd11575f1cedcb 100644 (file)
--- a/examples/peripherals/mcpwm/mcpwm_servo_control/main/mcpwm_servo_control_example.c
+++ b/examples/peripherals/mcpwm/mcpwm_servo_control/main/mcpwm_servo_control_example.c
@@ -13,8 +13,7 @@
 #include "esp_attr.h"
 
 #include "driver/mcpwm.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 
 //You can get these value from the datasheet of servo you use, in general pulse width varies between 1000 to 2000 mocrosecond
 #define SERVO_MIN_PULSEWIDTH 1000 //Minimum pulse width in microsecond
@@ -75,4 +74,4 @@ void app_main()
 {
     printf("Testing servo motor.......\n");
     xTaskCreate(mcpwm_example_servo_control, "mcpwm_example_servo_control", 4096, NULL, 5, NULL);
-}
\ No newline at end of file
+}

diff --git a/examples/peripherals/pcnt/main/pcnt_example_main.c b/examples/peripherals/pcnt/main/pcnt_example_main.c
index 3a37c55fd0058f4f871ed804336179686f2b1c62..f734501fccd1bb49ae2d172a3e980c6b60efc81b 100644 (file)
--- a/examples/peripherals/pcnt/main/pcnt_example_main.c
+++ b/examples/peripherals/pcnt/main/pcnt_example_main.c
@@ -20,7 +20,6 @@
 #include "driver/pcnt.h"
 #include "esp_attr.h"
 #include "esp_log.h"
-#include "soc/gpio_sig_map.h"
 
 /**
  * TEST CODE BRIEF

diff --git a/examples/peripherals/rmt_nec_tx_rx/main/infrared_nec_main.c b/examples/peripherals/rmt_nec_tx_rx/main/infrared_nec_main.c
index ae20b070f2da082991bad95b1700078836955aed..cebffbcaebbb01a974e7c908251120017efd8b6a 100644 (file)
--- a/examples/peripherals/rmt_nec_tx_rx/main/infrared_nec_main.c
+++ b/examples/peripherals/rmt_nec_tx_rx/main/infrared_nec_main.c
@@ -15,8 +15,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "driver/rmt.h"
-#include "driver/periph_ctrl.h"
-#include "soc/rmt_reg.h"
 
 static const char* NEC_TAG = "NEC";
 

diff --git a/examples/peripherals/sdio/host/components/esp_slave/esp_slave.c b/examples/peripherals/sdio/host/components/esp_slave/esp_slave.c
index cbe3fe2660ae4b63e6c76b1583bb5d9c72d7382a..fdfaa291e3ac21c1e0fb740bceed4e7d23afd67a 100644 (file)
--- a/examples/peripherals/sdio/host/components/esp_slave/esp_slave.c
+++ b/examples/peripherals/sdio/host/components/esp_slave/esp_slave.c
@@ -15,7 +15,7 @@
 #include "esp_slave.h"
 #include "esp_log.h"
 #include "freertos/task.h"
-#include "soc/host_reg.h"
+#include "soc/sdio_slave_periph.h"
 
 static const char TAG[] = "esp_slave";
 

diff --git a/examples/peripherals/sdio/host/components/esp_slave/include/esp_slave.h b/examples/peripherals/sdio/host/components/esp_slave/include/esp_slave.h
index 56deab0f7d1b8c4024982a2e22136e5ad1dda5f2..c2d4d31d2431cc5970927fd651663f77c7e09782 100644 (file)
--- a/examples/peripherals/sdio/host/components/esp_slave/include/esp_slave.h
+++ b/examples/peripherals/sdio/host/components/esp_slave/include/esp_slave.h
@@ -14,7 +14,7 @@
 
 #include "sdmmc_cmd.h"
 #include "driver/sdmmc_defs.h"
-#include "soc/host_reg.h"
+#include "soc/sdio_slave_periph.h"
 
 /*
  * NOTE: This component is for example purpose only. Assertion fails if any of

diff --git a/examples/peripherals/sdio/host/main/app_main.c b/examples/peripherals/sdio/host/main/app_main.c
index 23245a3fc7e62f31b371329b31e1e87b50909b94..5015048f7236cf3c961275c2aebdcbb5770d21aa 100644 (file)
--- a/examples/peripherals/sdio/host/main/app_main.c
+++ b/examples/peripherals/sdio/host/main/app_main.c
@@ -17,13 +17,13 @@
 #include "freertos/queue.h"
 
 #include "soc/sdmmc_periph.h"
+#include "soc/sdio_slave_periph.h"
 #include "esp_log.h"
 #include "esp_attr.h"
 #include "esp_slave.h"
 #include "sdkconfig.h"
 #include "driver/sdmmc_host.h"
 #include "driver/sdspi_host.h"
-#include "soc/sdio_slave_pins.h"
 
 /*
  * For SDIO master-slave board, we have 3 pins controlling power of 3 different

diff --git a/examples/peripherals/sdio/slave/main/app_main.c b/examples/peripherals/sdio/slave/main/app_main.c
index 410209bb2479f0aecf90fd4e71cf8874d7338ef5..dd7a73a61b453035b09efaabd275e67210441988 100644 (file)
--- a/examples/peripherals/sdio/slave/main/app_main.c
+++ b/examples/peripherals/sdio/slave/main/app_main.c
@@ -11,7 +11,6 @@
 #include "esp32/rom/lldesc.h"
 #include "sys/queue.h"
 #include "soc/soc.h"
-#include "soc/sdio_slave_periph.h"
 #include "freertos/task.h"
 #include "freertos/ringbuf.h"
 #include "sdkconfig.h"

diff --git a/examples/peripherals/spi_master/main/spi_master_example_main.c b/examples/peripherals/spi_master/main/spi_master_example_main.c
index 346488bd424537a9402c805fce5a43942d4cf745..3d4d304ea7c745e600d145fb96ae5c964536a4fe 100644 (file)
--- a/examples/peripherals/spi_master/main/spi_master_example_main.c
+++ b/examples/peripherals/spi_master/main/spi_master_example_main.c
@@ -13,7 +13,6 @@
 #include "freertos/task.h"
 #include "esp_system.h"
 #include "driver/spi_master.h"
-#include "soc/gpio_struct.h"
 #include "driver/gpio.h"
 
 #include "pretty_effect.h"

diff --git a/examples/peripherals/spi_slave/receiver/main/app_main.c b/examples/peripherals/spi_slave/receiver/main/app_main.c
index 3c7aef49513379f5c1bd963a0b61c00bf199742d..c5362dd97b4c9a2b6e6792da4011ab19c7bdc7ae 100644 (file)
--- a/examples/peripherals/spi_slave/receiver/main/app_main.c
+++ b/examples/peripherals/spi_slave/receiver/main/app_main.c
@@ -26,7 +26,7 @@
 #include "esp_event.h"
 #include "esp_event_loop.h"
 #include "nvs_flash.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "esp32/rom/cache.h"
 #include "driver/spi_slave.h"
 #include "esp_log.h"

diff --git a/examples/peripherals/spi_slave/sender/main/app_main.c b/examples/peripherals/spi_slave/sender/main/app_main.c
index dc16bd556607df36d63545c7908b09903ab5256f..af7dc227520bbf83789db61f8a1f5726eab88088 100644 (file)
--- a/examples/peripherals/spi_slave/sender/main/app_main.c
+++ b/examples/peripherals/spi_slave/sender/main/app_main.c
@@ -26,13 +26,12 @@
 #include "esp_event.h"
 #include "esp_event_loop.h"
 #include "nvs_flash.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "esp32/rom/cache.h"
 #include "driver/spi_master.h"
 #include "esp_log.h"
 #include "esp_spi_flash.h"
 
-#include "soc/gpio_reg.h"
 #include "driver/gpio.h"
 #include "esp_intr_alloc.h"
 

diff --git a/examples/peripherals/timer_group/main/timer_group_example_main.c b/examples/peripherals/timer_group/main/timer_group_example_main.c
index 0e1ee36fc6384110c3e82fcfc8f2888fc4961580..572e35e61d6ce75258a4ba08ff3de88b2c4fb71f 100644 (file)
--- a/examples/peripherals/timer_group/main/timer_group_example_main.c
+++ b/examples/peripherals/timer_group/main/timer_group_example_main.c
@@ -12,7 +12,6 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/queue.h"
-#include "soc/timer_group_struct.h"
 #include "driver/periph_ctrl.h"
 #include "driver/timer.h"
 

diff --git a/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c b/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c
index e3e3cbf212563d4a35712be47ca9f5706b30d3bb..1ed6bcabd3c11ebbe1cfaf04907bbf32d6590ad2 100644 (file)
--- a/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c
+++ b/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c
@@ -12,8 +12,8 @@
 #include "esp_log.h"
 
 #include "driver/touch_pad.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
 
 static const char* TAG = "Touch pad";
 #define TOUCH_THRESH_NO_USE   (0)

diff --git a/examples/peripherals/uart/uart_async_rxtxtasks/main/uart_async_rxtxtasks_main.c b/examples/peripherals/uart/uart_async_rxtxtasks/main/uart_async_rxtxtasks_main.c
index 988640a9c2290fedd77f9e02be9c750612f26ca3..1933b0621e5f5b9c5e8faa13c4509ec58273ab90 100644 (file)
--- a/examples/peripherals/uart/uart_async_rxtxtasks/main/uart_async_rxtxtasks_main.c
+++ b/examples/peripherals/uart/uart_async_rxtxtasks/main/uart_async_rxtxtasks_main.c
@@ -11,7 +11,6 @@
 #include "esp_system.h"
 #include "esp_log.h"
 #include "driver/uart.h"
-#include "soc/uart_struct.h"
 #include "string.h"
 #include "driver/gpio.h"
 

diff --git a/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c b/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c
index 05b5fb9cf394a14e753c012311e8ff8785809f13..22204b73feed3d3751830da8e75227c49a37fa39 100644 (file)
--- a/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c
+++ b/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c
@@ -16,7 +16,6 @@
 #include "driver/uart.h"
 #include "freertos/queue.h"
 #include "esp_log.h"
-#include "soc/uart_struct.h"
 
 /**
  * This is a example example which echos any data it receives on UART back to the sender.

diff --git a/examples/system/app_trace_to_host/main/app_trace_to_host_example_main.c b/examples/system/app_trace_to_host/main/app_trace_to_host_example_main.c
index cff05f51b045d467768e42617a86fa2f02269c9b..bedeeb35c799b600bd54761885736a2903c24afc 100644 (file)
--- a/examples/system/app_trace_to_host/main/app_trace_to_host_example_main.c
+++ b/examples/system/app_trace_to_host/main/app_trace_to_host_example_main.c
@@ -12,8 +12,8 @@
 #include "freertos/task.h"
 #include "esp_app_trace.h"
 #include "esp_log.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
 #include "driver/adc.h"
 #include "driver/dac.h"
 

diff --git a/examples/system/console/components/cmd_system/cmd_system.c b/examples/system/console/components/cmd_system/cmd_system.c
index aae2ee6c4e2bfe668f026f220e3e0968585ec8e4..50fe5ec09c7352f26c5d2c22e6456c5a12dae20d 100644 (file)
--- a/examples/system/console/components/cmd_system/cmd_system.c
+++ b/examples/system/console/components/cmd_system/cmd_system.c
@@ -20,7 +20,6 @@
 #include "argtable3/argtable3.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "soc/rtc_cntl_reg.h"
 #include "esp32/rom/uart.h"
 #include "cmd_system.h"
 #include "sdkconfig.h"

diff --git a/examples/system/deep_sleep/main/deep_sleep_example_main.c b/examples/system/deep_sleep/main/deep_sleep_example_main.c
index 5e3866d6ecd9490e5615e0c6b36d1edbf767a884..5843e64aa94563a550bbfb7fae47fd2ea51aa011 100644 (file)
--- a/examples/system/deep_sleep/main/deep_sleep_example_main.c
+++ b/examples/system/deep_sleep/main/deep_sleep_example_main.c
@@ -20,8 +20,7 @@
 #include "driver/touch_pad.h"
 #include "driver/adc.h"
 #include "driver/rtc_io.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/sens_periph.h"
 #include "soc/rtc.h"
 
 static RTC_DATA_ATTR struct timeval sleep_enter_time;

diff --git a/tools/unit-test-app/components/test_utils/ref_clock.c b/tools/unit-test-app/components/test_utils/ref_clock.c
index 3a25a6227c1ce1320e6350c8c4ae955b9feff9a2..c66ff28b9efa721bde45627167a01b526d95bbdb 100644 (file)
--- a/tools/unit-test-app/components/test_utils/ref_clock.c
+++ b/tools/unit-test-app/components/test_utils/ref_clock.c
@@ -31,14 +31,12 @@
  */
 
 #include "test_utils.h"
-#include "soc/rmt_struct.h"
-#include "soc/pcnt_struct.h"
-#include "soc/pcnt_reg.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/rmt_periph.h"
+#include "soc/pcnt_periph.h"
+#include "soc/gpio_periph.h"
 #include "soc/dport_reg.h"
 #include "esp32/rom/gpio.h"
 #include "esp32/rom/ets_sys.h"
-#include "driver/gpio.h"
 #include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "driver/periph_ctrl.h"