From 4d26034119092a52f0e67b0ab3b4250bf95e3ec0 Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Tue, 6 May 2025 13:26:19 +0700 Subject: [PATCH] refactor: move target interface to /include/target/ --- {src/esp32/include => include}/target/flash.h | 0 src/esp32/CMakeLists.txt | 1 - src/esp32/include/{target => }/esp_rom_caps.h | 0 src/esp32/include/{target => soc}/reg_base.h | 0 src/esp32/src/flash.c | 2 +- src/esp32/src/uart.c | 4 ++-- src/esp32c2/CMakeLists.txt | 1 - src/esp32c2/include/{target => }/esp_rom_caps.h | 0 src/esp32c2/include/{target => soc}/reg_base.h | 0 src/esp32c2/include/target/flash.h | 10 ---------- src/esp32c2/src/flash.c | 2 +- src/esp32c2/src/uart.c | 1 + src/esp32c3/CMakeLists.txt | 1 - src/esp32c3/include/{target => }/esp_rom_caps.h | 0 src/esp32c3/include/{target => soc}/reg_base.h | 0 src/esp32c3/include/target/flash.h | 10 ---------- src/esp32c3/src/flash.c | 2 +- src/esp32c3/src/uart.c | 1 + src/esp32c5/CMakeLists.txt | 1 - src/esp32c5/include/{target => }/esp_rom_caps.h | 0 src/esp32c5/include/{target => soc}/reg_base.h | 0 src/esp32c5/include/target/flash.h | 10 ---------- src/esp32c5/src/flash.c | 2 +- src/esp32c5/src/uart.c | 1 + src/esp32c6/CMakeLists.txt | 1 - src/esp32c6/include/{target => }/esp_rom_caps.h | 0 src/esp32c6/include/{target => soc}/reg_base.h | 0 src/esp32c6/include/target/flash.h | 10 ---------- src/esp32c6/src/flash.c | 2 +- src/esp32c6/src/uart.c | 1 + src/esp32c61/CMakeLists.txt | 1 - src/esp32c61/include/{target => }/esp_rom_caps.h | 0 src/esp32c61/include/{target => soc}/reg_base.h | 0 src/esp32c61/include/target/flash.h | 10 ---------- src/esp32c61/src/flash.c | 2 +- src/esp32c61/src/uart.c | 1 + src/esp32h2/CMakeLists.txt | 1 - src/esp32h2/include/{target => }/esp_rom_caps.h | 0 src/esp32h2/include/{target => soc}/reg_base.h | 0 src/esp32h2/include/target/flash.h | 10 ---------- src/esp32h2/src/flash.c | 2 +- src/esp32h2/src/uart.c | 1 + src/esp32p4/CMakeLists.txt | 1 - src/esp32p4/include/{target => }/esp_rom_caps.h | 0 src/esp32p4/include/{target => soc}/reg_base.h | 0 src/esp32p4/include/target/flash.h | 10 ---------- src/esp32p4/src/flash.c | 2 +- src/esp32p4/src/uart.c | 1 + src/esp32s2/CMakeLists.txt | 1 - src/esp32s2/include/{target => }/esp_rom_caps.h | 0 src/esp32s2/include/{target => soc}/reg_base.h | 0 src/esp32s2/include/target/flash.h | 10 ---------- src/esp32s2/src/flash.c | 2 +- src/esp32s2/src/uart.c | 1 + src/esp32s3/CMakeLists.txt | 1 - src/esp32s3/include/{target => }/esp_rom_caps.h | 0 src/esp32s3/include/{target => soc}/reg_base.h | 0 src/esp32s3/include/target/flash.h | 10 ---------- src/esp32s3/src/flash.c | 2 +- src/esp32s3/src/uart.c | 1 + src/esp8266/CMakeLists.txt | 1 - src/esp8266/include/{target => }/esp_rom_caps.h | 0 src/esp8266/include/target/flash.h | 10 ---------- src/esp8266/src/flash.c | 2 +- src/esp8266/src/uart.c | 1 + 65 files changed, 23 insertions(+), 124 deletions(-) rename {src/esp32/include => include}/target/flash.h (100%) rename src/esp32/include/{target => }/esp_rom_caps.h (100%) rename src/esp32/include/{target => soc}/reg_base.h (100%) rename src/esp32c2/include/{target => }/esp_rom_caps.h (100%) rename src/esp32c2/include/{target => soc}/reg_base.h (100%) delete mode 100644 src/esp32c2/include/target/flash.h rename src/esp32c3/include/{target => }/esp_rom_caps.h (100%) rename src/esp32c3/include/{target => soc}/reg_base.h (100%) delete mode 100644 src/esp32c3/include/target/flash.h rename src/esp32c5/include/{target => }/esp_rom_caps.h (100%) rename src/esp32c5/include/{target => soc}/reg_base.h (100%) delete mode 100644 src/esp32c5/include/target/flash.h rename src/esp32c6/include/{target => }/esp_rom_caps.h (100%) rename src/esp32c6/include/{target => soc}/reg_base.h (100%) delete mode 100644 src/esp32c6/include/target/flash.h rename src/esp32c61/include/{target => }/esp_rom_caps.h (100%) rename src/esp32c61/include/{target => soc}/reg_base.h (100%) delete mode 100644 src/esp32c61/include/target/flash.h rename src/esp32h2/include/{target => }/esp_rom_caps.h (100%) rename src/esp32h2/include/{target => soc}/reg_base.h (100%) delete mode 100644 src/esp32h2/include/target/flash.h rename src/esp32p4/include/{target => }/esp_rom_caps.h (100%) rename src/esp32p4/include/{target => soc}/reg_base.h (100%) delete mode 100644 src/esp32p4/include/target/flash.h rename src/esp32s2/include/{target => }/esp_rom_caps.h (100%) rename src/esp32s2/include/{target => soc}/reg_base.h (100%) delete mode 100644 src/esp32s2/include/target/flash.h rename src/esp32s3/include/{target => }/esp_rom_caps.h (100%) rename src/esp32s3/include/{target => soc}/reg_base.h (100%) delete mode 100644 src/esp32s3/include/target/flash.h rename src/esp8266/include/{target => }/esp_rom_caps.h (100%) delete mode 100644 src/esp8266/include/target/flash.h diff --git a/src/esp32/include/target/flash.h b/include/target/flash.h similarity index 100% rename from src/esp32/include/target/flash.h rename to include/target/flash.h diff --git a/src/esp32/CMakeLists.txt b/src/esp32/CMakeLists.txt index 1806428..8f53113 100644 --- a/src/esp32/CMakeLists.txt +++ b/src/esp32/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32.rom.ld) diff --git a/src/esp32/include/target/esp_rom_caps.h b/src/esp32/include/esp_rom_caps.h similarity index 100% rename from src/esp32/include/target/esp_rom_caps.h rename to src/esp32/include/esp_rom_caps.h diff --git a/src/esp32/include/target/reg_base.h b/src/esp32/include/soc/reg_base.h similarity index 100% rename from src/esp32/include/target/reg_base.h rename to src/esp32/include/soc/reg_base.h diff --git a/src/esp32/src/flash.c b/src/esp32/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp32/src/flash.c +++ b/src/esp32/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp32/src/uart.c b/src/esp32/src/uart.c index f56b19c..3d0f631 100644 --- a/src/esp32/src/uart.c +++ b/src/esp32/src/uart.c @@ -6,8 +6,8 @@ #include #include - -#include +#include +#include "soc/reg_base.h" // These functions are defined in the ROM extern void uartAttach(void); diff --git a/src/esp32c2/CMakeLists.txt b/src/esp32c2/CMakeLists.txt index a65170d..6115a1f 100644 --- a/src/esp32c2/CMakeLists.txt +++ b/src/esp32c2/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c2.rom.ld) diff --git a/src/esp32c2/include/target/esp_rom_caps.h b/src/esp32c2/include/esp_rom_caps.h similarity index 100% rename from src/esp32c2/include/target/esp_rom_caps.h rename to src/esp32c2/include/esp_rom_caps.h diff --git a/src/esp32c2/include/target/reg_base.h b/src/esp32c2/include/soc/reg_base.h similarity index 100% rename from src/esp32c2/include/target/reg_base.h rename to src/esp32c2/include/soc/reg_base.h diff --git a/src/esp32c2/include/target/flash.h b/src/esp32c2/include/target/flash.h deleted file mode 100644 index e285850..0000000 --- a/src/esp32c2/include/target/flash.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -void stub_target_flash_init(void *state); -void stub_target_flash_deinit(const void *state); diff --git a/src/esp32c2/src/flash.c b/src/esp32c2/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp32c2/src/flash.c +++ b/src/esp32c2/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp32c2/src/uart.c b/src/esp32c2/src/uart.c index fa68e30..dbe799e 100644 --- a/src/esp32c2/src/uart.c +++ b/src/esp32c2/src/uart.c @@ -7,6 +7,7 @@ #include #include #include +#include // These functions are defined in the ROM extern void uartAttach(void *rxBuffer); diff --git a/src/esp32c3/CMakeLists.txt b/src/esp32c3/CMakeLists.txt index 833d9e7..d85ac7e 100644 --- a/src/esp32c3/CMakeLists.txt +++ b/src/esp32c3/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c3.rom.ld) diff --git a/src/esp32c3/include/target/esp_rom_caps.h b/src/esp32c3/include/esp_rom_caps.h similarity index 100% rename from src/esp32c3/include/target/esp_rom_caps.h rename to src/esp32c3/include/esp_rom_caps.h diff --git a/src/esp32c3/include/target/reg_base.h b/src/esp32c3/include/soc/reg_base.h similarity index 100% rename from src/esp32c3/include/target/reg_base.h rename to src/esp32c3/include/soc/reg_base.h diff --git a/src/esp32c3/include/target/flash.h b/src/esp32c3/include/target/flash.h deleted file mode 100644 index e285850..0000000 --- a/src/esp32c3/include/target/flash.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -void stub_target_flash_init(void *state); -void stub_target_flash_deinit(const void *state); diff --git a/src/esp32c3/src/flash.c b/src/esp32c3/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp32c3/src/flash.c +++ b/src/esp32c3/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp32c3/src/uart.c b/src/esp32c3/src/uart.c index 17b26eb..ff13ad4 100644 --- a/src/esp32c3/src/uart.c +++ b/src/esp32c3/src/uart.c @@ -7,6 +7,7 @@ #include #include #include +#include // These functions are defined in the ROM extern void uartAttach(void *rxBuffer); diff --git a/src/esp32c5/CMakeLists.txt b/src/esp32c5/CMakeLists.txt index 06e6f0e..e499510 100644 --- a/src/esp32c5/CMakeLists.txt +++ b/src/esp32c5/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c5.rom.ld) diff --git a/src/esp32c5/include/target/esp_rom_caps.h b/src/esp32c5/include/esp_rom_caps.h similarity index 100% rename from src/esp32c5/include/target/esp_rom_caps.h rename to src/esp32c5/include/esp_rom_caps.h diff --git a/src/esp32c5/include/target/reg_base.h b/src/esp32c5/include/soc/reg_base.h similarity index 100% rename from src/esp32c5/include/target/reg_base.h rename to src/esp32c5/include/soc/reg_base.h diff --git a/src/esp32c5/include/target/flash.h b/src/esp32c5/include/target/flash.h deleted file mode 100644 index e285850..0000000 --- a/src/esp32c5/include/target/flash.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -void stub_target_flash_init(void *state); -void stub_target_flash_deinit(const void *state); diff --git a/src/esp32c5/src/flash.c b/src/esp32c5/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp32c5/src/flash.c +++ b/src/esp32c5/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp32c5/src/uart.c b/src/esp32c5/src/uart.c index 5868523..b4f0fec 100644 --- a/src/esp32c5/src/uart.c +++ b/src/esp32c5/src/uart.c @@ -6,6 +6,7 @@ #include #include +#include // These functions are defined in the ROM extern void uartAttach(void *rxBuffer); diff --git a/src/esp32c6/CMakeLists.txt b/src/esp32c6/CMakeLists.txt index aabf11c..0d30028 100644 --- a/src/esp32c6/CMakeLists.txt +++ b/src/esp32c6/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c6.rom.ld) diff --git a/src/esp32c6/include/target/esp_rom_caps.h b/src/esp32c6/include/esp_rom_caps.h similarity index 100% rename from src/esp32c6/include/target/esp_rom_caps.h rename to src/esp32c6/include/esp_rom_caps.h diff --git a/src/esp32c6/include/target/reg_base.h b/src/esp32c6/include/soc/reg_base.h similarity index 100% rename from src/esp32c6/include/target/reg_base.h rename to src/esp32c6/include/soc/reg_base.h diff --git a/src/esp32c6/include/target/flash.h b/src/esp32c6/include/target/flash.h deleted file mode 100644 index e285850..0000000 --- a/src/esp32c6/include/target/flash.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -void stub_target_flash_init(void *state); -void stub_target_flash_deinit(const void *state); diff --git a/src/esp32c6/src/flash.c b/src/esp32c6/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp32c6/src/flash.c +++ b/src/esp32c6/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp32c6/src/uart.c b/src/esp32c6/src/uart.c index 5868523..b4f0fec 100644 --- a/src/esp32c6/src/uart.c +++ b/src/esp32c6/src/uart.c @@ -6,6 +6,7 @@ #include #include +#include // These functions are defined in the ROM extern void uartAttach(void *rxBuffer); diff --git a/src/esp32c61/CMakeLists.txt b/src/esp32c61/CMakeLists.txt index 70bba40..57847f3 100644 --- a/src/esp32c61/CMakeLists.txt +++ b/src/esp32c61/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c61.rom.ld) diff --git a/src/esp32c61/include/target/esp_rom_caps.h b/src/esp32c61/include/esp_rom_caps.h similarity index 100% rename from src/esp32c61/include/target/esp_rom_caps.h rename to src/esp32c61/include/esp_rom_caps.h diff --git a/src/esp32c61/include/target/reg_base.h b/src/esp32c61/include/soc/reg_base.h similarity index 100% rename from src/esp32c61/include/target/reg_base.h rename to src/esp32c61/include/soc/reg_base.h diff --git a/src/esp32c61/include/target/flash.h b/src/esp32c61/include/target/flash.h deleted file mode 100644 index e285850..0000000 --- a/src/esp32c61/include/target/flash.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -void stub_target_flash_init(void *state); -void stub_target_flash_deinit(const void *state); diff --git a/src/esp32c61/src/flash.c b/src/esp32c61/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp32c61/src/flash.c +++ b/src/esp32c61/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp32c61/src/uart.c b/src/esp32c61/src/uart.c index 5868523..b4f0fec 100644 --- a/src/esp32c61/src/uart.c +++ b/src/esp32c61/src/uart.c @@ -6,6 +6,7 @@ #include #include +#include // These functions are defined in the ROM extern void uartAttach(void *rxBuffer); diff --git a/src/esp32h2/CMakeLists.txt b/src/esp32h2/CMakeLists.txt index 26310ad..b6fef77 100644 --- a/src/esp32h2/CMakeLists.txt +++ b/src/esp32h2/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32h2.rom.ld) diff --git a/src/esp32h2/include/target/esp_rom_caps.h b/src/esp32h2/include/esp_rom_caps.h similarity index 100% rename from src/esp32h2/include/target/esp_rom_caps.h rename to src/esp32h2/include/esp_rom_caps.h diff --git a/src/esp32h2/include/target/reg_base.h b/src/esp32h2/include/soc/reg_base.h similarity index 100% rename from src/esp32h2/include/target/reg_base.h rename to src/esp32h2/include/soc/reg_base.h diff --git a/src/esp32h2/include/target/flash.h b/src/esp32h2/include/target/flash.h deleted file mode 100644 index e285850..0000000 --- a/src/esp32h2/include/target/flash.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -void stub_target_flash_init(void *state); -void stub_target_flash_deinit(const void *state); diff --git a/src/esp32h2/src/flash.c b/src/esp32h2/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp32h2/src/flash.c +++ b/src/esp32h2/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp32h2/src/uart.c b/src/esp32h2/src/uart.c index 5868523..b4f0fec 100644 --- a/src/esp32h2/src/uart.c +++ b/src/esp32h2/src/uart.c @@ -6,6 +6,7 @@ #include #include +#include // These functions are defined in the ROM extern void uartAttach(void *rxBuffer); diff --git a/src/esp32p4/CMakeLists.txt b/src/esp32p4/CMakeLists.txt index c2b61ed..0381362 100644 --- a/src/esp32p4/CMakeLists.txt +++ b/src/esp32p4/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32p4.rom.ld) diff --git a/src/esp32p4/include/target/esp_rom_caps.h b/src/esp32p4/include/esp_rom_caps.h similarity index 100% rename from src/esp32p4/include/target/esp_rom_caps.h rename to src/esp32p4/include/esp_rom_caps.h diff --git a/src/esp32p4/include/target/reg_base.h b/src/esp32p4/include/soc/reg_base.h similarity index 100% rename from src/esp32p4/include/target/reg_base.h rename to src/esp32p4/include/soc/reg_base.h diff --git a/src/esp32p4/include/target/flash.h b/src/esp32p4/include/target/flash.h deleted file mode 100644 index e285850..0000000 --- a/src/esp32p4/include/target/flash.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -void stub_target_flash_init(void *state); -void stub_target_flash_deinit(const void *state); diff --git a/src/esp32p4/src/flash.c b/src/esp32p4/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp32p4/src/flash.c +++ b/src/esp32p4/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp32p4/src/uart.c b/src/esp32p4/src/uart.c index 5868523..b4f0fec 100644 --- a/src/esp32p4/src/uart.c +++ b/src/esp32p4/src/uart.c @@ -6,6 +6,7 @@ #include #include +#include // These functions are defined in the ROM extern void uartAttach(void *rxBuffer); diff --git a/src/esp32s2/CMakeLists.txt b/src/esp32s2/CMakeLists.txt index fe373ea..0451860 100644 --- a/src/esp32s2/CMakeLists.txt +++ b/src/esp32s2/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32s2.rom.ld) diff --git a/src/esp32s2/include/target/esp_rom_caps.h b/src/esp32s2/include/esp_rom_caps.h similarity index 100% rename from src/esp32s2/include/target/esp_rom_caps.h rename to src/esp32s2/include/esp_rom_caps.h diff --git a/src/esp32s2/include/target/reg_base.h b/src/esp32s2/include/soc/reg_base.h similarity index 100% rename from src/esp32s2/include/target/reg_base.h rename to src/esp32s2/include/soc/reg_base.h diff --git a/src/esp32s2/include/target/flash.h b/src/esp32s2/include/target/flash.h deleted file mode 100644 index e285850..0000000 --- a/src/esp32s2/include/target/flash.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -void stub_target_flash_init(void *state); -void stub_target_flash_deinit(const void *state); diff --git a/src/esp32s2/src/flash.c b/src/esp32s2/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp32s2/src/flash.c +++ b/src/esp32s2/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp32s2/src/uart.c b/src/esp32s2/src/uart.c index bbdeb10..d74d066 100644 --- a/src/esp32s2/src/uart.c +++ b/src/esp32s2/src/uart.c @@ -6,6 +6,7 @@ #include #include +#include // These functions are defined in the ROM extern void uartAttach(void *rxBuffer); diff --git a/src/esp32s3/CMakeLists.txt b/src/esp32s3/CMakeLists.txt index f251e41..b0e3360 100644 --- a/src/esp32s3/CMakeLists.txt +++ b/src/esp32s3/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32s3.rom.ld) diff --git a/src/esp32s3/include/target/esp_rom_caps.h b/src/esp32s3/include/esp_rom_caps.h similarity index 100% rename from src/esp32s3/include/target/esp_rom_caps.h rename to src/esp32s3/include/esp_rom_caps.h diff --git a/src/esp32s3/include/target/reg_base.h b/src/esp32s3/include/soc/reg_base.h similarity index 100% rename from src/esp32s3/include/target/reg_base.h rename to src/esp32s3/include/soc/reg_base.h diff --git a/src/esp32s3/include/target/flash.h b/src/esp32s3/include/target/flash.h deleted file mode 100644 index e285850..0000000 --- a/src/esp32s3/include/target/flash.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -void stub_target_flash_init(void *state); -void stub_target_flash_deinit(const void *state); diff --git a/src/esp32s3/src/flash.c b/src/esp32s3/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp32s3/src/flash.c +++ b/src/esp32s3/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp32s3/src/uart.c b/src/esp32s3/src/uart.c index 17b26eb..ff13ad4 100644 --- a/src/esp32s3/src/uart.c +++ b/src/esp32s3/src/uart.c @@ -7,6 +7,7 @@ #include #include #include +#include // These functions are defined in the ROM extern void uartAttach(void *rxBuffer); diff --git a/src/esp8266/CMakeLists.txt b/src/esp8266/CMakeLists.txt index ec62abe..e62fc30 100644 --- a/src/esp8266/CMakeLists.txt +++ b/src/esp8266/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs}) target_include_directories(${ESP_TARGET_LIB} PUBLIC include - PRIVATE include/target ) target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp8266.rom.ld) diff --git a/src/esp8266/include/target/esp_rom_caps.h b/src/esp8266/include/esp_rom_caps.h similarity index 100% rename from src/esp8266/include/target/esp_rom_caps.h rename to src/esp8266/include/esp_rom_caps.h diff --git a/src/esp8266/include/target/flash.h b/src/esp8266/include/target/flash.h deleted file mode 100644 index e285850..0000000 --- a/src/esp8266/include/target/flash.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -void stub_target_flash_init(void *state); -void stub_target_flash_deinit(const void *state); diff --git a/src/esp8266/src/flash.c b/src/esp8266/src/flash.c index b35c3cc..94895f2 100644 --- a/src/esp8266/src/flash.c +++ b/src/esp8266/src/flash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT */ -#include "flash.h" +#include void stub_target_flash_init(void *state) { diff --git a/src/esp8266/src/uart.c b/src/esp8266/src/uart.c index d5a92e3..fca0edd 100644 --- a/src/esp8266/src/uart.c +++ b/src/esp8266/src/uart.c @@ -5,6 +5,7 @@ */ #include +#include void stub_target_uart_init(uint8_t uart_num, uint32_t baudrate) {