From 897496dd7394688f75e65d2ae514c9d038fe3d26 Mon Sep 17 00:00:00 2001 From: Takao Akaki Date: Thu, 4 Mar 2021 20:56:59 +0900 Subject: [PATCH 1/2] Can't use spiram.h functions when building with cpp. Merges https://github.com/espressif/esp-idf/pull/6658 --- components/esp32/include/esp32/spiram.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/esp32/include/esp32/spiram.h b/components/esp32/include/esp32/spiram.h index ccbca2c0b8..bd48e8db1d 100644 --- a/components/esp32/include/esp32/spiram.h +++ b/components/esp32/include/esp32/spiram.h @@ -21,6 +21,10 @@ #include #include "esp_err.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef enum { ESP_SPIRAM_SIZE_16MBITS = 0, /*!< SPI RAM size is 16 MBits */ ESP_SPIRAM_SIZE_32MBITS = 1, /*!< SPI RAM size is 32 MBits */ @@ -114,3 +118,7 @@ bool esp_spiram_is_initialized(void); #endif + +#ifdef __cplusplus +} +#endif From 2887c88f562384d1bff855fc6a7ad7318a09e2d1 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 5 May 2021 15:27:19 +0200 Subject: [PATCH 2/2] spiram: add header guards to esp32s3/spiram.h and remove the exception --- components/esp32s3/include/esp32s3/spiram.h | 8 ++++++++ tools/ci/check_public_headers_exceptions.txt | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/components/esp32s3/include/esp32s3/spiram.h b/components/esp32s3/include/esp32s3/spiram.h index abe2d05ecd..105a60543e 100644 --- a/components/esp32s3/include/esp32s3/spiram.h +++ b/components/esp32s3/include/esp32s3/spiram.h @@ -21,6 +21,10 @@ #include #include "esp_err.h" +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief Initialize spiram interface/hardware. Normally called from cpu_start.c. * @@ -135,4 +139,8 @@ uint32_t rodata_flash_end_page_get(void); int rodata_flash2spiram_offset(void); #endif +#ifdef __cplusplus +} +#endif + #endif diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt index c8ab4fdd9e..20861b1a5a 100644 --- a/tools/ci/check_public_headers_exceptions.txt +++ b/tools/ci/check_public_headers_exceptions.txt @@ -20,7 +20,6 @@ components/esp_rom/include/esp32s2/rom/rsa_pss.h components/esp_common/include/esp_private/ components/esp32/include/esp32/brownout.h -components/esp32/include/esp32/spiram.h components/esp32/include/esp32/cache_err_int.h components/driver/include/driver/sdmmc_defs.h