OpenXX/xiuos
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add APP_Framework/Framework/connection function

Browse Source
This commit is contained in:
Liu_Weichao
2021-06-17 16:18:07 +08:00
parent fba573cc0b
commit 86ef526303
10 changed files with 106 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ubiquitous/XiUOS/kernel/memory/byte_manage.c
-4
View File
@@ -953,11 +953,7 @@ void *x_umalloc(x_size_t size)
lock = CriticalAreaLock();
/* alignment */
size = ALIGN_MEN_UP(size, MEM_ALIGN_SIZE);
<<<<<<< HEAD
ret = UserByteManager.dynamic_buddy_manager.done->malloc(&UserByteManager.dynamic_buddy_manager,size, DYNAMIC_BLOCK_NO_EXTMEM_MASK);
=======
ret = UserByteManager.dynamic_buddy_manager.done->malloc(&UserByteManager.dynamic_buddy_manager,size,DYNAMIC_BLOCK_NO_EXTMEM_MASK);
>>>>>>> 0ddb5bfd1f2d80ec762bd2627d04c60da063e9fc
if(ret != NONE)
CHECK(UserByteManager.dynamic_buddy_manager.done->JudgeLegal(&UserByteManager.dynamic_buddy_manager, ret - SIZEOF_DYNAMICALLOCNODE_MEM));