Compare commits

..

4 Commits

Author SHA1 Message Date
openharmony_ci
6babf78a8d !1048 kconfig增加shell StackSize大小的设置
Merge pull request !1048 from 乔克叔叔/cherry-pick-1681111046
2023-04-13 14:27:36 +00:00
openharmony_ci
18d07a809a !1049 回退los_panic相关修改
Merge pull request !1049 from wangchen/0412_back
2023-04-12 09:15:15 +00:00
wangchen
6d2dbdf0e8 fix: 回退los_panic相关修改
方案描述:
1, 暂时回退https://gitee.com/openharmony/kernel_liteos_m/pulls/1035的修改
fix #I6V3U5
Signed-off-by: wangchen <wangchen240@huawei.com>
2023-04-12 16:27:41 +08:00
nkj
ee9d5daeca fixed 088f88c from https://gitee.com/wenxin-liu_admin/kernel_liteos_m/pulls/991
feat: kconfig增加shell StackSize大小的设置

BREAKING CHANGE:

kconfig增加shell StackSize大小的设置:

新增配置项

Close #I6KHRF
Signed-off-by: nkj <tkyl01@yeah.net>
Change-Id: I9d3a7e7933a01a0f1ad2199c82825cc471c623b0

Change-Id: I0d732e0270ae6dc354aec05f2a50f9439550accb
2023-04-10 16:32:23 +08:00
4 changed files with 15 additions and 9 deletions

View File

@@ -19,6 +19,11 @@ config SHELL_PRIO
range 1 31
depends on SHELL
config SHELL_STACK_SIZE
int "Shell Task Stack Size"
default 4096
depends on SHELL
config SHELL_LK
bool "Enable Shell lk"
default y

View File

@@ -258,7 +258,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LosShellInit(VOID)
}
task1.pfnTaskEntry = (TSK_ENTRY_FUNC)ShellTaskEntry;
task1.uwStackSize = 0x1000;
task1.uwStackSize = LOSCFG_SHELL_STACK_SIZE;
task1.pcName = "ShellTaskEntry";
task1.usTaskPrio = LOSCFG_SHELL_PRIO;
ret = LOS_TaskCreate(&taskID1, &task1);

View File

@@ -679,6 +679,14 @@ extern UINT8 *m_aucSysMem0;
#define LOSCFG_KERNEL_PM_IDLE 0
#endif
/**
* @ingroup los_config
* Configuration item to set shell stack size.
*/
#ifndef LOSCFG_SHELL_STACK_SIZE
#define LOSCFG_SHELL_STACK_SIZE 0x1000
#endif
#ifdef __cplusplus
#if __cplusplus
}

View File

@@ -37,7 +37,6 @@
#include "los_mux.h"
#include "los_queue.h"
#include "los_sem.h"
#include "securec.h"
#if (LOSCFG_PLATFORM_HWI == 1)
#include "los_interrupt.h"
@@ -96,8 +95,6 @@
#include "los_trace_pri.h"
#endif
#define BUFSIZE 256
/*****************************************************************************
Function : LOS_Reboot
Description : system exception, die in here, wait for watchdog.
@@ -113,14 +110,10 @@ LITE_OS_SEC_TEXT_INIT VOID LOS_Reboot(VOID)
LITE_OS_SEC_TEXT_INIT VOID LOS_Panic(const CHAR *fmt, ...)
{
char buf[BUFSIZE] = { 0 };
va_list ap;
va_start(ap, fmt);
int len = vsnprintf_s(buf, sizeof(buf), BUFSIZE - 1, fmt, ap);
PRINT_ERR(fmt, ap);
va_end(ap);
if (len > 0) {
PRINT_ERR("%s\n", buf);
}
OsDoExcHook(EXC_PANIC);
#if (LOSCFG_BACKTRACE_TYPE != 0)
LOS_BackTrace();