yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!135 watchdog没有用宏隔离 

Merge pull request !135 from SimonLi/watchdog_bugfix
This commit is contained in:
openharmony_ci 2021-04-16 08:45:52 +08:00 committed by Gitee
parent 7332c00077 fdae508932
commit b56c8392fd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/base/misc/panic_shellcmd.c
View File

@ -46,6 +46,12 @@ extern "C" {
#ifdef LOSCFG_SHELL_CMD_DEBUG #ifdef LOSCFG_SHELL_CMD_DEBUG
STATIC BOOL systemExcReset = FALSE; STATIC BOOL systemExcReset = FALSE;
LITE_OS_SEC_TEXT_MINOR BOOL OsSystemExcIsReset(VOID)
{
return systemExcReset;
}
#ifdef LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG
#define WATCHDOG_TIMER_INTERVAL 5 // 5 seconds #define WATCHDOG_TIMER_INTERVAL 5 // 5 seconds
#define WATCHDOG_TIMER_INTERVAL_HALF (WATCHDOG_TIMER_INTERVAL / 2) #define WATCHDOG_TIMER_INTERVAL_HALF (WATCHDOG_TIMER_INTERVAL / 2)
@ -91,11 +97,6 @@ STATIC void StopWatchdog(void)
g_wdStarted = FALSE; g_wdStarted = FALSE;
} }
LITE_OS_SEC_TEXT_MINOR BOOL OsSystemExcIsReset(VOID)
{
return systemExcReset;
}
LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdSystemExcReset(INT32 argc, const CHAR **argv) LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdSystemExcReset(INT32 argc, const CHAR **argv)
{ {
if (argc != 1) { if (argc != 1) {
@ -123,6 +124,7 @@ EXC_RESET_HELP:
SHELLCMD_ENTRY(panic_reset_shellcmd, CMD_TYPE_EX, "panicreset", 1, (CmdCallBackFunc)OsShellCmdSystemExcReset); SHELLCMD_ENTRY(panic_reset_shellcmd, CMD_TYPE_EX, "panicreset", 1, (CmdCallBackFunc)OsShellCmdSystemExcReset);
#endif #endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus