summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorHanhui <sylixos@gmail.com>2019-05-23 05:30:57 (GMT)
committer Hanhui <sylixos@gmail.com>2019-04-18 15:50:22 (GMT)
commitc31e4a1d92f9c05298abdd14b2dac1ee4b4e9c1d (patch)
tree2e6acd6c2c4bf91cec66894914a0de4ec0290865
parent869b827123371741d5bf8d5fbf4031883d792547 (diff)
downloadAIC-OS-c31e4a1d92f9c05298abdd14b2dac1ee4b4e9c1d.zip
Fixed some defination error in DSP architecture.
-rw-r--r--SylixOS/kernel/include/k_kernel.h2
-rw-r--r--SylixOS/loader/src/loader_malloc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/SylixOS/kernel/include/k_kernel.h b/SylixOS/kernel/include/k_kernel.h
index 29b4bfe..0865ec8 100644
--- a/SylixOS/kernel/include/k_kernel.h
+++ b/SylixOS/kernel/include/k_kernel.h
@@ -51,7 +51,7 @@
#define __SYLIXOS_MAJOR_VER 1
#define __SYLIXOS_MINOR_VER 9
#define __SYLIXOS_PATCH_VER 9
-#define __SYLIXOS_PATCH_PAD 9
+#define __SYLIXOS_PATCH_PAD 10
/*********************************************************************************************************
汾ʽ
diff --git a/SylixOS/loader/src/loader_malloc.c b/SylixOS/loader/src/loader_malloc.c
index 89f86a8..0cb8e84 100644
--- a/SylixOS/loader/src/loader_malloc.c
+++ b/SylixOS/loader/src/loader_malloc.c
@@ -354,7 +354,7 @@ PVOID __ldMallocAreaAlign (size_t stLen, size_t stAlign)
LW_VMM_FLAG_EXEC | LW_VMM_FLAG_RDWR));
#else
-#ifdef defined(LW_CFG_CPU_ARCH_C6X) && (LW_CFG_C6X_CUSTOM_MEM > 0)
+#if defined(LW_CFG_CPU_ARCH_C6X) && (LW_CFG_C6X_CUSTOM_MEM > 0)
if (__ldUseBspCustomMem()) {
PVOID pvAddr = bspLibMemCustomAllocAlign(stLen, stAlign);
if (pvAddr != LW_NULL) {
@@ -389,7 +389,7 @@ VOID __ldFreeArea (PVOID pvAddr)
API_VmmFreeArea(pvAddr);
#else
-#ifdef defined(LW_CFG_CPU_ARCH_C6X) && (LW_CFG_C6X_CUSTOM_MEM > 0)
+#if defined(LW_CFG_CPU_ARCH_C6X) && (LW_CFG_C6X_CUSTOM_MEM > 0)
if (bspLibIsInMemCustom(pvAddr)) {
bspLibMemCustomFree(pvAddr);
return;