Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos M
提交
e1f98630
K
Kernel Liteos M
项目概览
OpenHarmony
/
Kernel Liteos M
大约 1 年 前同步成功
通知
20
Star
28
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel Liteos M
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e1f98630
编写于
7月 12, 2022
作者:
O
openharmony_ci
提交者:
Gitee
7月 12, 2022
浏览文件
操作
浏览文件
下载
差异文件
!745 iccarm工具链支持
Merge pull request !745 from wish/tag_iccarm
上级
0c8b7d2a
62eb96dd
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
12 addition
and
11 deletion
+12
-11
components/shell/src/cmds/vfs_shellcmd.c
components/shell/src/cmds/vfs_shellcmd.c
+1
-1
kal/cmsis/cmsis_liteos2.c
kal/cmsis/cmsis_liteos2.c
+1
-1
kal/posix/src/mqueue.c
kal/posix/src/mqueue.c
+2
-2
kal/posix/src/pipe.c
kal/posix/src/pipe.c
+2
-1
kal/posix/src/pthread.c
kal/posix/src/pthread.c
+4
-2
kernel/src/mm/los_memory.c
kernel/src/mm/los_memory.c
+0
-2
utils/los_compiler.h
utils/los_compiler.h
+1
-1
utils/los_debug.c
utils/los_debug.c
+1
-1
未找到文件。
components/shell/src/cmds/vfs_shellcmd.c
浏览文件 @
e1f98630
...
...
@@ -724,7 +724,7 @@ STATIC INT32 OsWildcardExtractDirectory(CHAR *fullpath, VOID *dst, wildcard_type
if
(
d
==
NULL
)
{
perror
(
"opendir error"
);
return
VFS_ERROR
;
return
(
INT32
)
VFS_ERROR
;
}
while
(
1
)
{
...
...
kal/cmsis/cmsis_liteos2.c
浏览文件 @
e1f98630
...
...
@@ -788,7 +788,7 @@ osStatus_t osTimerStop(osTimerId_t timer_id)
uint32_t
osTimerIsRunning
(
osTimerId_t
timer_id
)
{
if
(
OS_INT_ACTIVE
)
{
return
osErrorISR
;
return
(
uint32_t
)
osErrorISR
;
}
if
(
timer_id
==
NULL
)
{
return
0
;
...
...
kal/posix/src/mqueue.c
浏览文件 @
e1f98630
...
...
@@ -163,14 +163,14 @@ STATIC int SaveMqueueName(const CHAR *mqName, struct mqarray *mqueueCB)
mqueueCB
->
mq_name
=
(
char
*
)
LOS_MemAlloc
(
OS_SYS_MEM_ADDR
,
nameLen
+
1
);
if
(
mqueueCB
->
mq_name
==
NULL
)
{
errno
=
ENOMEM
;
return
LOS_NOK
;
return
(
int
)
LOS_NOK
;
}
if
(
strncpy_s
(
mqueueCB
->
mq_name
,
(
nameLen
+
1
),
mqName
,
nameLen
)
!=
EOK
)
{
LOS_MemFree
(
OS_SYS_MEM_ADDR
,
mqueueCB
->
mq_name
);
mqueueCB
->
mq_name
=
NULL
;
errno
=
EINVAL
;
return
LOS_NOK
;
return
(
int
)
LOS_NOK
;
}
mqueueCB
->
mq_name
[
nameLen
]
=
'\0'
;
return
LOS_OK
;
...
...
kal/posix/src/pipe.c
浏览文件 @
e1f98630
...
...
@@ -215,6 +215,7 @@ STATIC INT32 PipeDevRegister(CHAR *devName, UINT32 len)
{
INT32
ret
;
INT32
num
=
PipeDevNumAlloc
();
struct
PipeDev
*
devTemp
=
NULL
;
if
(
num
<
0
)
{
return
-
ENODEV
;
}
...
...
@@ -228,7 +229,7 @@ STATIC INT32 PipeDevRegister(CHAR *devName, UINT32 len)
(
VOID
)
snprintf_s
(
dev
->
devName
,
PIPE_DEV_NAME_MAX
,
PIPE_DEV_NAME_MAX
-
1
,
"%s%d"
,
PIPE_DEV_PATH
,
num
);
(
VOID
)
memcpy_s
(
devName
,
len
,
dev
->
devName
,
strlen
(
dev
->
devName
));
struct
PipeDev
*
devTemp
=
PipeDevFind
(
dev
->
devName
);
devTemp
=
PipeDevFind
(
dev
->
devName
);
if
(
devTemp
!=
NULL
)
{
ret
=
-
EEXIST
;
goto
ERROR
;
...
...
kal/posix/src/pthread.c
浏览文件 @
e1f98630
...
...
@@ -504,6 +504,8 @@ int pthread_detach(pthread_t thread)
void
pthread_exit
(
void
*
retVal
)
{
UINT32
intSave
;
LosTaskCB
*
tcb
=
NULL
;
PthreadData
*
pthreadData
=
NULL
;
pthread_t
thread
=
pthread_self
();
if
(
!
IsPthread
(
thread
))
{
...
...
@@ -511,9 +513,9 @@ void pthread_exit(void *retVal)
goto
EXIT
;
}
LosTaskCB
*
tcb
=
OS_TCB_FROM_TID
((
UINT32
)
thread
);
tcb
=
OS_TCB_FROM_TID
((
UINT32
)
thread
);
tcb
->
joinRetval
=
(
UINTPTR
)
retVal
;
PthreadData
*
pthreadData
=
(
PthreadData
*
)(
UINTPTR
)
tcb
->
arg
;
pthreadData
=
(
PthreadData
*
)(
UINTPTR
)
tcb
->
arg
;
if
(
pthread_setcancelstate
(
PTHREAD_CANCEL_DISABLE
,
NULL
)
!=
0
)
{
PRINT_ERR
(
"%s: %d failed
\n
"
,
__FUNCTION__
,
__LINE__
);
}
...
...
kernel/src/mm/los_memory.c
浏览文件 @
e1f98630
...
...
@@ -1901,14 +1901,12 @@ STATIC VOID OsMemIntegrityCheckError(struct OsMemPoolHead *pool,
if
(
taskID
>=
LOSCFG_BASE_CORE_TSK_LIMIT
)
{
MEM_UNLOCK
(
pool
,
intSave
);
LOS_Panic
(
"Task ID %u in pre node is invalid!
\n
"
,
taskID
);
return
;
}
taskCB
=
OS_TCB_FROM_TID
(
taskID
);
if
((
taskCB
->
taskStatus
&
OS_TASK_STATUS_UNUSED
)
||
(
taskCB
->
taskEntry
==
NULL
))
{
MEM_UNLOCK
(
pool
,
intSave
);
LOS_Panic
(
"
\r\n
Task ID %u in pre node is not created!
\n
"
,
taskID
);
return
;
}
}
else
{
PRINTK
(
"The prev node is free
\n
"
);
...
...
utils/los_compiler.h
浏览文件 @
e1f98630
...
...
@@ -34,7 +34,7 @@
/* for IAR Compiler */
#ifdef __ICCARM__
#include"iccarm_builtin.h"
#include
"iccarm_builtin.h"
#endif
#ifdef __cplusplus
...
...
utils/los_debug.c
浏览文件 @
e1f98630
...
...
@@ -87,7 +87,7 @@ VOID OsDoExcHook(EXC_TYPE excType)
INT32
OsLogLevelCheck
(
INT32
level
)
{
if
(
level
>
PRINT_LEVEL
)
{
return
LOS_NOK
;
return
(
INT32
)
LOS_NOK
;
}
if
((
level
!=
LOG_COMMON_LEVEL
)
&&
((
level
>
LOG_EMG_LEVEL
)
&&
(
level
<=
LOG_DEBUG_LEVEL
)))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录