jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-25 07:17:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

missing PSRAM fix

Browse Source
This commit is contained in:
Jason2866 2022-08-18 10:08:53 +02:00
parent 98ea693d41
commit cdc00f2076
3 changed files with 113 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.c
View File

@ -1,44 +0,0 @@
/*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifdef ESP_PLATFORM
#include "esp_attr.h"
#include "esp_heap_caps.h"
#include "nimconfig.h"
#include "../include/esp_nimble_mem.h"
IRAM_ATTR void *nimble_platform_mem_malloc(size_t size)
{
#ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
return heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
#elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
return heap_caps_malloc(size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
#elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
#else
return malloc(size);
#endif
}
IRAM_ATTR void *nimble_platform_mem_calloc(size_t n, size_t size)
{
#ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
return heap_caps_calloc(n, size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
#elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
return heap_caps_calloc(n, size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
#elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
#else
return calloc(n, size);
#endif
}
IRAM_ATTR void nimble_platform_mem_free(void *ptr)
{
heap_caps_free(ptr);
}
#endif

53
lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.cpp Normal file
View File

@ -0,0 +1,53 @@
/*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifdef ESP_PLATFORM
#include "esp_attr.h"
#include "esp_heap_caps.h"
#include "nimconfig.h"
#include "../include/esp_nimble_mem.h"
//Tasmota Patch
extern void *special_malloc(uint32_t size);
extern void *special_calloc(size_t num, size_t size);
extern "C" {
IRAM_ATTR void *nimble_platform_mem_malloc(size_t size)
{
return special_malloc((uint32_t)size);
// #ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
// return heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
// return heap_caps_malloc(size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
// return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
// #else
// return malloc(size);
// #endif
}
IRAM_ATTR void *nimble_platform_mem_calloc(size_t n, size_t size)
{
return special_calloc(n,size);
// #ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
// return heap_caps_calloc(n, size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
// return heap_caps_calloc(n, size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
// return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
// #else
// return calloc(n, size);
// #endif
}
IRAM_ATTR void nimble_platform_mem_free(void *ptr)
{
heap_caps_free(ptr);
}
} //extern "C"
#endif

60
lib/libesp32_div/NimBLE-Arduino/tasmota_lib_changes.md
View File

@ -24,3 +24,63 @@ Change in nimconfig.h
`#define CONFIG_BT_NIMBLE_NVS_PERSIST 1` `#define CONFIG_BT_NIMBLE_NVS_PERSIST 1`
to to
`#define CONFIG_BT_NIMBLE_NVS_PERSIST 0` `#define CONFIG_BT_NIMBLE_NVS_PERSIST 0`
Rename /src/nimble/esp_port/port/src/esp_nimble_mem.c to esp_nimble_mem.c
and replace all in the file with
```
/*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifdef ESP_PLATFORM
#include "esp_attr.h"
#include "esp_heap_caps.h"
#include "nimconfig.h"
#include "../include/esp_nimble_mem.h"
//Tasmota Patch
extern void *special_malloc(uint32_t size);
extern void *special_calloc(size_t num, size_t size);
extern "C" {
IRAM_ATTR void *nimble_platform_mem_malloc(size_t size)
{
return special_malloc((uint32_t)size);
// #ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
// return heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
// return heap_caps_malloc(size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
// return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
// #else
// return malloc(size);
// #endif
}
IRAM_ATTR void *nimble_platform_mem_calloc(size_t n, size_t size)
{
return special_calloc(n,size);
// #ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
// return heap_caps_calloc(n, size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
// return heap_caps_calloc(n, size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
// return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
// #else
// return calloc(n, size);
// #endif
}
IRAM_ATTR void nimble_platform_mem_free(void *ptr)
{
heap_caps_free(ptr);
}
} //extern "C"
#endif
```