diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-09-26 11:23:53 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-09-26 11:23:53 +1000 |
| commit | f6d06421090f88094aba76b72b04d614f54efafa (patch) | |
| tree | 6eabf0f6a9f69773289eb4ae616c9f1d771db9c3 /src/util | |
| parent | 2849399d5470bcd9646bf6a4f0f861e3029a5135 (diff) | |
| download | tangara-fw-f6d06421090f88094aba76b72b04d614f54efafa.tar.gz | |
Prepare for PMR with a memory_resource that understands heap_caps_malloc
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/util/allocator.cpp | 29 |
2 files changed, 1 insertions, 33 deletions
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 913512a2..e1913920 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -2,7 +2,4 @@ # # SPDX-License-Identifier: GPL-3.0-only -idf_component_register( - SRCS "allocator.cpp" - INCLUDE_DIRS "include" - REQUIRES "database") +idf_component_register(SRCS INCLUDE_DIRS "include" REQUIRES "database") diff --git a/src/util/allocator.cpp b/src/util/allocator.cpp deleted file mode 100644 index d505ab3e..00000000 --- a/src/util/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 > 256) { - 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); -}
\ No newline at end of file |