From 5196818d47164996303ac65a902a1027df333bdd Mon Sep 17 00:00:00 2001
From: Caoruihong <crh.cao@huawei.com>
Date: Tue, 16 Nov 2021 01:21:00 +0800
Subject: [PATCH] chore: replace YES/NO macros to 1/0

Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: I80f8b23cac10bc714dea921ed1fd43b687ce3748
---
 arch/xtensa/lx6/gcc/los_arch_regs.h       | 10 ----------
 testsuites/include/los_dlinkmem.h         |  4 ++--
 testsuites/include/osTest.h               |  8 ++++----
 testsuites/sample/kernel/hwi/It_los_hwi.c |  2 +-
 testsuites/sample/kernel/mem/It_los_mem.h |  2 +-
 testsuites/sample/kernel/sem/It_los_sem.c |  2 +-
 testsuites/src/osTest.c                   |  2 +-
 7 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/arch/xtensa/lx6/gcc/los_arch_regs.h b/arch/xtensa/lx6/gcc/los_arch_regs.h
index 1d730be5..3aa7d302 100644
--- a/arch/xtensa/lx6/gcc/los_arch_regs.h
+++ b/arch/xtensa/lx6/gcc/los_arch_regs.h
@@ -163,16 +163,6 @@ extern "C" {
 #define LEVEL4                                               4
 #define LEVEL5                                               5
 
-#ifdef YES
-#undef YES
-#endif
-#define YES                                                  1
-
-#ifdef NO
-#undef NO
-#endif
-#define NO                                                   0
-
 #ifdef __cplusplus
 #if __cplusplus
 }
diff --git a/testsuites/include/los_dlinkmem.h b/testsuites/include/los_dlinkmem.h
index a9788436..d4f7cdd5 100644
--- a/testsuites/include/los_dlinkmem.h
+++ b/testsuites/include/los_dlinkmem.h
@@ -38,7 +38,7 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-#if (OS_SYS_MEM_CHECK == YES)
+#if (OS_SYS_MEM_CHECK == 1)
 #define LOS_DLNK_ENABLE_ALLOC_CHECK
 #endif
 
@@ -82,7 +82,7 @@ typedef struct tagLOS_DLNK_NODE {
  * @param pool           [IN] Starting address of memory.
  * @param size           [IN] Memory size.
  *
- * @retval #OS_ERROR     ¨C1: The dynamic memory fails to be initialized.
+ * @retval #OS_ERROR     �C1: The dynamic memory fails to be initialized.
  * @retval #LOS_OK       0: The dynamic memory is successfully initialized.
  * @par Dependency:
  * <ul>
diff --git a/testsuites/include/osTest.h b/testsuites/include/osTest.h
index f3d86ccf..0aa028ee 100644
--- a/testsuites/include/osTest.h
+++ b/testsuites/include/osTest.h
@@ -188,12 +188,12 @@ extern EVENT_CB_S g_exampleEvent;
 #define TST_IT
 #endif
 
-#define TEST_PT YES
+#define TEST_PT 1
 
-#if (YES == OS_INCLUDE_DYNMEM)
-#define TEST_BIG YES
+#if (1 == OS_INCLUDE_DYNMEM)
+#define TEST_BIG 1
 #else
-#define TEST_BIG NO
+#define TEST_BIG 0
 #endif
 
 #define TASK_PRIO_TEST 25
diff --git a/testsuites/sample/kernel/hwi/It_los_hwi.c b/testsuites/sample/kernel/hwi/It_los_hwi.c
index 89758c60..3804aad7 100644
--- a/testsuites/sample/kernel/hwi/It_los_hwi.c
+++ b/testsuites/sample/kernel/hwi/It_los_hwi.c
@@ -57,7 +57,7 @@ VOID ItSuiteLosHwi()
     ItLosHwi022();
     ItLosHwi023();
     ItLosHwi024();
-#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
+#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
     ItLosHwi026();
 #endif
     ItLosHwi027();
diff --git a/testsuites/sample/kernel/mem/It_los_mem.h b/testsuites/sample/kernel/mem/It_los_mem.h
index 009281ad..1cbe1b45 100644
--- a/testsuites/sample/kernel/mem/It_los_mem.h
+++ b/testsuites/sample/kernel/mem/It_los_mem.h
@@ -44,7 +44,7 @@ extern "C" {
 #include "iCunit.h"
 #include "math.h"
 
-#define OS_MEM_WATERLINE YES
+#define OS_MEM_WATERLINE 1
 
 #define LOS_DLNK_NODE_HEAD_SIZE 0
 #define MIN_DLNK_POOL_SIZE      0
diff --git a/testsuites/sample/kernel/sem/It_los_sem.c b/testsuites/sample/kernel/sem/It_los_sem.c
index e3fda46e..3d64ec07 100644
--- a/testsuites/sample/kernel/sem/It_los_sem.c
+++ b/testsuites/sample/kernel/sem/It_los_sem.c
@@ -59,7 +59,7 @@ VOID ItSuiteLosSem(void)
     ItLosSem026();
     ItLosSem028();
     ItLosSem029();
-#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
+#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
     ItLosSem031();
 #endif
     ItLosSem032();
diff --git a/testsuites/src/osTest.c b/testsuites/src/osTest.c
index cae0c9a4..bd42741a 100644
--- a/testsuites/src/osTest.c
+++ b/testsuites/src/osTest.c
@@ -278,7 +278,7 @@ UINT32 TestHwiDelete(UINT32 hwiNum)
 VOID TestHwiClear(UINT32 hwiNum) {}
 #endif
 
-#if (LOSCFG_BASE_IPC_SEM == YES)
+#if (LOSCFG_BASE_IPC_SEM == 1)
 UINT32 TestSemDelete(UINT32 semHandle)
 {
     return LOS_SemDelete(semHandle);
-- 
GitLab