p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!265 删除exc interaction残留宏以及无用函数声明 

Merge pull request !265 from Zhaotianyu/0521
This commit is contained in:
openharmony_ci 2021-05-21 16:21:16 +08:00 committed by Gitee
parent a3cef3f176 d2f2679071
commit f5c5a69162
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/base/include/los_vm_zone.h
View File

@ -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)

6
kernel/common/los_config.h
View File

@ -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);