From d2f26790716c9f76589c4a7d6fa5518f9ccd743c Mon Sep 17 00:00:00 2001 From: arvinzzz Date: Fri, 21 May 2021 15:10:05 +0800 Subject: [PATCH] fix: Delete useless 'exc interaction' macros and function declarations. close: #I3SDKY Change-Id: I5ed9356ce2b55b6e07c3f192cdbc4a4f6fbfaa58 --- kernel/base/include/los_vm_zone.h | 2 -- kernel/common/los_config.h | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/kernel/base/include/los_vm_zone.h b/kernel/base/include/los_vm_zone.h index 688d5edd..e69cf774 100644 --- a/kernel/base/include/los_vm_zone.h +++ b/kernel/base/include/los_vm_zone.h @@ -54,8 +54,6 @@ extern "C" { #define SYS_MEM_BASE DDR_MEM_ADDR #define SYS_MEM_END (SYS_MEM_BASE + SYS_MEM_SIZE_DEFAULT) -#define EXC_INTERACT_MEM_SIZE 0x100000 - #define _U32_C(X) X##U #define U32_C(X) _U32_C(X) diff --git a/kernel/common/los_config.h b/kernel/common/los_config.h index ad44d41b..520bf56a 100644 --- a/kernel/common/los_config.h +++ b/kernel/common/los_config.h @@ -320,9 +320,6 @@ extern UINT32 __heap_end; /****************************** Memory module configuration **************************/ -#ifndef OS_EXC_INTERACTMEM_SIZE -#define OS_EXC_INTERACTMEM_SIZE (EXC_INTERACT_MEM_SIZE) -#endif /** * @ingroup los_config * Starting address of the system memory @@ -337,7 +334,7 @@ extern UINT32 __heap_end; */ #ifndef OS_SYS_MEM_SIZE #define OS_SYS_MEM_SIZE \ - ((OS_SYS_FUNC_ADDR_END) - ((OS_EXC_INTERACTMEM_SIZE + ((UINTPTR)&__bss_end) + (64 - 1)) & ~(64 - 1))) + ((OS_SYS_FUNC_ADDR_END) - (((UINTPTR)&__bss_end + (64 - 1)) & ~(64 - 1))) #endif /****************************** SMP module configuration **************************/ @@ -473,7 +470,6 @@ typedef VOID (*log_read_write_fn)(UINT32 startAddr, UINT32 space, UINT32 rwFlag, VOID LOS_ExcInfoRegHook(UINT32 startAddr, UINT32 space, CHAR *buf, log_read_write_fn hook); #endif -extern VOID OsStart(VOID); extern INT32 OsMain(VOID); typedef VOID (*SystemRebootFunc)(VOID); -- GitLab