mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-07 22:54:33 +02:00
Merge branch 'bugfix/spiram_h_header_guards' into 'master'
add missing header guards to {esp32,esp32s3}/spiram.h (Github PR) Closes IDFGH-4861 See merge request espressif/esp-idf!13435
This commit is contained in:
@@ -21,6 +21,10 @@
|
|||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "esp_err.h"
|
#include "esp_err.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
ESP_SPIRAM_SIZE_16MBITS = 0, /*!< SPI RAM size is 16 MBits */
|
ESP_SPIRAM_SIZE_16MBITS = 0, /*!< SPI RAM size is 16 MBits */
|
||||||
ESP_SPIRAM_SIZE_32MBITS = 1, /*!< SPI RAM size is 32 MBits */
|
ESP_SPIRAM_SIZE_32MBITS = 1, /*!< SPI RAM size is 32 MBits */
|
||||||
@@ -114,3 +118,7 @@ bool esp_spiram_is_initialized(void);
|
|||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -21,6 +21,10 @@
|
|||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "esp_err.h"
|
#include "esp_err.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Initialize spiram interface/hardware. Normally called from cpu_start.c.
|
* @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);
|
int rodata_flash2spiram_offset(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -20,7 +20,6 @@ components/esp_rom/include/esp32s2/rom/rsa_pss.h
|
|||||||
components/esp_common/include/esp_private/
|
components/esp_common/include/esp_private/
|
||||||
|
|
||||||
components/esp32/include/esp32/brownout.h
|
components/esp32/include/esp32/brownout.h
|
||||||
components/esp32/include/esp32/spiram.h
|
|
||||||
components/esp32/include/esp32/cache_err_int.h
|
components/esp32/include/esp32/cache_err_int.h
|
||||||
|
|
||||||
components/driver/include/driver/sdmmc_defs.h
|
components/driver/include/driver/sdmmc_defs.h
|
||||||
|
Reference in New Issue
Block a user