From cb2cbc652adb97933dc7bdbbccd8af2e549fa231 Mon Sep 17 00:00:00 2001 From: Chen Jichang Date: Fri, 7 Nov 2025 18:00:58 +0800 Subject: [PATCH] feat(hal): move i2c_periph.h to hal folder --- components/driver/i2c/i2c.c | 2 +- components/driver/test_apps/legacy_i2c_driver/main/test_i2c.c | 2 +- components/esp_driver_i2c/i2c_common.c | 2 +- components/esp_driver_i2c/i2c_master.c | 2 +- components/esp_hal_i2c/esp32/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32c2/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32c2/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32c3/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32c3/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32c5/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32c5/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32c6/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32c6/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32c61/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32c61/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32h2/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32h2/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32h21/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32h21/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32h4/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32h4/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32p4/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32p4/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32s2/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32s2/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/esp32s3/i2c_periph.c | 2 +- components/esp_hal_i2c/esp32s3/include/hal/i2c_ll.h | 2 +- components/esp_hal_i2c/include/{soc => hal}/i2c_periph.h | 0 29 files changed, 28 insertions(+), 28 deletions(-) rename components/esp_hal_i2c/include/{soc => hal}/i2c_periph.h (100%) diff --git a/components/driver/i2c/i2c.c b/components/driver/i2c/i2c.c index 7a8fc82659..5e849ae1e8 100644 --- a/components/driver/i2c/i2c.c +++ b/components/driver/i2c/i2c.c @@ -21,7 +21,7 @@ #include "soc/soc_memory_layout.h" #include "hal/i2c_hal.h" #include "hal/gpio_hal.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "driver/i2c_types_legacy.h" #include "esp_private/periph_ctrl.h" #include "esp_rom_gpio.h" diff --git a/components/driver/test_apps/legacy_i2c_driver/main/test_i2c.c b/components/driver/test_apps/legacy_i2c_driver/main/test_i2c.c index 9de8145efc..6caf72da90 100644 --- a/components/driver/test_apps/legacy_i2c_driver/main/test_i2c.c +++ b/components/driver/test_apps/legacy_i2c_driver/main/test_i2c.c @@ -12,7 +12,7 @@ #include "esp_attr.h" #include "esp_log.h" #include "soc/gpio_periph.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "esp_system.h" #include "soc/uart_struct.h" #include "esp_private/periph_ctrl.h" diff --git a/components/esp_driver_i2c/i2c_common.c b/components/esp_driver_i2c/i2c_common.c index 8880bdcfd5..c938adc111 100644 --- a/components/esp_driver_i2c/i2c_common.c +++ b/components/esp_driver_i2c/i2c_common.c @@ -23,7 +23,7 @@ #include "i2c_private.h" #include "driver/gpio.h" #include "soc/clk_tree_defs.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "esp_clk_tree.h" #include "clk_ctrl_os.h" #include "esp_private/gpio.h" diff --git a/components/esp_driver_i2c/i2c_master.c b/components/esp_driver_i2c/i2c_master.c index 023122659f..4f88363389 100644 --- a/components/esp_driver_i2c/i2c_master.c +++ b/components/esp_driver_i2c/i2c_master.c @@ -21,7 +21,7 @@ #include "esp_intr_alloc.h" #include "freertos/FreeRTOS.h" #include "freertos/semphr.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "esp_private/periph_ctrl.h" #include "esp_private/esp_clk.h" #include "esp_rom_gpio.h" diff --git a/components/esp_hal_i2c/esp32/i2c_periph.c b/components/esp_hal_i2c/esp32/i2c_periph.c index 4a440fca4d..243279b51b 100644 --- a/components/esp_hal_i2c/esp32/i2c_periph.c +++ b/components/esp_hal_i2c/esp32/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" /* diff --git a/components/esp_hal_i2c/esp32/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32/include/hal/i2c_ll.h index b8ea21965c..564bd1f799 100644 --- a/components/esp_hal_i2c/esp32/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32/include/hal/i2c_ll.h @@ -10,7 +10,7 @@ #include #include "hal/misc.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/i2c_struct.h" #include "soc/clk_tree_defs.h" #include "soc/dport_reg.h" diff --git a/components/esp_hal_i2c/esp32c2/i2c_periph.c b/components/esp_hal_i2c/esp32c2/i2c_periph.c index 4df019865b..528bdec964 100644 --- a/components/esp_hal_i2c/esp32c2/i2c_periph.c +++ b/components/esp_hal_i2c/esp32c2/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" /* diff --git a/components/esp_hal_i2c/esp32c2/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32c2/include/hal/i2c_ll.h index b5a02817af..b2a20de0bc 100644 --- a/components/esp_hal_i2c/esp32c2/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32c2/include/hal/i2c_ll.h @@ -11,7 +11,7 @@ #include #include "hal/misc.h" #include "hal/assert.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/soc_caps.h" #include "soc/i2c_struct.h" #include "hal/i2c_types.h" diff --git a/components/esp_hal_i2c/esp32c3/i2c_periph.c b/components/esp_hal_i2c/esp32c3/i2c_periph.c index 6f18557a3a..a4a8e1881b 100644 --- a/components/esp_hal_i2c/esp32c3/i2c_periph.c +++ b/components/esp_hal_i2c/esp32c3/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" /* diff --git a/components/esp_hal_i2c/esp32c3/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32c3/include/hal/i2c_ll.h index 687ea77e6b..6bb29f24b2 100644 --- a/components/esp_hal_i2c/esp32c3/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32c3/include/hal/i2c_ll.h @@ -11,7 +11,7 @@ #include "stdbool.h" #include "hal/misc.h" #include "hal/assert.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/soc_caps.h" #include "soc/i2c_struct.h" #include "hal/i2c_types.h" diff --git a/components/esp_hal_i2c/esp32c5/i2c_periph.c b/components/esp_hal_i2c/esp32c5/i2c_periph.c index 4436a046c5..c2d5a00a82 100644 --- a/components/esp_hal_i2c/esp32c5/i2c_periph.c +++ b/components/esp_hal_i2c/esp32c5/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" #define LP_I2C_MUX_FUNC (3) diff --git a/components/esp_hal_i2c/esp32c5/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32c5/include/hal/i2c_ll.h index a13d5962a2..9e583ad05c 100644 --- a/components/esp_hal_i2c/esp32c5/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32c5/include/hal/i2c_ll.h @@ -12,7 +12,7 @@ #include "soc/soc_caps.h" #include "hal/misc.h" #include "hal/assert.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/soc_caps.h" #include "soc/i2c_struct.h" #include "soc/pcr_struct.h" diff --git a/components/esp_hal_i2c/esp32c6/i2c_periph.c b/components/esp_hal_i2c/esp32c6/i2c_periph.c index 2d03a38dbe..a51c5b821c 100644 --- a/components/esp_hal_i2c/esp32c6/i2c_periph.c +++ b/components/esp_hal_i2c/esp32c6/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" #include "soc/regdma.h" #include "soc/i2c_reg.h" diff --git a/components/esp_hal_i2c/esp32c6/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32c6/include/hal/i2c_ll.h index 571034b050..70feb45eea 100644 --- a/components/esp_hal_i2c/esp32c6/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32c6/include/hal/i2c_ll.h @@ -11,7 +11,7 @@ #include #include "hal/misc.h" #include "hal/assert.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/soc_caps.h" #include "soc/i2c_struct.h" #include "soc/pcr_struct.h" diff --git a/components/esp_hal_i2c/esp32c61/i2c_periph.c b/components/esp_hal_i2c/esp32c61/i2c_periph.c index 63369e2810..951b665d03 100644 --- a/components/esp_hal_i2c/esp32c61/i2c_periph.c +++ b/components/esp_hal_i2c/esp32c61/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" /* diff --git a/components/esp_hal_i2c/esp32c61/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32c61/include/hal/i2c_ll.h index 5e50d96967..0f23e2f418 100644 --- a/components/esp_hal_i2c/esp32c61/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32c61/include/hal/i2c_ll.h @@ -12,7 +12,7 @@ #include "soc/soc_caps.h" #include "hal/misc.h" #include "hal/assert.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/soc_caps.h" #include "soc/i2c_struct.h" #include "soc/pcr_struct.h" diff --git a/components/esp_hal_i2c/esp32h2/i2c_periph.c b/components/esp_hal_i2c/esp32h2/i2c_periph.c index 7c629655b5..b39d28e18b 100644 --- a/components/esp_hal_i2c/esp32h2/i2c_periph.c +++ b/components/esp_hal_i2c/esp32h2/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" #include "soc/regdma.h" #include "soc/i2c_reg.h" diff --git a/components/esp_hal_i2c/esp32h2/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32h2/include/hal/i2c_ll.h index e0e8334f93..51689ac1c9 100644 --- a/components/esp_hal_i2c/esp32h2/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32h2/include/hal/i2c_ll.h @@ -11,7 +11,7 @@ #include #include "hal/misc.h" #include "hal/assert.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/soc_caps.h" #include "soc/i2c_struct.h" #include "soc/pcr_struct.h" diff --git a/components/esp_hal_i2c/esp32h21/i2c_periph.c b/components/esp_hal_i2c/esp32h21/i2c_periph.c index 5633761438..bc8a9bdffd 100644 --- a/components/esp_hal_i2c/esp32h21/i2c_periph.c +++ b/components/esp_hal_i2c/esp32h21/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" /* diff --git a/components/esp_hal_i2c/esp32h21/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32h21/include/hal/i2c_ll.h index 903a77fec6..9d98296b30 100644 --- a/components/esp_hal_i2c/esp32h21/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32h21/include/hal/i2c_ll.h @@ -11,7 +11,7 @@ #include #include "hal/misc.h" #include "hal/assert.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/i2c_struct.h" #include "soc/pcr_struct.h" #include "hal/i2c_types.h" diff --git a/components/esp_hal_i2c/esp32h4/i2c_periph.c b/components/esp_hal_i2c/esp32h4/i2c_periph.c index 30662b6b27..73f672d978 100644 --- a/components/esp_hal_i2c/esp32h4/i2c_periph.c +++ b/components/esp_hal_i2c/esp32h4/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" #include "soc/regdma.h" #include "soc/i2c_reg.h" diff --git a/components/esp_hal_i2c/esp32h4/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32h4/include/hal/i2c_ll.h index a1d0bb9a98..47bea5c970 100644 --- a/components/esp_hal_i2c/esp32h4/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32h4/include/hal/i2c_ll.h @@ -11,7 +11,7 @@ #include #include "hal/misc.h" #include "hal/assert.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/soc_caps.h" #include "soc/i2c_struct.h" #include "soc/pcr_struct.h" diff --git a/components/esp_hal_i2c/esp32p4/i2c_periph.c b/components/esp_hal_i2c/esp32p4/i2c_periph.c index 6bf7b35482..e4365e6b41 100644 --- a/components/esp_hal_i2c/esp32p4/i2c_periph.c +++ b/components/esp_hal_i2c/esp32p4/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" #include "soc/lp_gpio_sig_map.h" diff --git a/components/esp_hal_i2c/esp32p4/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32p4/include/hal/i2c_ll.h index db62795bbb..403ef15119 100644 --- a/components/esp_hal_i2c/esp32p4/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32p4/include/hal/i2c_ll.h @@ -11,7 +11,7 @@ #include #include "hal/misc.h" #include "hal/assert.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/soc_caps.h" #include "soc/i2c_struct.h" #include "hal/i2c_types.h" diff --git a/components/esp_hal_i2c/esp32s2/i2c_periph.c b/components/esp_hal_i2c/esp32s2/i2c_periph.c index 4a440fca4d..243279b51b 100644 --- a/components/esp_hal_i2c/esp32s2/i2c_periph.c +++ b/components/esp_hal_i2c/esp32s2/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" /* diff --git a/components/esp_hal_i2c/esp32s2/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32s2/include/hal/i2c_ll.h index 0949cb3939..28831bc8a8 100644 --- a/components/esp_hal_i2c/esp32s2/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32s2/include/hal/i2c_ll.h @@ -8,7 +8,7 @@ #pragma once #include -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/i2c_struct.h" #include "soc/clk_tree_defs.h" #include "soc/system_reg.h" diff --git a/components/esp_hal_i2c/esp32s3/i2c_periph.c b/components/esp_hal_i2c/esp32s3/i2c_periph.c index 4a440fca4d..243279b51b 100644 --- a/components/esp_hal_i2c/esp32s3/i2c_periph.c +++ b/components/esp_hal_i2c/esp32s3/i2c_periph.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/gpio_sig_map.h" /* diff --git a/components/esp_hal_i2c/esp32s3/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32s3/include/hal/i2c_ll.h index 6b172a7702..20ccff5a19 100644 --- a/components/esp_hal_i2c/esp32s3/include/hal/i2c_ll.h +++ b/components/esp_hal_i2c/esp32s3/include/hal/i2c_ll.h @@ -11,7 +11,7 @@ #include "stdbool.h" #include "hal/misc.h" #include "hal/assert.h" -#include "soc/i2c_periph.h" +#include "hal/i2c_periph.h" #include "soc/soc_caps.h" #include "soc/i2c_struct.h" #include "soc/clk_tree_defs.h" diff --git a/components/esp_hal_i2c/include/soc/i2c_periph.h b/components/esp_hal_i2c/include/hal/i2c_periph.h similarity index 100% rename from components/esp_hal_i2c/include/soc/i2c_periph.h rename to components/esp_hal_i2c/include/hal/i2c_periph.h