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

Merge branch 'master' of gitee.com:openharmony/kernel_liteos_m into backtrace

Browse Source
This commit is contained in:
JerryH
2021-06-09 10:41:58 +08:00
committed by Gitee
parent ca1792aa4b 0ba33abcd1
commit 97a5b6d8dc
180 changed files with 8389 additions and 1620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/include/los_config.h
View File

@@ -541,8 +541,8 @@ extern UINT8 *m_aucSysMem0;
* @ingroup los_config
* Configuration of hardware stack protection
*/
#ifndef LOSCFG_EXC_HRADWARE_STACK_PROTECTION
#define LOSCFG_EXC_HRADWARE_STACK_PROTECTION 0
#ifndef LOSCFG_EXC_HARDWARE_STACK_PROTECTION
#define LOSCFG_EXC_HARDWARE_STACK_PROTECTION 0
#endif
/* =============================================================================
@@ -634,6 +634,23 @@ extern UINT8 *m_aucSysMem0;
#define LOSCFG_BASE_CORE_SCHED_SLEEP 0
#endif
/**
* @ingroup los_config
* Configuration trustzone secure heap size.
*/
#ifndef LOSCFG_SECURE_HEAP_SIZE
#define LOSCFG_SECURE_HEAP_SIZE 2048
#endif
/**
* @ingroup los_config
* Configuration trustzone secure stack default size.
* The secure stack must be allocated before the task calls non-secure callble functions.
*/
#ifndef LOSCFG_SECURE_STACK_DEFAULT_SIZE
#define LOSCFG_SECURE_STACK_DEFAULT_SIZE 512
#endif
#ifdef __cplusplus
#if __cplusplus
}

4
kernel/include/los_event.h
View File

@@ -147,13 +147,13 @@ extern "C" {
/**
* @ingroup los_event
* Event reading error code: should not be distory.
* Event reading error code: should not be destroyed.
*
* Value: 0x02001c08
*
* Solution: Check whether the event list is not empty.
*/
#define LOS_ERRNO_EVENT_SHOULD_NOT_DESTORY LOS_ERRNO_OS_ERROR(LOS_MOD_EVENT, 0x08)
#define LOS_ERRNO_EVENT_SHOULD_NOT_DESTROYED LOS_ERRNO_OS_ERROR(LOS_MOD_EVENT, 0x08)
/**
* @ingroup los_event

4
kernel/include/los_queue.h
View File

@@ -355,7 +355,7 @@ typedef struct tagQueueInfo {
* This API is used to create a message queue.
* @attention
* <ul>
* <li>Threre are LOSCFG_BASE_IPC_QUEUE_LIMIT queues available, change it's value when necessory.</li>
* <li>There are LOSCFG_BASE_IPC_QUEUE_LIMIT queues available, change it's value when necessary.</li>
* </ul>
* @param queueName [IN] Message queue name. Reserved parameter, not used for now.
* @param len [IN] Queue length. The value range is [1,0xffff].
@@ -402,7 +402,7 @@ extern UINT32 LOS_QueueCreate(CHAR *queueName,
* [1,LOSCFG_BASE_IPC_QUEUE_LIMIT].
* @param bufferAddr [OUT] Starting address that stores the obtained data. The starting address must not be
* null.
* @param bufferSize [IN/OUT] Where to maintain the buffer wantted-size before read, and the real-size after read.
* @param bufferSize [IN/OUT] Where to maintain the buffer expected-size before read, and the real-size after read.
* @param timeOut [IN] Expiry time. The value range is [0,LOS_WAIT_FOREVER](unit: Tick).
*
* @retval #LOS_OK The queue is successfully read.

2
kernel/include/los_sched.h
View File

@@ -49,7 +49,7 @@ VOID OsSchedUpdateSchedTimeBase(VOID);
UINT64 OsGetCurrSchedTimeCycle(VOID);
VOID OsSchedSetIdleTaskSchedPartam(LosTaskCB *idleTask);
VOID OsSchedSetIdleTaskSchedParam(LosTaskCB *idleTask);
UINT32 OsSchedSwtmrScanRegister(SchedScan func);

2
kernel/include/los_swtmr.h
View File

@@ -367,7 +367,7 @@ extern UINT32 LOS_SwtmrTimeGet(UINT32 swtmrID, UINT32 *tick);
* @attention
* <ul>
* <li>Do not use the delay interface in the callback function that handles software timer timeout.</li>
* <li>Threre are LOSCFG_BASE_CORE_SWTMR_LIMIT timers available, change it's value when necessory.</li>
* <li>There are LOSCFG_BASE_CORE_SWTMR_LIMIT timers available, change it's value when necessary.</li>
* </ul>
*
* @param interval [IN] Timing duration of the software timer to be created (unit: ms).

6
kernel/include/los_task.h
View File

@@ -1052,7 +1052,7 @@ extern BOOL LOS_TaskIsRunning(VOID);
* @brief Obtain current new task ID.
*
* @par Description:
* This API is used to obtain the ID of new task.
* This API is used to obtain the ID of new task.
*
* @attention None.
*
@@ -1066,10 +1066,10 @@ extern BOOL LOS_TaskIsRunning(VOID);
extern UINT32 LOS_NewTaskIDGet(VOID);
/**
* @ingroup los_task
* @brief Obtain current new task name.
* @brief Obtain the task name.
*
* @par Description:
* This API is used to obtain the name of new task.
* This API is used to obtain the task name.
*
* @attention None.
*