refactor: 对LiteOS_a内核中menuconfig开关的宏使用#ifdef/#ifndef做预编译处理

LiteOS_a中有部分配置宏进行了重复冗余定义,导致当头文件未被包含时,极易引入错误,
故对menuconfig配置宏进行统一处理,均使用#ifdef/#ifndef作为预编译判断方式

Close #I3YEGS

Change-Id: Ife6db770cc66de1d6199a4f3ba3950e9bfd0e71a
Signed-off-by: boxi <lewis.liulei@huawei.com>
This commit is contained in:
boxi
2021-06-29 19:34:16 +08:00
parent 5db839acef
commit 4e4f2d6d7e
265 changed files with 526 additions and 557 deletions

View File

@@ -50,7 +50,7 @@ extern "C" {
#define ARRAY_SIZE 2
#if (LOSCFG_KERNEL_SMP == YES)
#ifdef LOSCFG_KERNEL_SMP
LITE_OS_SEC_BSS SPIN_LOCK_INIT(g_testSuitSpin);
#endif
@@ -125,13 +125,13 @@ u_long ICunitRand(void)
void ICunitSaveErr(iiUINT32 line, iiUINT32 retCode)
{
#if (LOSCFG_KERNEL_SMP == YES)
#ifdef LOSCFG_KERNEL_SMP
UINT32 intSave;
TESTSUIT_LOCK(intSave);
#endif
g_iCunitErrCode = ((g_iCunitErrCode == 0) && (g_iCunitErrLineNo == 0)) ? (iiUINT32)retCode : g_iCunitErrCode;
g_iCunitErrLineNo = (g_iCunitErrLineNo == 0) ? line : g_iCunitErrLineNo;
#if (LOSCFG_KERNEL_SMP == YES)
#ifdef LOSCFG_KERNEL_SMP
TESTSUIT_UNLOCK(intSave);
#endif
}
@@ -184,7 +184,7 @@ iUINT32 ICunitAddCase(const iCHAR *caseName, CASE_FUNCTION caseFunc, iUINT16 tes
UINT32 g_cunitInitFlag = 0;
iUINT32 ICunitInit(void)
{
#if (LOSCFG_KERNEL_SMP == YES)
#ifdef LOSCFG_KERNEL_SMP
if (LOS_AtomicCmpXchg32bits(&g_cunitInitFlag, 1, 0)) {
PRINTK("other core already done iCunitInit\n");
return (iUINT32)ICUNIT_SUCCESS;

View File

@@ -259,7 +259,7 @@ void TestHwiTrigger(unsigned int irq)
VOID TestExtraTaskDelay(UINT32 tick)
{
#if (LOSCFG_KERNEL_SMP == YES)
#ifdef LOSCFG_KERNEL_SMP
// trigger task schedule may occor on another core
// needs adding delay and checking status later
LOS_TaskDelay(tick);
@@ -327,7 +327,7 @@ VOID TestTestHwiDelete(unsigned int irq, VOID *devId)
VOID TestDumpCpuid(VOID)
{
#if (LOSCFG_KERNEL_SMP == YES)
#ifdef LOSCFG_KERNEL_SMP
PRINT_DEBUG("%d,cpuid = %d\n", LOS_CurTaskIDGet(), ArchCurrCpuid());
#endif
return;
@@ -530,7 +530,7 @@ void TestSystemInit(void)
testProcess = OS_PCB_FROM_PID(pid);
g_testTskHandle = testProcess->threadGroupID;
#if (LOSCFG_KERNEL_SMP == YES)
#ifdef LOSCFG_KERNEL_SMP
((LosTaskCB *)OS_TCB_FROM_TID(g_testTskHandle))->cpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid());
#endif
}