diff --git a/furi/core/memmgr.c b/furi/core/memmgr.c index bb1040343..6c8937850 100644 --- a/furi/core/memmgr.c +++ b/furi/core/memmgr.c @@ -38,7 +38,7 @@ char* strdup(const char* s) { return y; } -void* aligned_malloc(size_t size, size_t alignment) { +void* aligned_alloc(size_t size, size_t alignment) { return pvPortAllocAligned(size, alignment); } diff --git a/furi/core/memmgr.h b/furi/core/memmgr.h index d38633118..796a1f537 100644 --- a/furi/core/memmgr.h +++ b/furi/core/memmgr.h @@ -35,14 +35,6 @@ size_t memmgr_get_total_heap(void); */ size_t memmgr_get_minimum_free_heap(void); -/** - * An aligned version of malloc, used when you need to get the aligned space on the heap. - * @param size - * @param alignment - * @return void* - */ -void* aligned_malloc(size_t size, size_t alignment); - /** * @brief Allocate memory from the auxiliary memory pool. That memory can't be freed. * diff --git a/lib/flipper_application/elf/elf_file.c b/lib/flipper_application/elf/elf_file.c index 4d36f3460..80d86b637 100644 --- a/lib/flipper_application/elf/elf_file.c +++ b/lib/flipper_application/elf/elf_file.c @@ -461,7 +461,7 @@ static bool elf_load_section_data(ELFFile* elf, ELFSection* section, Elf32_Shdr* return true; } - section->data = aligned_malloc(section_header->sh_size, section_header->sh_addralign); + section->data = aligned_alloc(section_header->sh_size, section_header->sh_addralign); section->size = section_header->sh_size; if(section_header->sh_type == SHT_NOBITS) { diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv index ea4d997ac..195a36702 100644 --- a/targets/f18/api_symbols.csv +++ b/targets/f18/api_symbols.csv @@ -514,8 +514,7 @@ Function,-,acosh,double,double 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_malloc,void*,"size_t, size_t" +Function,+,aligned_alloc,void*,"size_t, size_t" Function,-,arc4random,__uint32_t, Function,-,arc4random_buf,void,"void*, size_t" Function,-,arc4random_uniform,__uint32_t,__uint32_t diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index cf1eb642d..d381e350f 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -583,8 +583,7 @@ Function,-,acosh,double,double 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_malloc,void*,"size_t, size_t" +Function,+,aligned_alloc,void*,"size_t, size_t" Function,-,arc4random,__uint32_t, Function,-,arc4random_buf,void,"void*, size_t" Function,-,arc4random_uniform,__uint32_t,__uint32_t