Explorar o código

test: fix broken host test of idf_as_lib

morris %!s(int64=3) %!d(string=hai) anos
pai
achega
6d288575dc

+ 6 - 7
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 <stdio.h>
 #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)

+ 6 - 0
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 <stdbool.h>
 #include <setjmp.h>
 

+ 28 - 0
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 <stdint.h>
+
+#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

+ 12 - 11
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 <stdint.h>
 
-#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

+ 6 - 0
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)

+ 6 - 1
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 <stdio.h>
 #include <unistd.h>
 #include <setjmp.h>
-#include "esp_system.h"
+#include "esp_chip_info.h"
 
 extern jmp_buf buf;
 

+ 13 - 0
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 <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define portTICK_PERIOD_MS  1000
 
 void vTaskDelay( const uint32_t xTicksToDelay );
+
+#ifdef __cplusplus
+}
+#endif

+ 6 - 0
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 <unistd.h>
 #include "freertos/task.h"
 

+ 14 - 0
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 <stddef.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int spi_flash_get_chip_size(void);
+
+#ifdef __cplusplus
+}
+#endif

+ 0 - 8
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