p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!636 修正函数声明与定义不一致的问题 

Merge pull request !636 from Caoruihong/fix_decl
This commit is contained in:
openharmony_ci 2021-09-28 07:18:18 +00:00 committed by Gitee
parent 0fa1310a32 63fd8bc39b
commit e1b85a4570
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/common/los_config.c
View File

@ -67,9 +67,6 @@ SystemRebootFunc OsGetRebootHook(VOID)
return g_rebootHook; return g_rebootHook;
} }
extern UINT32 OsSystemInit(VOID);
extern VOID SystemInit(VOID);
LITE_OS_SEC_TEXT_INIT STATIC UINT32 EarliestInit(VOID) LITE_OS_SEC_TEXT_INIT STATIC UINT32 EarliestInit(VOID)
{ {
/* Must be placed at the beginning of the boot process */ /* Must be placed at the beginning of the boot process */
@ -286,6 +283,8 @@ STATIC VOID SystemInit(VOID)
{ {
PRINTK("dummy: *** %s ***\n", __FUNCTION__); PRINTK("dummy: *** %s ***\n", __FUNCTION__);
} }
#else
extern VOID SystemInit(VOID);
#endif #endif
STATIC UINT32 OsSystemInitTaskCreate(VOID) STATIC UINT32 OsSystemInitTaskCreate(VOID)
@ -309,8 +308,7 @@ STATIC UINT32 OsSystemInitTaskCreate(VOID)
return LOS_TaskCreate(&taskID, &sysTask); return LOS_TaskCreate(&taskID, &sysTask);
} }
STATIC UINT32 OsSystemInit(VOID)
UINT32 OsSystemInit(VOID)
{ {
UINT32 ret; UINT32 ret;

10
syscall/los_syscall.h
View File

@ -130,11 +130,11 @@ extern int SysMqNotify(mqd_t personal, const struct sigevent *sigev);
#endif #endif
extern int SysSigAction(int sig, const sigaction_t *restrict sa, sigaction_t *restrict old, size_t sigsetsize); extern int SysSigAction(int sig, const sigaction_t *restrict sa, sigaction_t *restrict old, size_t sigsetsize);
extern int SysSigprocMask(int how, const sigset_t_l *restrict set, sigset_t *restrict old, size_t sigsetsize); extern int SysSigprocMask(int how, const sigset_t_l *restrict setl, sigset_t_l *restrict oldl, size_t sigsetsize);
extern int SysKill(pid_t pid, int sig); extern int SysKill(pid_t pid, int sig);
extern int SysPthreadKill(pid_t pid, int sig); extern int SysPthreadKill(pid_t pid, int sig);
extern int SysSigTimedWait(const sigset_t *set, siginfo_t *info, extern int SysSigTimedWait(const sigset_t_l *setl, siginfo_t *info,
const struct timespec *timeoutsize_t, size_t sigsetsize); const struct timespec *timeout, size_t sigsetsize);
extern int SysPause(void); extern int SysPause(void);
extern int SysSigPending(sigset_t_l *setl); extern int SysSigPending(sigset_t_l *setl);
extern int SysSigSuspend(sigset_t_l *setl); extern int SysSigSuspend(sigset_t_l *setl);
@ -167,8 +167,8 @@ extern ssize_t SysRecvMsg(int s, struct msghdr *message, int flags);
/* vmm */ /* vmm */
extern void *SysMmap(void *addr, size_t size, int prot, int flags, int fd, size_t offset); extern void *SysMmap(void *addr, size_t size, int prot, int flags, int fd, size_t offset);
extern int SysMunmap(void *addr, size_t size); extern int SysMunmap(void *addr, size_t size);
extern int SysMprotect(vaddr_t vaddr, size_t len, int prot); extern int SysMprotect(void *vaddr, size_t len, int prot);
extern vaddr_t SysMremap(vaddr_t old_address, size_t old_size, size_t new_size, int flags, vaddr_t new_addr); extern void *SysMremap(void *oldAddr, size_t oldLen, size_t newLen, int flags, void *newAddr);
extern void *SysBrk(void *addr); extern void *SysBrk(void *addr);
extern int SysShmGet(key_t key, size_t size, int shmflg); extern int SysShmGet(key_t key, size_t size, int shmflg);
extern void *SysShmAt(int shmid, const void *shmaddr, int shmflg); extern void *SysShmAt(int shmid, const void *shmaddr, int shmflg);