fix:Solution of conflict.

Close #I3IK07

Change-Id: I6913691a28c90b54fbda233209d43b981884f10c
This commit is contained in:
zhushengle 2021-04-20 14:56:26 +08:00
commit 793d2139b2
620 changed files with 2 additions and 5971 deletions

View File

@ -33,11 +33,6 @@
#include "los_task.h"
#include "los_debug.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#if (LOSCFG_BACKTRACE_TYPE != 0)
#if (LOSCFG_BACKTRACE_TYPE == 1)
@ -304,9 +299,4 @@ VOID LOS_BackTraceInit(VOID)
}
#endif
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

0
components/bounds_checking_function/BUILD.gn Executable file → Normal file
View File

View File

@ -31,11 +31,6 @@
#include "los_cppsupport.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
typedef VOID (*InitFunc)(VOID);
@ -53,8 +48,3 @@ INT32 LOS_CppSystemInit(UINTPTR initArrayStart, UINTPTR initArrayEnd)
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

13
components/cpup/los_cpup.c Executable file → Normal file
View File

@ -35,12 +35,6 @@
#include "los_debug.h"
#include "los_tick.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#if (LOSCFG_BASE_CORE_CPUP == 1)
/**
@ -520,10 +514,3 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_CpupUsageMonitor(CPUP_TYPE_E type, CPUP_MODE_E
}
#endif /* LOSCFG_BASE_CORE_CPUP */
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -38,11 +38,6 @@
#include "los_membox.h"
#include "los_memory.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#if (LOSCFG_PLATFORM_EXC == 1)
#define EXC_MSG_ARRAY_INIT_VALUE 0xff
@ -300,9 +295,4 @@ VOID OsExcMsgDumpInit(VOID)
}
#endif
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

0
components/exchook/los_exchook.c Executable file → Normal file
View File

0
components/exchook/los_exchook.h Executable file → Normal file
View File

0
components/fs/fatfs/fatfs.c Executable file → Normal file
View File

0
components/fs/fatfs/fatfs.h Executable file → Normal file
View File

0
components/fs/fatfs/fs.c Executable file → Normal file
View File

0
components/net/lwip-2.1/porting/src/sys_arch.c Executable file → Normal file
View File

0
components/net/test/net_socket_test_012.c Executable file → Normal file
View File

0
components/net/test/net_socket_test_013.c Executable file → Normal file
View File

10
kal/cmsis/cmsis_liteos2.c Executable file → Normal file
View File

@ -46,11 +46,6 @@
#include "string.h"
#include "securec.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#if (CMSIS_OS_VER == 2)
/* Kernel initialization state */
@ -1625,8 +1620,3 @@ const char *osMemoryPoolGetName(osMemoryPoolId_t mp_id)
}
#endif // (CMSIS_OS_VER == 2)
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
kal/kal.c Executable file → Normal file
View File

@ -33,11 +33,6 @@
#include "los_interrupt.h"
#include "los_swtmr.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
osTimerId_t osTimerExtNew(osTimerFunc_t func, osTimerType_t type, void *argument, const osTimerAttr_t *attr,
@ -65,8 +60,3 @@ osTimerId_t osTimerExtNew(osTimerFunc_t func, osTimerType_t type, void *argument
}
#endif
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

0
kal/kal.h Executable file → Normal file
View File

0
kal/posix/include/bits/alltypes.h Executable file → Normal file
View File

0
kal/posix/include/signal.h Executable file → Normal file
View File

View File

@ -2,9 +2,6 @@
#include "los_context.h"
#include "los_debug.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
void __assert(const char* file, int line, const char* expr) {
PRINT_ERR("__assert error: %s, %d, %s\n", file, line, expr);
@ -23,7 +20,3 @@ void __assert_fail(const char* expr, const char* file, int line, const char* fun
LOS_Panic("__assert error:\n");
while (1);
}
#ifdef __cplusplus
}
#endif /* __cplusplus */

View File

@ -33,11 +33,6 @@
#include "los_config.h"
#include "los_memory.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
void *calloc(size_t nitems, size_t size)
{
@ -112,8 +107,3 @@ void *realloc(void *ptr, size_t size)
return LOS_MemRealloc(OS_SYS_MEM_ADDR, ptr, size);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

10
kal/posix/src/pthread_mutex.c Executable file → Normal file
View File

@ -35,11 +35,6 @@
#include "los_mux.h"
#include "errno.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#define OS_SYS_NS_PER_MSECOND 1000000
#define OS_SYS_NS_PER_SECOND 1000000000
@ -172,8 +167,3 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex)
return MapError(ret);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

0
kernel/arch/arm/cortex-m3/keil/cmsis/README.OpenSource Executable file → Normal file
View File

View File

@ -38,13 +38,6 @@
#include "los_sched.h"
#include "los_interrupt.h"
#include "los_arch_timer.h"
#include "los_timer.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* ****************************************************************************
Function : HalArchInit
@ -165,9 +158,3 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalStartSchedule(OS_TICK_HANDLER handler)
HalStartToRun();
return LOS_OK; /* never return */
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -41,11 +41,6 @@
#include "los_memory.h"
#include "los_membox.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/*lint -save -e40 -e522 -e533*/
UINT32 g_intCount = 0;
@ -537,8 +532,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
return;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -38,12 +38,6 @@
#include "los_sched.h"
#include "los_debug.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
/* ****************************************************************************
Function : HalTickStart
Description : Configure Tick Interrupt Start
@ -121,9 +115,3 @@ VOID HalEnterSleep(LOS_SysSleepEnum sleep)
__WFI();
__ISB();
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -37,13 +37,6 @@
#include "los_sched.h"
#include "los_interrupt.h"
#include "los_arch_timer.h"
#include "los_timer.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* ****************************************************************************
Function : HalArchInit
@ -164,9 +157,3 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalStartSchedule(OS_TICK_HANDLER handler)
HalStartToRun();
return LOS_OK; /* never return */
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -40,11 +40,6 @@
#include "los_memory.h"
#include "los_membox.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/*lint -save -e40 -e522 -e533*/
UINT32 g_intCount = 0;
@ -526,8 +521,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
return;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -37,12 +37,6 @@
#include "los_sched.h"
#include "los_debug.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
/* ****************************************************************************
Function : HalTickStart
Description : Configure Tick Interrupt Start
@ -120,9 +114,3 @@ VOID HalEnterSleep(LOS_SysSleepEnum sleep)
__WFI();
__ISB();
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -39,11 +39,6 @@
#include "los_arch_timer.h"
#include "los_timer.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* ****************************************************************************
Function : HalArchInit
@ -165,8 +160,3 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalStartSchedule(OS_TICK_HANDLER handler)
return LOS_OK; /* never return */
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -40,11 +40,6 @@
#include "los_memory.h"
#include "los_membox.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/*lint -save -e40 -e522 -e533*/
UINT32 g_intCount = 0;
@ -536,8 +531,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
return;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -32,11 +32,6 @@
#include "los_config.h"
#include "los_context.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#define SIZE_4G_BYTE 0x100000000
#define MPU_MAX_REGION_NUM 8
@ -239,8 +234,3 @@ INT32 HalMpuUnusedRegionGet(VOID)
}
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -37,11 +37,6 @@
#include "los_sched.h"
#include "los_debug.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
/* ****************************************************************************
Function : HalTickStart
@ -121,8 +116,3 @@ VOID HalEnterSleep(LOS_SysSleepEnum sleep)
__ISB();
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -39,11 +39,6 @@
#include "los_arch_timer.h"
#include "los_timer.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* ****************************************************************************
Function : HalArchInit
@ -165,8 +160,3 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalStartSchedule(OS_TICK_HANDLER handler)
return LOS_OK; /* never return */
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -41,11 +41,6 @@
#include "los_memory.h"
#include "los_membox.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/*lint -save -e40 -e522 -e533*/
UINT32 g_intCount = 0;
@ -539,8 +534,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
return;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -32,11 +32,6 @@
#include "los_config.h"
#include "los_context.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#define SIZE_4G_BYTE 0x100000000
#define MPU_MAX_REGION_NUM 8
@ -239,8 +234,3 @@ INT32 HalMpuUnusedRegionGet(VOID)
}
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -37,11 +37,6 @@
#include "los_sched.h"
#include "los_debug.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
/* ****************************************************************************
Function : HalTickStart
@ -121,8 +116,3 @@ VOID HalEnterSleep(LOS_SysSleepEnum sleep)
__ISB();
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -37,13 +37,6 @@
#include "los_sched.h"
#include "los_interrupt.h"
#include "los_arch_timer.h"
#include "los_timer.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* ****************************************************************************
Function : HalArchInit
@ -164,9 +157,3 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalStartSchedule(OS_TICK_HANDLER handler)
HalStartToRun();
return LOS_OK; /* never return */
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -40,11 +40,6 @@
#include "los_memory.h"
#include "los_membox.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/*lint -save -e40 -e522 -e533*/
UINT32 g_intCount = 0;
@ -526,8 +521,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
return;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -37,12 +37,6 @@
#include "los_sched.h"
#include "los_debug.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
/* ****************************************************************************
Function : HalTickStart
Description : Configure Tick Interrupt Start
@ -120,9 +114,3 @@ VOID HalEnterSleep(LOS_SysSleepEnum sleep)
__WFI();
__ISB();
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -37,13 +37,6 @@
#include "los_sched.h"
#include "los_interrupt.h"
#include "los_arch_timer.h"
#include "los_timer.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* ****************************************************************************
Function : HalArchInit
@ -164,9 +157,3 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalStartSchedule(OS_TICK_HANDLER handler)
HalStartToRun();
return LOS_OK; /* never return */
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -41,11 +41,6 @@
#include "los_memory.h"
#include "los_membox.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/*lint -save -e40 -e522 -e533*/
UINT32 g_intCount = 0;
@ -535,8 +530,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
return;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -31,11 +31,6 @@
#include "los_mpu.h"
#include "los_context.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#define SIZE_4G_BYTE 0x100000000
#define MPU_MAX_REGION_NUM 8
@ -238,8 +233,3 @@ INT32 HalMpuUnusedRegionGet(VOID)
}
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -37,12 +37,6 @@
#include "los_sched.h"
#include "los_debug.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
/* ****************************************************************************
Function : HalTickStart
Description : Configure Tick Interrupt Start
@ -120,9 +114,3 @@ VOID HalEnterSleep(LOS_SysSleepEnum sleep)
__WFI();
__ISB();
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

0
kernel/arch/include/los_arch.h Executable file → Normal file
View File

0
kernel/arch/include/los_interrupt.h Executable file → Normal file
View File

0
kernel/arch/include/los_mpu.h Executable file → Normal file
View File

View File

@ -38,11 +38,6 @@
#include "los_timer.h"
#include "soc.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
STATIC UINT32 g_sysNeedSched = FALSE;
@ -161,9 +156,3 @@ LITE_OS_SEC_TEXT VOID dsb(VOID)
{
__asm__ __volatile__("fence":::"memory");
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -40,11 +40,6 @@
#include "los_hook.h"
#include "riscv_hal.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
LosExcInfo g_excInfo;
#define RISCV_EXC_TYPE_NUM 16
@ -356,8 +351,3 @@ SYSTEM_DEATH:
}
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -38,11 +38,6 @@
#include "los_arch_timer.h"
#include "riscv_hal.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
{
@ -92,8 +87,3 @@ VOID HalEnterSleep(LOS_SysSleepEnum sleep)
wfi();
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

0
kernel/include/los_membox.h Executable file → Normal file
View File

0
kernel/include/los_memory.h Executable file → Normal file
View File

View File

@ -35,11 +35,6 @@
#include "los_task.h"
#include "los_sched.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif
#endif /* __cplusplus */
LITE_OS_SEC_TEXT_INIT UINT32 LOS_EventInit(PEVENT_CB_S eventCB)
{
@ -222,9 +217,4 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_EventClear(PEVENT_CB_S eventCB, UINT32 events)
return LOS_OK;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif
#endif /* __cplusplus */

View File

@ -58,11 +58,6 @@
#include "los_exc_info.h"
#endif
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
/*****************************************************************************
Function : LOS_Reboot
@ -203,8 +198,3 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_KernelInit(VOID)
return LOS_OK;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -37,11 +37,6 @@
#include "los_memory.h"
#include "los_sched.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif
#endif /* __cplusplus */
#if (LOSCFG_BASE_IPC_MUX == 1)
@ -316,8 +311,3 @@ LITE_OS_SEC_TEXT UINT32 LOS_MuxPost(UINT32 muxHandle)
}
#endif /* (LOSCFG_BASE_IPC_MUX == 1) */
#ifdef __cplusplus
#if __cplusplus
}
#endif
#endif /* __cplusplus */

View File

@ -40,11 +40,6 @@
#include "los_task.h"
#include "los_sched.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif
#endif /* __cplusplus */
#if (LOSCFG_BASE_IPC_QUEUE == 1)
@ -674,8 +669,3 @@ QUEUE_END:
#endif /* (LOSCFG_BASE_IPC_QUEUE == 1) */
#ifdef __cplusplus
#if __cplusplus
}
#endif
#endif /* __cplusplus */

View File

@ -38,11 +38,6 @@
#include "los_memory.h"
#include "los_sched.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif
#endif /* __cplusplus */
#if (LOSCFG_BASE_IPC_SEM == 1)
@ -319,8 +314,3 @@ LITE_OS_SEC_TEXT UINT32 LOS_SemPost(UINT32 semHandle)
#endif /* (LOSCFG_BASE_IPC_SEM == 1) */
#ifdef __cplusplus
#if __cplusplus
}
#endif
#endif /* __cplusplus */

View File

@ -38,11 +38,6 @@
#include "los_debug.h"
#include "los_sched.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#if (LOSCFG_BASE_CORE_SWTMR == 1)
@ -669,8 +664,3 @@ LITE_OS_SEC_TEXT UINT32 LOS_SwtmrDelete(UINT32 swtmrId)
#endif /* (LOSCFG_BASE_CORE_SWTMR == 1) */
#ifdef __cplusplus
#if __cplusplus
}
#endif
#endif

View File

@ -45,11 +45,6 @@
#include "los_cpup.h"
#endif
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/**
* @ingroup los_task
@ -1301,8 +1296,3 @@ LITE_OS_SEC_TEXT_MINOR VOID LOS_Msleep(UINT32 mSecs)
(VOID)LOS_TaskDelay(interval);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -35,11 +35,6 @@
#include "los_swtmr.h"
#include "los_sched.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
LITE_OS_SEC_BSS UINT32 g_ticksPerSec;
LITE_OS_SEC_BSS UINT32 g_uwCyclePerSec;
@ -183,8 +178,3 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsCpuTick2US(CpuTick *cpuTick, UINT32 *usHi, UINT32
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
kernel/src/mm/los_membox.c Executable file → Normal file
View File

@ -36,11 +36,6 @@
#include "los_debug.h"
#include "los_task.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* The magic length is 32 bits, the lower 8 bits are used to save the owner task ID,
and the other 24 bits are used to set the magic number for verification. */
@ -324,8 +319,3 @@ UINT32 OsMemboxExcInfoGet(UINT32 memNumMax, MemInfoCB *memExcInfo)
}
#endif
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

12
kernel/src/mm/los_memory.c Executable file → Normal file
View File

@ -38,11 +38,6 @@
#include "los_interrupt.h"
#include "los_task.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* Used to cut non-essential functions. */
#define OS_MEM_EXPAND_ENABLE 0
@ -1897,6 +1892,8 @@ UINT32 LOS_MemInfoGet(VOID *pool, LOS_MEM_POOL_STATUS *poolStatus)
return LOS_NOK;
}
(VOID)memset_s(poolStatus, sizeof(LOS_MEM_POOL_STATUS), 0, sizeof(LOS_MEM_POOL_STATUS));
struct OsMemNodeHead *tmpNode = NULL;
struct OsMemNodeHead *endNode = NULL;
UINT32 intSave;
@ -2107,9 +2104,4 @@ UINT32 OsMemExcInfoGet(UINT32 memNumMax, MemInfoCB *memExcInfo)
}
#endif
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
targets/cortex-m3_stm32f103_simulator_keil/main.c Executable file → Normal file
View File

@ -36,11 +36,6 @@
#include "los_debug.h"
#include "los_compiler.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#pragma data_alignment=8
UINT8 g_memStart[LOSCFG_SYS_HEAP_SIZE];
@ -129,8 +124,3 @@ LITE_OS_SEC_TEXT_INIT int main(void)
}
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

View File

View File

@ -38,11 +38,6 @@
#include "los_sched.h"
#include "iar_stm32f429ig_fire-challenger.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
STATIC VOID TaskSampleEntry2(VOID)
{
@ -197,8 +192,3 @@ EXIT:
}
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

View File

View File

@ -39,11 +39,6 @@
#include "los_task.h"
#include "los_tick.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
UINT8 __attribute__ ((aligned (8))) g_memStart[OS_SYS_MEM_SIZE];
@ -99,8 +94,3 @@ VOID RunTaskSample(VOID)
}
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

0
targets/riscv_sifive_fe310_gcc/target_config.h Executable file → Normal file
View File

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -85,8 +80,3 @@ VOID ItSuiteLosEvent()
ItLosEvent042();
ItLosEvent043();
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -93,8 +88,3 @@ VOID ItLosEvent001(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent001", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL1, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -104,8 +99,3 @@ VOID ItLosEvent002(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent002", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL1, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -89,8 +84,3 @@ VOID ItLosEvent003(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent003", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL1, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -98,8 +93,3 @@ VOID ItLosEvent004(VOID)
{
TEST_ADD_CASE("ItLosEvent004", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL1, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -75,8 +70,3 @@ VOID ItLosEvent005(VOID)
{
TEST_ADD_CASE("ItLosEvent005", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -108,8 +103,3 @@ VOID ItLosEvent006(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent006", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL1, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -112,8 +107,3 @@ VOID ItLosEvent007(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent007", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL1, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -106,8 +101,3 @@ VOID ItLosEvent008(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent008", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL1, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -96,8 +91,3 @@ VOID ItLosEvent009(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent009", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -116,8 +111,3 @@ VOID ItLosEvent010(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent010", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL1, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -129,8 +124,3 @@ VOID ItLosEvent011(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent011", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL2, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -125,8 +120,3 @@ VOID ItLosEvent012(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent012", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -115,8 +110,3 @@ VOID ItLosEvent013(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent013", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -112,8 +107,3 @@ VOID ItLosEvent014(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent014", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -107,8 +102,3 @@ VOID ItLosEvent015(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent015", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -98,8 +93,3 @@ VOID ItLosEvent016(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent016", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -88,8 +83,3 @@ VOID ItLosEvent017(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent017", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -116,8 +111,3 @@ VOID ItLosEvent018(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent018", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -126,8 +121,3 @@ VOID ItLosEvent019(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent019", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -121,8 +116,3 @@ VOID ItLosEvent020(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent020", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -106,8 +101,3 @@ VOID ItLosEvent021(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent021", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -121,8 +116,3 @@ VOID ItLosEvent022(VOID)
{
TEST_ADD_CASE("ItLosEvent022", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -140,8 +135,3 @@ VOID ItLosEvent023(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent023", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -72,8 +67,3 @@ VOID ItLosEvent024(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent024", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -108,8 +103,3 @@ VOID ItLosEvent026(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent026", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL2, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -121,8 +116,3 @@ VOID ItLosEvent027(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent027", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -156,8 +151,3 @@ VOID ItLosEvent028(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent028", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL3, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -90,8 +85,3 @@ VOID ItLosEvent029(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent029", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL1, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -82,8 +77,3 @@ VOID ItLosEvent030(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent030", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

View File

@ -29,11 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#include "osTest.h"
#include "It_los_event.h"
@ -51,8 +46,3 @@ VOID ItLosEvent031(VOID) // IT_Layer_ModuleORFeature_No
{
TEST_ADD_CASE("ItLosEvent031", Testcase, TEST_LOS, TEST_EVENT, TEST_LEVEL0, TEST_FUNCTION);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

Some files were not shown because too many files have changed in this diff Show More