kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 06:23:53 +01:00
Code Releases Activity

cpu/esp_common/syscalls: enable multiheap for SPI RAM

Browse Source 
For ESP8266, the `heap_caps_*_default` functions are simply mapped to the corresponding `heap_caps_*` functions because SPI RAM is not supported. But for ESP32x, where SPI RAM might be enabled, the implementation of the `heap_caps_*_default` functions of the ESP-IDF must be used, as these try to allocate memory blocks smaller than `CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL` from the internal memory first. This is important for some control data structures that must be located in the internal memory, such as the NVS partition table, in order to avoid access conflicts between SPI RAM and SPI flash memory.
This commit is contained in:
Gunar Schorcht 2025-05-30 09:08:23 +02:00
parent 3a81390b2a
commit 545d0ab2fd
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cpu/esp_common/syscalls.c
View File

@ -33,9 +33,16 @@
#include "syscalls.h"
#ifdef MODULE_ESP_IDF_HEAP
#include "esp_heap_caps.h"
# include "esp_heap_caps.h"
# ifndef CPU_ESP8266 /* for all ESP32x SoCs */
# define MULTI_HEAP_FREERTOS /* allow multi-heap */
# include "heap/multi_heap_platform.h" /* use multi-heap and */
# include "heap/heap_private.h" /* use the `heaps_cap_*_default` functions */
# endif
#else
#include "malloc.h"
# include "malloc.h"
#endif
#define ENABLE_DEBUG 0
@ -328,8 +335,19 @@ void IRAM_ATTR _lock_release_recursive(_lock_t *lock)
#ifdef MODULE_ESP_IDF_HEAP
#define heap_caps_malloc_default(s) heap_caps_malloc(s, MALLOC_CAP_DEFAULT)
#define heap_caps_realloc_default(p, s) heap_caps_realloc(p, s, MALLOC_CAP_DEFAULT)
/* For ESP8266, the `heap_caps_*_default` functions are simply mapped to the
* corresponding `heap_caps_*` functions because SPI RAM is not supported.
* But for ESP32x, where SPI RAM might be enabled, the implementation of the
* `heap_caps_*_default` functions of the ESP-IDF must be used, as these try
* to allocate memory blocks smaller than `CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL`
* from the internal memory first. This is important for some control data
* structures that must be located in the internal memory, such as the NVS
* partition table, in order to avoid access conflicts between SPI RAM and
* SPI flash memory. */
# ifdef CPU_ESP8266
# define heap_caps_malloc_default(s) heap_caps_malloc(s, MALLOC_CAP_DEFAULT)
# define heap_caps_realloc_default(p, s) heap_caps_realloc(p, s, MALLOC_CAP_DEFAULT)
# endif
void* IRAM_ATTR __wrap__malloc_r(struct _reent *r, size_t size)
{