diff --git a/components/dynlink/los_dynlink.c b/components/dynlink/los_dynlink.c index 8d503a85..145aa0de 100644 --- a/components/dynlink/los_dynlink.c +++ b/components/dynlink/los_dynlink.c @@ -41,12 +41,6 @@ #include "los_debug.h" #include "los_mux.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - #if (LOSCFG_DYNLINK == 1) #if defined(__ICCARM__) || defined(__CC_ARM) @@ -929,10 +923,3 @@ INT32 LOS_DynlinkInit(VOID) } #endif /* LOSCFG_DYNLINK */ - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ - diff --git a/components/trace/cnv/trace_cnv.c b/components/trace/cnv/trace_cnv.c index 30416334..b537a08d 100644 --- a/components/trace/cnv/trace_cnv.c +++ b/components/trace/cnv/trace_cnv.c @@ -39,12 +39,6 @@ #include "los_swtmr.h" #include "los_hook.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - STATIC VOID LOS_TraceMemInit(VOID *pool, UINT32 size) { LOS_TRACE(MEM_INFO_REQ, pool); @@ -264,9 +258,3 @@ VOID OsTraceCnvInit(VOID) LOS_HookReg(LOS_HOOK_TYPE_SWTMR_START, LOS_TraceSwtmrStart); LOS_HookReg(LOS_HOOK_TYPE_SWTMR_STOP, LOS_TraceSwtmrStop); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/components/trace/los_trace.c b/components/trace/los_trace.c index 23241e87..4abc3900 100644 --- a/components/trace/los_trace.c +++ b/components/trace/los_trace.c @@ -45,12 +45,6 @@ #include "shell.h" #endif -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - #if (LOSCFG_KERNEL_TRACE == 1) LITE_OS_SEC_BSS STATIC UINT32 g_traceEventCount; LITE_OS_SEC_BSS STATIC volatile enum TraceState g_traceState = TRACE_UNINIT; @@ -426,9 +420,3 @@ SHELLCMD_ENTRY(tracedump_shellcmd, CMD_TYPE_EX, "trace_dump", 1, (CmdCallBack #endif #endif /* LOSCFG_KERNEL_TRACE == 1 */ - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/components/trace/pipeline/serial/trace_pipeline_serial.c b/components/trace/pipeline/serial/trace_pipeline_serial.c index b7131e7c..49abecf3 100644 --- a/components/trace/pipeline/serial/trace_pipeline_serial.c +++ b/components/trace/pipeline/serial/trace_pipeline_serial.c @@ -32,12 +32,6 @@ #include "trace_pipeline_serial.h" #include "trace_pipeline.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - #if (LOSCFG_TRACE_CONTROL_AGENT == 1) UINT32 SerialPipelineInit(VOID) { @@ -93,9 +87,3 @@ UINT32 OsTracePipelineInit(VOID) OsTracePipelineReg(&g_serialOps); return g_serialOps.init(); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/components/trace/pipeline/trace_pipeline.c b/components/trace/pipeline/trace_pipeline.c index 1e096e2d..9ea1d221 100644 --- a/components/trace/pipeline/trace_pipeline.c +++ b/components/trace/pipeline/trace_pipeline.c @@ -33,12 +33,6 @@ #include "trace_tlv.h" #include "los_trace_pri.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - #if (LOSCFG_KERNEL_SMP == 1) LITE_OS_SEC_BSS SPIN_LOCK_INIT(g_pipeSpin); #define PIPE_LOCK(state) LOS_SpinLockSave(&g_pipeSpin, &(state)) @@ -154,9 +148,3 @@ UINT32 OsTraceDataWait(VOID) { return g_tracePipelineOps->wait(); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/components/trace/pipeline/trace_tlv.c b/components/trace/pipeline/trace_tlv.c index fd89da4c..3fbc409c 100644 --- a/components/trace/pipeline/trace_tlv.c +++ b/components/trace/pipeline/trace_tlv.c @@ -32,12 +32,6 @@ #include "trace_tlv.h" #include "securec.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - #define CRC_WIDTH 8 #define CRC_POLY 0x1021 #define CRC_TOPBIT 0x8000 @@ -114,9 +108,3 @@ UINT32 OsTraceDataEncode(UINT8 type, const TlvTable *table, UINT8 *src, UINT8 *d head->crc = crc; return len + sizeof(TraceMsgTlvHead); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/components/trace/trace_offline.c b/components/trace/trace_offline.c index 71c408bd..75602e92 100644 --- a/components/trace/trace_offline.c +++ b/components/trace/trace_offline.c @@ -32,12 +32,6 @@ #include "los_trace_pri.h" #include "trace_pipeline.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - #if (LOSCFG_RECORDER_MODE_OFFLINE == 1) #define BITS_NUM_FOR_TASK_ID 16 @@ -257,9 +251,3 @@ OfflineHead *OsTraceRecordGet(VOID) } #endif /* LOSCFG_RECORDER_MODE_OFFLINE == 1 */ - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/components/trace/trace_online.c b/components/trace/trace_online.c index 8bc2090a..41d85c06 100644 --- a/components/trace/trace_online.c +++ b/components/trace/trace_online.c @@ -32,12 +32,6 @@ #include "los_trace_pri.h" #include "trace_pipeline.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - #if (LOSCFG_RECORDER_MODE_ONLINE == 1) UINT32 OsTraceGetMaskTid(UINT32 taskId) { @@ -105,9 +99,3 @@ OfflineHead *OsTraceRecordGet(VOID) } #endif /* LOSCFG_RECORDER_MODE_ONLINE == 1 */ - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/kernel/src/los_sched.c b/kernel/src/los_sched.c index 25ffe9d8..917d6903 100644 --- a/kernel/src/los_sched.c +++ b/kernel/src/los_sched.c @@ -42,12 +42,6 @@ #include "los_debugtools.h" #endif -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - #define OS_PRIORITY_QUEUE_NUM 32 #define PRIQUEUE_PRIOR0_BIT 0x80000000U #define OS_TICK_RESPONSE_TIME_MAX LOSCFG_BASE_CORE_TICK_RESPONSE_MAX @@ -628,9 +622,3 @@ VOID LOS_Schedule(VOID) ArchTaskSchedule(); } } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/kernel/src/los_sortlink.c b/kernel/src/los_sortlink.c index afb6830b..c3cf3d3e 100644 --- a/kernel/src/los_sortlink.c +++ b/kernel/src/los_sortlink.c @@ -33,12 +33,6 @@ #include "los_sched.h" #include "los_debug.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif -#endif /* __cplusplus */ - SortLinkAttribute g_taskSortLink; #if (LOSCFG_BASE_CORE_SWTMR == 1) @@ -175,9 +169,3 @@ UINT64 OsSortLinkGetNextExpireTime(const SortLinkAttribute *sortLinkHead) SortLinkList *listSorted = LOS_DL_LIST_ENTRY(head->pstNext, SortLinkList, sortLinkNode); return OsSortLinkGetTargetExpireTime(OsGetCurrSchedTimeCycle(), listSorted); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif -#endif /* __cplusplus */ diff --git a/testsuites/sample/kernel/atomic/it_los_atomic.c b/testsuites/sample/kernel/atomic/it_los_atomic.c index b338c5b5..c5387d1b 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - Atomic g_testAtomicID03 = 0; Atomic64 g_testAtomicID05 = 0; @@ -55,9 +49,3 @@ VOID ItSuiteLosAtomic(VOID) ItLosAtomic010(); ItLosAtomic011(); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_001.c b/testsuites/sample/kernel/atomic/it_los_atomic_001.c index fbc8c1be..7a0091da 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_001.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_001.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - static UINT32 TestCase(VOID) { volatile INT32 value = 0; @@ -100,9 +94,3 @@ VOID ItLosAtomic001(VOID) { TEST_ADD_CASE("ItLosAtomic001", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_002.c b/testsuites/sample/kernel/atomic/it_los_atomic_002.c index 21d162d8..944c62e9 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_002.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_002.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - static UINT32 TestCase(VOID) { volatile INT32 value = 0; @@ -92,9 +86,3 @@ VOID ItLosAtomic002(VOID) { TEST_ADD_CASE("ItLosAtomic002", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_003.c b/testsuites/sample/kernel/atomic/it_los_atomic_003.c index f79deece..61216f65 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_003.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_003.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - static UINT32 TestCase(VOID) { volatile INT32 value = 0; @@ -106,9 +100,3 @@ VOID ItLosAtomic003(VOID) { TEST_ADD_CASE("ItLosAtomic003", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_004.c b/testsuites/sample/kernel/atomic/it_los_atomic_004.c index 73e915b2..fdd7ae6e 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_004.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_004.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - static VOID TaskF01(VOID) { INT32 i; @@ -104,9 +98,3 @@ VOID ItLosAtomic004(VOID) { TEST_ADD_CASE("ItLosAtomic004", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_005.c b/testsuites/sample/kernel/atomic/it_los_atomic_005.c index f00a1e50..891375d9 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_005.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_005.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - static UINT32 TestCase(VOID) { volatile INT64 value = 0; @@ -102,9 +96,3 @@ VOID ItLosAtomic005(VOID) { TEST_ADD_CASE("ItLosAtomic005", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_006.c b/testsuites/sample/kernel/atomic/it_los_atomic_006.c index 8870c3f3..5e7d5f82 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_006.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_006.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - static UINT32 TestCase(VOID) { volatile INT64 value = 0; @@ -126,9 +120,3 @@ VOID ItLosAtomic006(VOID) { TEST_ADD_CASE("ItLosAtomic006", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ \ No newline at end of file diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_007.c b/testsuites/sample/kernel/atomic/it_los_atomic_007.c index 05f9f62a..24ffd2a7 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_007.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_007.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - static VOID TaskF01(VOID) { INT64 i; @@ -110,9 +104,3 @@ VOID ItLosAtomic007(VOID) { TEST_ADD_CASE("ItLosAtomic007", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ \ No newline at end of file diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_008.c b/testsuites/sample/kernel/atomic/it_los_atomic_008.c index 02c4b291..ff463d94 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_008.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_008.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - static VOID TaskF01(VOID) { INT64 i; @@ -113,9 +107,3 @@ VOID ItLosAtomic008(VOID) { TEST_ADD_CASE("ItLosAtomic008", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ \ No newline at end of file diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_009.c b/testsuites/sample/kernel/atomic/it_los_atomic_009.c index d578fb9b..01620e2e 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_009.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_009.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - #define DB_ATOMIC_MUTI_TASK_NUM (ATOMIC_MUTI_TASK_NUM * 2) // 2 is coefficients static VOID TaskF01(VOID) @@ -132,9 +126,3 @@ VOID ItLosAtomic009(VOID) { TEST_ADD_CASE("ItLosAtomic009", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ \ No newline at end of file diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_010.c b/testsuites/sample/kernel/atomic/it_los_atomic_010.c index 563c9902..ea485481 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_010.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_010.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - #define TEST_LOOP 10 static VOID TaskF01(VOID) @@ -78,10 +72,3 @@ VOID ItLosAtomic010(VOID) { TEST_ADD_CASE("ItLosAtomic010", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ - diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_011.c b/testsuites/sample/kernel/atomic/it_los_atomic_011.c index 24854c48..70ebdbd6 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_011.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_011.c @@ -32,12 +32,6 @@ #include "it_los_atomic.h" -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - static VOID TaskF01(VOID) { Atomic atomicTestCounter = 0; @@ -247,10 +241,3 @@ VOID ItLosAtomic011(VOID) { TEST_ADD_CASE("ItLosAtomic011", TestCase, TEST_LOS, TEST_ATO, TEST_LEVEL0, TEST_FUNCTION); } - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ -