mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-17 04:34:44 -07:00
merge upcoming changes
This commit is contained in:
@@ -187,8 +187,12 @@ void* pvPortMalloc(size_t xSize) {
|
||||
// allocate block
|
||||
void* data = tlsf_malloc(tlsf, xSize);
|
||||
if(data == NULL) {
|
||||
if(xSize == 0) {
|
||||
furi_crash("malloc(0)");
|
||||
} else {
|
||||
furi_crash("out of memory");
|
||||
}
|
||||
}
|
||||
|
||||
// update heap usage
|
||||
heap_used += tlsf_block_size(data);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
entry,status,name,type,params
|
||||
Version,+,60.5,,
|
||||
Version,+,61.0,,
|
||||
Header,+,applications/services/bt/bt_service/bt.h,,
|
||||
Header,+,applications/services/cli/cli.h,,
|
||||
Header,+,applications/services/cli/cli_vcp.h,,
|
||||
@@ -1980,7 +1980,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_heap_walk_blocks,void,"BlockWalker, void*"
|
||||
Function,-,memmgr_pool_get_free,size_t,
|
||||
Function,-,memmgr_pool_get_max_block,size_t,
|
||||
Function,+,memmove,void*,"void*, const void*, size_t"
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
entry,status,name,type,params
|
||||
Version,+,60.5,,
|
||||
Version,+,61.0,,
|
||||
Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
|
||||
Header,+,applications/services/bt/bt_service/bt.h,,
|
||||
Header,+,applications/services/cli/cli.h,,
|
||||
@@ -2371,7 +2371,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_heap_walk_blocks,void,"BlockWalker, void*"
|
||||
Function,-,memmgr_pool_get_free,size_t,
|
||||
Function,-,memmgr_pool_get_max_block,size_t,
|
||||
Function,+,memmove,void*,"void*, const void*, size_t"
|
||||
|
||||
|
Reference in New Issue
Block a user