diff options
| -rw-r--r-- | sdkconfig.common | 2 | ||||
| -rw-r--r-- | src/memory/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/memory/allocator.cpp | 29 |
3 files changed, 2 insertions, 31 deletions
diff --git a/sdkconfig.common b/sdkconfig.common index 18a01fc2..b571d36b 100644 --- a/sdkconfig.common +++ b/sdkconfig.common @@ -49,7 +49,7 @@ CONFIG_ESP32_REV_MIN_3=y CONFIG_ESP_PHY_REDUCE_TX_POWER=y CONFIG_PM_ENABLE=y CONFIG_SPIRAM=y -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=8192 +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY=y diff --git a/src/memory/CMakeLists.txt b/src/memory/CMakeLists.txt index bd162e18..beee7399 100644 --- a/src/memory/CMakeLists.txt +++ b/src/memory/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-3.0-only idf_component_register( - SRCS "memory_resource.cpp" "allocator.cpp" + SRCS "memory_resource.cpp" INCLUDE_DIRS "include" REQUIRES "esp_psram") target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS}) diff --git a/src/memory/allocator.cpp b/src/memory/allocator.cpp deleted file mode 100644 index aaee08f8..00000000 --- a/src/memory/allocator.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2023 jacqueline <me@jacqueline.id.au> - * - * SPDX-License-Identifier: GPL-3.0-only - */ - -#include <cstdint> - -#include "esp_heap_caps.h" - -void* operator new[](std::size_t sz) { - if (sz == 0) { - ++sz; // avoid std::malloc(0) which may return nullptr on success - } - - if (sz > 512) { - return heap_caps_malloc(sz, MALLOC_CAP_SPIRAM); - } - - return heap_caps_malloc(sz, MALLOC_CAP_DEFAULT); -} - -void operator delete[](void* ptr) noexcept { - heap_caps_free(ptr); -} - -void operator delete[](void* ptr, std::size_t size) noexcept { - heap_caps_free(ptr); -} |