blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-04-01 20:30:09 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/wifi_internal_memory_v3.2' into 'release/v3.2'

Browse Source 
wifi: Include DMA reserved pool when allocating internal-only memory (v3.2)

See merge request espressif/esp-idf!6629
This commit is contained in:
Jiang Jiang Jian 2019-12-12 13:53:14 +08:00
commit 32f2e7f509
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/bt.c
View File

@ -750,7 +750,7 @@ static int IRAM_ATTR cause_sw_intr_to_core_wrapper(int core_id, int intr_no)
static void *malloc_internal_wrapper(size_t size) static void *malloc_internal_wrapper(size_t size)
{ {
return heap_caps_malloc(size, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL); return heap_caps_malloc(size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
} }
static int32_t IRAM_ATTR read_mac_wrapper(uint8_t mac[6]) static int32_t IRAM_ATTR read_mac_wrapper(uint8_t mac[6])

8
components/esp32/esp_adapter.c
View File

@ -405,22 +405,22 @@ static int get_time_wrapper(void *t)
static void * IRAM_ATTR malloc_internal_wrapper(size_t size) static void * IRAM_ATTR malloc_internal_wrapper(size_t size)
{ {
return heap_caps_malloc(size, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL); return heap_caps_malloc(size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
} }
static void * IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size) static void * IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
{ {
return heap_caps_realloc(ptr, size, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL); return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
} }
static void * IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size) static void * IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
{ {
return heap_caps_calloc(n, size, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL); return heap_caps_calloc(n, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
} }
static void * IRAM_ATTR zalloc_internal_wrapper(size_t size) static void * IRAM_ATTR zalloc_internal_wrapper(size_t size)
{ {
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL); void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
if (ptr) { if (ptr) {
memset(ptr, 0, size); memset(ptr, 0, size);
} }