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

!466 修改csky和xtensa架构的g_intCount变量使用 

Merge pull request !466 from ouyk/modify_g_intCount
This commit is contained in:
openharmony_ci 2021-12-16 08:01:06 +00:00 committed by Gitee
parent d03b490d3d d6aa3bf44b
commit 91e5b3054e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/csky/v2/gcc/los_interrupt.c
View File

@ -287,7 +287,7 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
UINT32 intSave; UINT32 intSave;
intSave = LOS_IntLock(); intSave = LOS_IntLock();
g_intCount = TRUE; g_intCount++;
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
hwiIndex = HalIntNumGet(); hwiIndex = HalIntNumGet();
@ -310,7 +310,7 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
OsHookCall(LOS_HOOK_TYPE_ISR_EXIT, hwiIndex); OsHookCall(LOS_HOOK_TYPE_ISR_EXIT, hwiIndex);
intSave = LOS_IntLock(); intSave = LOS_IntLock();
g_intCount = FALSE; g_intCount--;
HalIrqEndCheckNeedSched(); HalIrqEndCheckNeedSched();
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
} }

8
arch/xtensa/lx6/gcc/los_interrupt.c
View File

@ -42,7 +42,7 @@
#include "los_membox.h" #include "los_membox.h"
#include "los_arch_regs.h" #include "los_arch_regs.h"
UINT32 g_intCount = FALSE; UINT32 g_intCount = 0;
/* * /* *
* @ingroup los_hwi * @ingroup los_hwi
@ -236,7 +236,7 @@ UINT32 HalIrqClear(HWI_HANDLE_T vector)
INLINE UINT32 HalIsIntActive(VOID) INLINE UINT32 HalIsIntActive(VOID)
{ {
return (g_intCount == TRUE); return (g_intCount > 0);
} }
/* **************************************************************************** /* ****************************************************************************
@ -276,7 +276,7 @@ VOID HalInterrupt(VOID)
UINT32 intSave; UINT32 intSave;
intSave = LOS_IntLock(); intSave = LOS_IntLock();
g_intCount = TRUE; g_intCount++;
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
hwiIndex = HalIntNumGet(); hwiIndex = HalIntNumGet();
@ -301,7 +301,7 @@ VOID HalInterrupt(VOID)
OsHookCall(LOS_HOOK_TYPE_ISR_EXIT, hwiIndex); OsHookCall(LOS_HOOK_TYPE_ISR_EXIT, hwiIndex);
intSave = LOS_IntLock(); intSave = LOS_IntLock();
g_intCount = FALSE; g_intCount--;
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
HalIrqEndCheckNeedSched(); HalIrqEndCheckNeedSched();
} }