From 3e65883a7f6e8e14869c56268c42a76d4aa49efe Mon Sep 17 00:00:00 2001 From: Wang_Weigen Date: Sat, 29 May 2021 14:07:00 +0800 Subject: [PATCH] fix a bug --- kernel/kernel_test/Makefile | 4 +++- kernel/memory/byte_manage.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/kernel_test/Makefile b/kernel/kernel_test/Makefile index 820f29e97..e1daf45c1 100644 --- a/kernel/kernel_test/Makefile +++ b/kernel/kernel_test/Makefile @@ -1,5 +1,4 @@ SRC_FILES := test_main.c -SRC_FILES += extsram_test.c ifeq ($(CONFIG_KERNEL_TEST_SEM),y) SRC_FILES += test_sem.c @@ -32,6 +31,9 @@ endif ifeq ($(CONFIG_KERNEL_TEST_MEM),y) SRC_FILES += test_mem.c SRC_FILES += test_gatherblock.c +ifeq ($(CONFIG_MEM_EXTERN_SRAM),y) + SRC_FILES += extsram_test.c +endif endif ifeq ($(CONFIG_KERNEL_TEST_TIMER),y) diff --git a/kernel/memory/byte_manage.c b/kernel/memory/byte_manage.c index bff3b6104..78913de06 100644 --- a/kernel/memory/byte_manage.c +++ b/kernel/memory/byte_manage.c @@ -668,8 +668,9 @@ void *x_malloc(x_size_t size) ret = ByteManager.dynamic_buddy_manager.done->malloc(&ByteManager.dynamic_buddy_manager, size, DYNAMIC_BLOCK_NO_EXTMEM_MASK); if(ret != NONE) CHECK(ByteManager.dynamic_buddy_manager.done->JudgeLegal(&ByteManager.dynamic_buddy_manager, ret - SIZEOF_DYNAMICALLOCNODE_MEM)); -try_extmem: + #ifdef MEM_EXTERN_SRAM +try_extmem: if(NONE == ret) { for(i = 0; i < EXTSRAM_MAX_NUM; i++) { if(NONE != ExtByteManager[i].done) { @@ -956,8 +957,9 @@ void *x_umalloc(x_size_t size) if(ret != NONE) CHECK(UserByteManager.dynamic_buddy_manager.done->JudgeLegal(&UserByteManager.dynamic_buddy_manager, ret - SIZEOF_DYNAMICALLOCNODE_MEM)); -try_extmem: + #ifdef MEM_EXTERN_SRAM +try_extmem: if(NONE == ret) { for(i = 0; i < EXTSRAM_MAX_NUM; i++) { if(NONE != ExtByteManager[i].done) {