Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos A
提交
d7387508
K
Kernel Liteos A
项目概览
OpenHarmony
/
Kernel Liteos A
1 年多 前同步成功
通知
460
Star
414
Fork
55
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
4
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel Liteos A
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
4
Issue
4
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
d7387508
编写于
7月 09, 2021
作者:
O
openharmony_ci
提交者:
Gitee
7月 09, 2021
浏览文件
操作
浏览文件
下载
差异文件
!402 消除编译告警
Merge pull request !402 from x_xiny/master
上级
b29d9d88
e4ff0458
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
24 addition
and
26 deletion
+24
-26
arch/arm/arm/src/los_arch_mmu.c
arch/arm/arm/src/los_arch_mmu.c
+6
-6
arch/arm/arm/src/los_exc.c
arch/arm/arm/src/los_exc.c
+2
-3
compat/posix/src/time.c
compat/posix/src/time.c
+3
-3
fs/fat/os_adapt/fatfs.c
fs/fat/os_adapt/fatfs.c
+3
-2
fs/include/fs/file.h
fs/include/fs/file.h
+1
-1
fs/vfs/operation/fs_file.c
fs/vfs/operation/fs_file.c
+1
-1
kernel/base/ipc/los_signal.c
kernel/base/ipc/los_signal.c
+2
-2
kernel/base/vm/los_vm_filemap.c
kernel/base/vm/los_vm_filemap.c
+1
-1
kernel/base/vm/los_vm_iomap.c
kernel/base/vm/los_vm_iomap.c
+0
-1
kernel/common/console.c
kernel/common/console.c
+3
-3
kernel/common/los_config.c
kernel/common/los_config.c
+1
-1
kernel/common/los_magickey.c
kernel/common/los_magickey.c
+1
-1
syscall/misc_syscall.c
syscall/misc_syscall.c
+0
-1
未找到文件。
arch/arm/arm/src/los_arch_mmu.c
浏览文件 @
d7387508
...
...
@@ -871,7 +871,7 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached)
kSpace
->
archMmu
.
virtTtb
=
(
PTE_T
*
)
g_firstPageTable
;
kSpace
->
archMmu
.
physTtb
=
LOS_PaddrQuery
(
kSpace
->
archMmu
.
virtTtb
);
status
=
LOS_ArchMmuUnmap
(
&
kSpace
->
archMmu
,
virtAddr
,
(
bssEndBoundary
-
virtAddr
)
>>
MMU_DESCRIPTOR_L2_SMALL_SHIFT
);
(
bssEndBoundary
-
virtAddr
)
>>
MMU_DESCRIPTOR_L2_SMALL_SHIFT
);
if
(
status
!=
((
bssEndBoundary
-
virtAddr
)
>>
MMU_DESCRIPTOR_L2_SMALL_SHIFT
))
{
VM_ERR
(
"unmap failed, status: %d"
,
status
);
return
;
...
...
@@ -882,8 +882,8 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached)
flags
|=
VM_MAP_REGION_FLAG_UNCACHED
;
}
status
=
LOS_ArchMmuMap
(
&
kSpace
->
archMmu
,
virtAddr
,
SYS_MEM_BASE
,
(
textStart
-
virtAddr
)
>>
MMU_DESCRIPTOR_L2_SMALL_SHIFT
,
flags
);
(
textStart
-
virtAddr
)
>>
MMU_DESCRIPTOR_L2_SMALL_SHIFT
,
flags
);
if
(
status
!=
((
textStart
-
virtAddr
)
>>
MMU_DESCRIPTOR_L2_SMALL_SHIFT
))
{
VM_ERR
(
"mmap failed, status: %d"
,
status
);
return
;
...
...
@@ -910,9 +910,9 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached)
flags
|=
VM_MAP_REGION_FLAG_UNCACHED
;
}
status
=
LOS_ArchMmuMap
(
&
kSpace
->
archMmu
,
bssEndBoundary
,
SYS_MEM_BASE
+
bssEndBoundary
-
virtAddr
,
kmallocLength
>>
MMU_DESCRIPTOR_L2_SMALL_SHIFT
,
flags
);
SYS_MEM_BASE
+
bssEndBoundary
-
virtAddr
,
kmallocLength
>>
MMU_DESCRIPTOR_L2_SMALL_SHIFT
,
flags
);
if
(
status
!=
(
kmallocLength
>>
MMU_DESCRIPTOR_L2_SMALL_SHIFT
))
{
VM_ERR
(
"mmap failed, status: %d"
,
status
);
return
;
...
...
arch/arm/arm/src/los_exc.c
浏览文件 @
d7387508
...
...
@@ -38,7 +38,6 @@
#include "los_excinfo_pri.h"
#endif
#include "los_sys_stack_pri.h"
#include "los_stackinfo_pri.h"
#ifdef LOSCFG_COREDUMP
#include "los_coredump.h"
#endif
...
...
@@ -723,7 +722,7 @@ VOID BackTraceSub(UINTPTR regFP)
}
backLR
=
*
(
UINTPTR
*
)(
UINTPTR
)
kvaddr
;
#else
backLR
=
*
(
UINTPTR
*
)(
UINTPTR
)
kvaddr
;
backLR
=
*
(
UINTPTR
*
)(
UINTPTR
)
kvaddr
;
if
(
IsValidFP
(
tmpFP
-
POINTER_SIZE
,
stackStart
,
stackEnd
,
&
kvaddr
)
==
FALSE
)
{
PrintExcInfo
(
"traceback backFP check failed, backFP: 0x%x
\n
"
,
tmpFP
-
POINTER_SIZE
);
return
;
...
...
@@ -1007,7 +1006,7 @@ STATIC VOID OsCheckAllCpuStatus(VOID)
OsWaitOtherCoresHandleExcEnd
(
currCpuID
);
}
else
{
if
(
g_excFromUserMode
[
g_currHandleExcCpuID
]
==
TRUE
)
{
if
(
(
g_currHandleExcCpuID
<
LOSCFG_KERNEL_CORE_NUM
)
&&
(
g_excFromUserMode
[
g_currHandleExcCpuID
]
==
TRUE
)
)
{
g_currHandleExcCpuID
=
currCpuID
;
LOS_SpinUnlock
(
&
g_excSerializerSpin
);
target
=
(
UINT32
)(
OS_MP_CPU_ALL
&
~
CPUID_TO_AFFI_MASK
(
currCpuID
));
...
...
compat/posix/src/time.c
浏览文件 @
d7387508
...
...
@@ -456,7 +456,7 @@ static int PthreadGetCputime(clockid_t clockID, struct timespec *ats)
{
uint64_t
runtime
;
UINT32
intSave
;
UINT32
tid
=
((
UINT32
)
~
((
clockID
)
>>
CPUCLOCK_ID_OFFSET
));
UINT32
tid
=
((
UINT32
)
~
((
UINT32
)(
clockID
)
>>
CPUCLOCK_ID_OFFSET
));
if
(
OS_TID_CHECK_INVALID
(
tid
))
{
return
-
EINVAL
;
...
...
@@ -482,7 +482,7 @@ static int ProcessGetCputime(clockid_t clockID, struct timespec *ats)
{
UINT64
runtime
;
UINT32
intSave
;
const
pid_t
pid
=
((
pid_t
)
~
((
clockID
)
>>
CPUCLOCK_ID_OFFSET
));
const
pid_t
pid
=
((
pid_t
)
~
((
UINT32
)(
clockID
)
>>
CPUCLOCK_ID_OFFSET
));
LosProcessCB
*
spcb
=
NULL
;
if
(
OsProcessIDUserCheckInvalid
(
pid
)
||
pid
<
0
)
{
...
...
@@ -524,7 +524,7 @@ static int GetCputime(clockid_t clockID, struct timespec *tp)
static
int
CheckClock
(
const
clockid_t
clockID
)
{
int
error
=
0
;
const
pid_t
pid
=
((
pid_t
)
~
((
clockID
)
>>
CPUCLOCK_ID_OFFSET
));
const
pid_t
pid
=
((
pid_t
)
~
((
UINT32
)(
clockID
)
>>
CPUCLOCK_ID_OFFSET
));
if
(
!
((
UINT32
)
clockID
&
CPUCLOCK_PERTHREAD_MASK
))
{
LosProcessCB
*
spcb
=
NULL
;
...
...
fs/fat/os_adapt/fatfs.c
浏览文件 @
d7387508
...
...
@@ -238,7 +238,8 @@ static mode_t fatfs_get_mode(BYTE attribute, mode_t fs_mode)
return
fs_mode
;
}
static
enum
VnodeType
fatfstype_2_vnodetype
(
BYTE
type
)
{
static
enum
VnodeType
fatfstype_2_vnodetype
(
BYTE
type
)
{
switch
(
type
)
{
case
AM_ARC
:
return
VNODE_TYPE_REG
;
...
...
@@ -286,7 +287,7 @@ static FRESULT init_cluster(DIR_FILE *pdfp, DIR *dp_new, FATFS *fs, int type, co
mem_set
(
dir
,
0
,
SS
(
fs
));
if
(
type
==
AM_LNK
&&
target
)
{
/* Write target to symlink */
strcpy_s
((
char
*
)
dir
,
SS
(
fs
),
target
);
(
void
)
strcpy_s
((
char
*
)
dir
,
SS
(
fs
),
target
);
}
else
{
/* Write the dir cluster */
mem_set
(
dir
,
0
,
SS
(
fs
));
...
...
fs/include/fs/file.h
浏览文件 @
d7387508
...
...
@@ -473,7 +473,7 @@ off64_t file_seek64(struct file *filep, off64_t offset, int whence);
*
****************************************************************************/
int
files_allocate
(
struct
Vnode
*
vnode
,
int
oflags
,
off_t
pos
,
void
*
priv
,
int
minfd
);
int
files_allocate
(
struct
Vnode
*
vnode
,
int
oflags
,
off_t
pos
,
void
*
priv
,
int
minfd
);
/****************************************************************************
* Name: files_close
...
...
fs/vfs/operation/fs_file.c
浏览文件 @
d7387508
...
...
@@ -406,7 +406,7 @@ int CopyFdToProc(int fd, unsigned int targetPid)
return
-
ESRCH
;
}
procFd
=
AssignProcessFd
(
fdt
,
3
);
procFd
=
AssignProcessFd
(
fdt
,
3
);
// minfd is 3
if
(
procFd
<
0
)
{
if
(
sem_post
(
&
semId
)
==
-
1
)
{
PRINT_ERR
(
"sem_post error, errno %d
\n
"
,
get_errno
());
...
...
kernel/base/ipc/los_signal.c
浏览文件 @
d7387508
...
...
@@ -134,7 +134,7 @@ int OsTcbDispatch(LosTaskCB *stcb, siginfo_t *info)
if
(
masked
)
{
/* If signal is in wait list and mask list, need unblock it */
if
(
LOS_ListEmpty
(
&
sigcb
->
waitList
)
||
(
!
LOS_ListEmpty
(
&
sigcb
->
waitList
)
&&
!
OsSigIsMember
(
&
sigcb
->
sigwaitmask
,
info
->
si_signo
)))
{
(
!
LOS_ListEmpty
(
&
sigcb
->
waitList
)
&&
!
OsSigIsMember
(
&
sigcb
->
sigwaitmask
,
info
->
si_signo
)))
{
OsSigAddSet
(
&
sigcb
->
sigPendFlag
,
info
->
si_signo
);
}
}
else
{
...
...
@@ -310,7 +310,7 @@ int OsSigProcessSend(LosProcessCB *spcb, siginfo_t *sigInfo)
.
receivedTcb
=
NULL
};
if
(
info
.
sigInfo
==
NULL
){
if
(
info
.
sigInfo
==
NULL
)
{
return
-
EFAULT
;
}
...
...
kernel/base/vm/los_vm_filemap.c
浏览文件 @
d7387508
...
...
@@ -46,7 +46,7 @@
#endif
#ifndef UNUSED
#define UNUSED(x) (VOID)
x
#define UNUSED(x) (VOID)
(x)
#endif
#ifdef LOSCFG_DEBUG_VERSION
...
...
kernel/base/vm/los_vm_iomap.c
浏览文件 @
d7387508
...
...
@@ -34,7 +34,6 @@
#include "los_vm_zone.h"
#include "los_vm_common.h"
#include "los_vm_map.h"
#include "los_vm_lock.h"
#include "los_memory.h"
...
...
kernel/common/console.c
浏览文件 @
d7387508
...
...
@@ -437,10 +437,10 @@ STATIC VOID StoreReadChar(CONSOLE_CB *consoleCB, char ch, INT32 readcount)
VOID
KillPgrp
()
{
INT32
consoleId
=
-
1
;
INT32
consoleId
;
LosProcessCB
*
process
=
OsCurrProcessGet
();
if
((
process
->
consoleID
>
CONSOLE_NUM
-
1
)
||
(
process
->
consoleID
<
0
))
{
if
((
process
->
consoleID
>
CONSOLE_NUM
-
1
)
||
(
process
->
consoleID
<
0
))
{
return
;
}
...
...
@@ -872,7 +872,7 @@ STATIC INT32 ConsoleGetTermios(unsigned long arg)
return
-
EFAULT
;
}
if
(
LOS_ArchCopyToUser
((
VOID
*
)
arg
,
&
consoleCB
->
consoleTermios
,
sizeof
(
struct
termios
))
!=
0
)
{
if
(
LOS_ArchCopyToUser
((
VOID
*
)
arg
,
&
consoleCB
->
consoleTermios
,
sizeof
(
struct
termios
))
!=
0
)
{
return
-
EFAULT
;
}
else
{
return
LOS_OK
;
...
...
kernel/common/los_config.c
浏览文件 @
d7387508
...
...
@@ -83,7 +83,7 @@ LITE_OS_SEC_TEXT_INIT STATIC UINT32 EarliestInit(VOID)
LITE_OS_SEC_TEXT_INIT
STATIC
UINT32
ArchEarlyInit
(
VOID
)
{
UINT32
ret
=
LOS_OK
;
UINT32
ret
;
/* set system counter freq */
#ifndef LOSCFG_TEE_ENABLE
...
...
kernel/common/los_magickey.c
浏览文件 @
d7387508
...
...
@@ -137,7 +137,7 @@ INT32 CheckMagicKey(CHAR key)
PRINTK
(
"Magic key off
\n
"
);
}
return
1
;
}
else
if
(
key
==
0x03
){
/* ctrl + c */
}
else
if
(
key
==
0x03
)
{
/* ctrl + c */
KillPgrp
();
return
0
;
}
...
...
syscall/misc_syscall.c
浏览文件 @
d7387508
...
...
@@ -35,7 +35,6 @@
#include "sys/resource.h"
#include "sys/times.h"
#include "sys/utsname.h"
#include "time.h"
#include "capability_type.h"
#include "capability_api.h"
#include "los_process_pri.h"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录