From 7d50f4b5a7ea54d94bc18a10d67460c8cfbe0577 Mon Sep 17 00:00:00 2001 From: SG Date: Tue, 11 Jun 2024 14:43:30 +0100 Subject: [PATCH] remove tlsf submodule --- .gitmodules | 3 --- furi/core/thread.c | 4 ++-- lib/tlsf | 1 - targets/f7/api_symbols.csv | 10 ++++------ 4 files changed, 6 insertions(+), 12 deletions(-) delete mode 160000 lib/tlsf diff --git a/.gitmodules b/.gitmodules index 55c1535ff..c4c68a6a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -41,6 +41,3 @@ [submodule "documentation/doxygen/doxygen-awesome-css"] path = documentation/doxygen/doxygen-awesome-css url = https://github.com/jothepro/doxygen-awesome-css.git -[submodule "lib/tlsf"] - path = lib/tlsf - url = https://github.com/flipperdevices/tlsf.git diff --git a/furi/core/thread.c b/furi/core/thread.c index db4b7bc80..f37db35d7 100644 --- a/furi/core/thread.c +++ b/furi/core/thread.c @@ -163,11 +163,11 @@ FuriThread* furi_thread_alloc_service( uint32_t stack_size, FuriThreadCallback callback, void* context) { - FuriThread* thread = memmgr_alloc_from_pool(sizeof(FuriThread)); + FuriThread* thread = memmgr_aux_pool_alloc(sizeof(FuriThread)); furi_thread_init_common(thread); - thread->stack_buffer = memmgr_alloc_from_pool(stack_size); + thread->stack_buffer = memmgr_aux_pool_alloc(stack_size); thread->stack_size = stack_size; thread->is_service = true; diff --git a/lib/tlsf b/lib/tlsf deleted file mode 160000 index 8fc595fe2..000000000 --- a/lib/tlsf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8fc595fe223cd0b3b5d7b29eb86825e4bd38e6e8 diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index 85150a58b..fc33f8b18 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,64.2,, +Version,+,65.0,, Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt_keys_storage.h,, @@ -598,8 +598,6 @@ Function,-,acoshf,float,float Function,-,acoshl,long double,long double Function,-,acosl,long double,long double Function,-,aligned_alloc,void*,"size_t, size_t" -Function,+,aligned_free,void,void* -Function,+,aligned_malloc,void*,"size_t, size_t" Function,-,arc4random,__uint32_t, Function,-,arc4random_buf,void,"void*, size_t" Function,-,arc4random_uniform,__uint32_t,__uint32_t @@ -2425,7 +2423,8 @@ Function,+,memchr,void*,"const void*, int, size_t" Function,+,memcmp,int,"const void*, const void*, size_t" Function,+,memcpy,void*,"void*, const void*, size_t" Function,-,memmem,void*,"const void*, size_t, const void*, size_t" -Function,-,memmgr_alloc_from_pool,void*,size_t +Function,+,memmgr_aux_pool_alloc,void*,size_t +Function,+,memmgr_aux_pool_get_free,size_t, Function,+,memmgr_get_free_heap,size_t, Function,+,memmgr_get_minimum_free_heap,size_t, Function,+,memmgr_get_total_heap,size_t, @@ -2433,8 +2432,7 @@ Function,+,memmgr_heap_disable_thread_trace,void,FuriThreadId Function,+,memmgr_heap_enable_thread_trace,void,FuriThreadId Function,+,memmgr_heap_get_max_free_block,size_t, Function,+,memmgr_heap_get_thread_memory,size_t,FuriThreadId -Function,+,memmgr_heap_printf_free_blocks,void, -Function,-,memmgr_pool_get_free,size_t, +Function,+,memmgr_heap_walk_blocks,void,"BlockWalker, void*" Function,-,memmgr_pool_get_max_block,size_t, Function,+,memmove,void*,"void*, const void*, size_t" Function,-,mempcpy,void*,"void*, const void*, size_t"