From 6d288575dc51823eea4a267b4e327406755a91cd Mon Sep 17 00:00:00 2001 From: morris Date: Mon, 9 May 2022 18:10:08 +0800 Subject: [PATCH] test: fix broken host test of idf_as_lib --- examples/build_system/cmake/idf_as_lib/main.c | 13 ++++----- .../cmake/idf_as_lib/stubs/esp32/cpu_start.c | 6 ++++ .../idf_as_lib/stubs/esp32/esp_chip_info.h | 28 +++++++++++++++++++ .../cmake/idf_as_lib/stubs/esp32/esp_system.h | 23 +++++++-------- .../cmake/idf_as_lib/stubs/esp32/flash_ops.c | 6 ++++ .../cmake/idf_as_lib/stubs/esp32/system_api.c | 7 ++++- .../idf_as_lib/stubs/freertos/freertos/task.h | 13 +++++++++ .../cmake/idf_as_lib/stubs/freertos/task.c | 6 ++++ .../stubs/spi_flash/esp_spi_flash.h | 14 ++++++++++ tools/ci/check_copyright_ignore.txt | 8 ------ 10 files changed, 97 insertions(+), 27 deletions(-) create mode 100644 examples/build_system/cmake/idf_as_lib/stubs/esp32/esp_chip_info.h diff --git a/examples/build_system/cmake/idf_as_lib/main.c b/examples/build_system/cmake/idf_as_lib/main.c index f61f972f2a..c069d36833 100644 --- a/examples/build_system/cmake/idf_as_lib/main.c +++ b/examples/build_system/cmake/idf_as_lib/main.c @@ -1,15 +1,14 @@ -/* Hello World Example +/* + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: CC0-1.0 + */ - This example code is in the Public Domain (or CC0 licensed, at your option.) - - Unless required by applicable law or agreed to in writing, this - software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. -*/ #include #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "esp_chip_info.h" +#include "esp_system.h" #include "esp_spi_flash.h" void app_main(void) diff --git a/examples/build_system/cmake/idf_as_lib/stubs/esp32/cpu_start.c b/examples/build_system/cmake/idf_as_lib/stubs/esp32/cpu_start.c index 6969d03be7..243246c707 100644 --- a/examples/build_system/cmake/idf_as_lib/stubs/esp32/cpu_start.c +++ b/examples/build_system/cmake/idf_as_lib/stubs/esp32/cpu_start.c @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ + #include #include diff --git a/examples/build_system/cmake/idf_as_lib/stubs/esp32/esp_chip_info.h b/examples/build_system/cmake/idf_as_lib/stubs/esp32/esp_chip_info.h new file mode 100644 index 0000000000..f05021e8a1 --- /dev/null +++ b/examples/build_system/cmake/idf_as_lib/stubs/esp32/esp_chip_info.h @@ -0,0 +1,28 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define CHIP_FEATURE_EMB_FLASH (1UL << 0) +#define CHIP_FEATURE_BT (1UL << 4) +#define CHIP_FEATURE_BLE (1UL << 5) + +typedef struct { + uint32_t features; //!< bit mask of CHIP_FEATURE_x feature flags + uint8_t cores; //!< number of CPU cores + uint8_t revision; //!< chip revision number +} esp_chip_info_t; + +void esp_chip_info(esp_chip_info_t *out_info); + +#ifdef __cplusplus +} +#endif diff --git a/examples/build_system/cmake/idf_as_lib/stubs/esp32/esp_system.h b/examples/build_system/cmake/idf_as_lib/stubs/esp32/esp_system.h index 3cd073adf1..a3d2143c55 100644 --- a/examples/build_system/cmake/idf_as_lib/stubs/esp32/esp_system.h +++ b/examples/build_system/cmake/idf_as_lib/stubs/esp32/esp_system.h @@ -1,15 +1,16 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #pragma once -#include -#define CHIP_FEATURE_EMB_FLASH (1UL << 0) -#define CHIP_FEATURE_BT (1UL << 4) -#define CHIP_FEATURE_BLE (1UL << 5) - -typedef struct { - uint32_t features; //!< bit mask of CHIP_FEATURE_x feature flags - uint8_t cores; //!< number of CPU cores - uint8_t revision; //!< chip revision number -} esp_chip_info_t; +#ifdef __cplusplus +extern "C" { +#endif void esp_restart(void); -void esp_chip_info(esp_chip_info_t* out_info); + +#ifdef __cplusplus +} +#endif diff --git a/examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c b/examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c index 046ae31071..28c3a41499 100644 --- a/examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c +++ b/examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ + #include "esp_spi_flash.h" int spi_flash_get_chip_size(void) diff --git a/examples/build_system/cmake/idf_as_lib/stubs/esp32/system_api.c b/examples/build_system/cmake/idf_as_lib/stubs/esp32/system_api.c index be70ac0ea8..2da59ef089 100644 --- a/examples/build_system/cmake/idf_as_lib/stubs/esp32/system_api.c +++ b/examples/build_system/cmake/idf_as_lib/stubs/esp32/system_api.c @@ -1,7 +1,12 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #include #include #include -#include "esp_system.h" +#include "esp_chip_info.h" extern jmp_buf buf; diff --git a/examples/build_system/cmake/idf_as_lib/stubs/freertos/freertos/task.h b/examples/build_system/cmake/idf_as_lib/stubs/freertos/freertos/task.h index 14533fbcdc..96031d9c87 100644 --- a/examples/build_system/cmake/idf_as_lib/stubs/freertos/freertos/task.h +++ b/examples/build_system/cmake/idf_as_lib/stubs/freertos/freertos/task.h @@ -1,7 +1,20 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #pragma once #include +#ifdef __cplusplus +extern "C" { +#endif + #define portTICK_PERIOD_MS 1000 void vTaskDelay( const uint32_t xTicksToDelay ); + +#ifdef __cplusplus +} +#endif diff --git a/examples/build_system/cmake/idf_as_lib/stubs/freertos/task.c b/examples/build_system/cmake/idf_as_lib/stubs/freertos/task.c index 095025804d..bd3d4a5e3e 100644 --- a/examples/build_system/cmake/idf_as_lib/stubs/freertos/task.c +++ b/examples/build_system/cmake/idf_as_lib/stubs/freertos/task.c @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ + #include #include "freertos/task.h" diff --git a/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_spi_flash.h b/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_spi_flash.h index 788bfa2606..ede1cb373e 100644 --- a/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_spi_flash.h +++ b/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_spi_flash.h @@ -1,5 +1,19 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ + #pragma once #include +#ifdef __cplusplus +extern "C" { +#endif + int spi_flash_get_chip_size(void); + +#ifdef __cplusplus +} +#endif diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index f3093b2ff0..fabd425104 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1947,14 +1947,6 @@ examples/bluetooth/nimble/bleprph_wifi_coex/main/bleprph.h examples/bluetooth/nimble/bleprph_wifi_coex/main/gatt_svr.c examples/bluetooth/nimble/bleprph_wifi_coex/main/main.c examples/build_system/cmake/component_manager/main/component_manager.c -examples/build_system/cmake/idf_as_lib/main.c -examples/build_system/cmake/idf_as_lib/stubs/esp32/cpu_start.c -examples/build_system/cmake/idf_as_lib/stubs/esp32/esp_system.h -examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c -examples/build_system/cmake/idf_as_lib/stubs/esp32/system_api.c -examples/build_system/cmake/idf_as_lib/stubs/freertos/freertos/task.h -examples/build_system/cmake/idf_as_lib/stubs/freertos/task.c -examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_spi_flash.h examples/build_system/cmake/import_lib/main/main.cpp examples/build_system/cmake/import_prebuilt/main/main.c examples/build_system/cmake/import_prebuilt/prebuilt/components/prebuilt/prebuilt.c