Skip to content

Commit 550b928

Browse files
authored
[syscall] lwp_syscall 中 rt_err_t 改为 sysret_t (#7374)
1 parent 5203e59 commit 550b928

File tree

1 file changed

+43
-43
lines changed

1 file changed

+43
-43
lines changed

components/lwp/lwp_syscall.c

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -998,17 +998,17 @@ rt_sem_t sys_sem_create(const char *name, rt_uint32_t value, rt_uint8_t flag)
998998
return sem;
999999
}
10001000

1001-
rt_err_t sys_sem_delete(rt_sem_t sem)
1001+
sysret_t sys_sem_delete(rt_sem_t sem)
10021002
{
10031003
return lwp_user_object_delete(lwp_self(), (rt_object_t)sem);
10041004
}
10051005

1006-
rt_err_t sys_sem_take(rt_sem_t sem, rt_int32_t time)
1006+
sysret_t sys_sem_take(rt_sem_t sem, rt_int32_t time)
10071007
{
10081008
return rt_sem_take_interruptible(sem, time);
10091009
}
10101010

1011-
rt_err_t sys_sem_release(rt_sem_t sem)
1011+
sysret_t sys_sem_release(rt_sem_t sem)
10121012
{
10131013
return rt_sem_release(sem);
10141014
}
@@ -1026,17 +1026,17 @@ rt_mutex_t sys_mutex_create(const char *name, rt_uint8_t flag)
10261026
return mutex;
10271027
}
10281028

1029-
rt_err_t sys_mutex_delete(rt_mutex_t mutex)
1029+
sysret_t sys_mutex_delete(rt_mutex_t mutex)
10301030
{
10311031
return lwp_user_object_delete(lwp_self(), (rt_object_t)mutex);
10321032
}
10331033

1034-
rt_err_t sys_mutex_take(rt_mutex_t mutex, rt_int32_t time)
1034+
sysret_t sys_mutex_take(rt_mutex_t mutex, rt_int32_t time)
10351035
{
10361036
return rt_mutex_take_interruptible(mutex, time);
10371037
}
10381038

1039-
rt_err_t sys_mutex_release(rt_mutex_t mutex)
1039+
sysret_t sys_mutex_release(rt_mutex_t mutex)
10401040
{
10411041
return rt_mutex_release(mutex);
10421042
}
@@ -1082,17 +1082,17 @@ rt_event_t sys_event_create(const char *name, rt_uint8_t flag)
10821082
return event;
10831083
}
10841084

1085-
rt_err_t sys_event_delete(rt_event_t event)
1085+
sysret_t sys_event_delete(rt_event_t event)
10861086
{
10871087
return lwp_user_object_delete(lwp_self(), (rt_object_t)event);
10881088
}
10891089

1090-
rt_err_t sys_event_send(rt_event_t event, rt_uint32_t set)
1090+
sysret_t sys_event_send(rt_event_t event, rt_uint32_t set)
10911091
{
10921092
return rt_event_send(event, set);
10931093
}
10941094

1095-
rt_err_t sys_event_recv(rt_event_t event,
1095+
sysret_t sys_event_recv(rt_event_t event,
10961096
rt_uint32_t set,
10971097
rt_uint8_t opt,
10981098
rt_int32_t timeout,
@@ -1116,24 +1116,24 @@ rt_mailbox_t sys_mb_create(const char *name, rt_size_t size, rt_uint8_t flag)
11161116
return mb;
11171117
}
11181118

1119-
rt_err_t sys_mb_delete(rt_mailbox_t mb)
1119+
sysret_t sys_mb_delete(rt_mailbox_t mb)
11201120
{
11211121
return lwp_user_object_delete(lwp_self(), (rt_object_t)mb);
11221122
}
11231123

1124-
rt_err_t sys_mb_send(rt_mailbox_t mb, rt_ubase_t value)
1124+
sysret_t sys_mb_send(rt_mailbox_t mb, rt_ubase_t value)
11251125
{
11261126
return rt_mb_send(mb, value);
11271127
}
11281128

1129-
rt_err_t sys_mb_send_wait(rt_mailbox_t mb,
1129+
sysret_t sys_mb_send_wait(rt_mailbox_t mb,
11301130
rt_ubase_t value,
11311131
rt_int32_t timeout)
11321132
{
11331133
return rt_mb_send_wait(mb, value, timeout);
11341134
}
11351135

1136-
rt_err_t sys_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
1136+
sysret_t sys_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
11371137
{
11381138
if (!lwp_user_accessable((void *)value, sizeof(rt_ubase_t *)))
11391139
{
@@ -1156,12 +1156,12 @@ rt_mq_t sys_mq_create(const char *name,
11561156
return mq;
11571157
}
11581158

1159-
rt_err_t sys_mq_delete(rt_mq_t mq)
1159+
sysret_t sys_mq_delete(rt_mq_t mq)
11601160
{
11611161
return lwp_user_object_delete(lwp_self(), (rt_object_t)mq);
11621162
}
11631163

1164-
rt_err_t sys_mq_send(rt_mq_t mq, void *buffer, rt_size_t size)
1164+
sysret_t sys_mq_send(rt_mq_t mq, void *buffer, rt_size_t size)
11651165
{
11661166
if (!lwp_user_accessable((void *)buffer, size))
11671167
{
@@ -1170,7 +1170,7 @@ rt_err_t sys_mq_send(rt_mq_t mq, void *buffer, rt_size_t size)
11701170
return rt_mq_send(mq, buffer, size);
11711171
}
11721172

1173-
rt_err_t sys_mq_urgent(rt_mq_t mq, void *buffer, rt_size_t size)
1173+
sysret_t sys_mq_urgent(rt_mq_t mq, void *buffer, rt_size_t size)
11741174
{
11751175
if (!lwp_user_accessable((void *)buffer, size))
11761176
{
@@ -1179,7 +1179,7 @@ rt_err_t sys_mq_urgent(rt_mq_t mq, void *buffer, rt_size_t size)
11791179
return rt_mq_urgent(mq, buffer, size);
11801180
}
11811181

1182-
rt_err_t sys_mq_recv(rt_mq_t mq,
1182+
sysret_t sys_mq_recv(rt_mq_t mq,
11831183
void *buffer,
11841184
rt_size_t size,
11851185
rt_int32_t timeout)
@@ -1211,22 +1211,22 @@ rt_timer_t sys_rt_timer_create(const char *name,
12111211
return timer;
12121212
}
12131213

1214-
rt_err_t sys_rt_timer_delete(rt_timer_t timer)
1214+
sysret_t sys_rt_timer_delete(rt_timer_t timer)
12151215
{
12161216
return lwp_user_object_delete(lwp_self(), (rt_object_t)timer);
12171217
}
12181218

1219-
rt_err_t sys_rt_timer_start(rt_timer_t timer)
1219+
sysret_t sys_rt_timer_start(rt_timer_t timer)
12201220
{
12211221
return rt_timer_start(timer);
12221222
}
12231223

1224-
rt_err_t sys_rt_timer_stop(rt_timer_t timer)
1224+
sysret_t sys_rt_timer_stop(rt_timer_t timer)
12251225
{
12261226
return rt_timer_stop(timer);
12271227
}
12281228

1229-
rt_err_t sys_rt_timer_control(rt_timer_t timer, int cmd, void *arg)
1229+
sysret_t sys_rt_timer_control(rt_timer_t timer, int cmd, void *arg)
12301230
{
12311231
return rt_timer_control(timer, cmd, arg);
12321232
}
@@ -1243,7 +1243,7 @@ struct ksigevent
12431243
/* to protect unsafe implementation in current rt-smart toolchain */
12441244
RT_CTASSERT(sigevent_compatible, offsetof(struct ksigevent, sigev_tid) == offsetof(struct sigevent, sigev_notify_function));
12451245

1246-
rt_err_t sys_timer_create(clockid_t clockid, struct sigevent *restrict sevp, timer_t *restrict timerid)
1246+
sysret_t sys_timer_create(clockid_t clockid, struct sigevent *restrict sevp, timer_t *restrict timerid)
12471247
{
12481248
int ret = 0;
12491249
#ifdef ARCH_MM_MMU
@@ -1285,13 +1285,13 @@ rt_err_t sys_timer_create(clockid_t clockid, struct sigevent *restrict sevp, tim
12851285
return ret;
12861286
}
12871287

1288-
rt_err_t sys_timer_delete(timer_t timerid)
1288+
sysret_t sys_timer_delete(timer_t timerid)
12891289
{
12901290
int ret = timer_delete(timerid);
12911291
return (ret < 0 ? GET_ERRNO() : ret);
12921292
}
12931293

1294-
rt_err_t sys_timer_settime(timer_t timerid, int flags,
1294+
sysret_t sys_timer_settime(timer_t timerid, int flags,
12951295
const struct itimerspec *restrict new_value,
12961296
struct itimerspec *restrict old_value)
12971297
{
@@ -1315,7 +1315,7 @@ rt_err_t sys_timer_settime(timer_t timerid, int flags,
13151315
return (ret < 0 ? GET_ERRNO() : ret);
13161316
}
13171317

1318-
rt_err_t sys_timer_gettime(timer_t timerid, struct itimerspec *curr_value)
1318+
sysret_t sys_timer_gettime(timer_t timerid, struct itimerspec *curr_value)
13191319
{
13201320
int ret = 0;
13211321
#ifdef ARCH_MM_MMU
@@ -1330,7 +1330,7 @@ rt_err_t sys_timer_gettime(timer_t timerid, struct itimerspec *curr_value)
13301330
return (ret < 0 ? GET_ERRNO() : ret);
13311331
}
13321332

1333-
rt_err_t sys_timer_getoverrun(timer_t timerid)
1333+
sysret_t sys_timer_getoverrun(timer_t timerid)
13341334
{
13351335
int ret = 0;
13361336
ret = timer_getoverrun(timerid);
@@ -1663,7 +1663,7 @@ sysret_t _sys_fork(void)
16631663
{
16641664
rt_base_t level;
16651665
int tid = 0;
1666-
rt_err_t falival = 0;
1666+
sysret_t falival = 0;
16671667
struct rt_lwp *lwp = RT_NULL;
16681668
struct rt_lwp *self_lwp = RT_NULL;
16691669
rt_thread_t thread = RT_NULL;
@@ -2414,12 +2414,12 @@ sysret_t sys_execve(const char *path, char *const argv[], char *const envp[])
24142414
}
24152415
#endif /* ARCH_MM_MMU */
24162416

2417-
rt_err_t sys_thread_delete(rt_thread_t thread)
2417+
sysret_t sys_thread_delete(rt_thread_t thread)
24182418
{
24192419
#ifdef ARCH_MM_MMU
24202420
return rt_thread_delete(thread);
24212421
#else
2422-
rt_err_t ret = 0;
2422+
sysret_t ret = 0;
24232423

24242424
if(thread->parent.type != RT_Object_Class_Thread)
24252425
{
@@ -2439,7 +2439,7 @@ rt_err_t sys_thread_delete(rt_thread_t thread)
24392439
#endif
24402440
}
24412441

2442-
rt_err_t sys_thread_startup(rt_thread_t thread)
2442+
sysret_t sys_thread_startup(rt_thread_t thread)
24432443
{
24442444
return rt_thread_startup(thread);
24452445
}
@@ -2456,27 +2456,27 @@ sysret_t sys_channel_open(const char *name, int flags)
24562456
return lwp_channel_open(FDT_TYPE_LWP, name, flags);
24572457
}
24582458

2459-
rt_err_t sys_channel_close(int fd)
2459+
sysret_t sys_channel_close(int fd)
24602460
{
24612461
return lwp_channel_close(FDT_TYPE_LWP, fd);
24622462
}
24632463

2464-
rt_err_t sys_channel_send(int fd, rt_channel_msg_t data)
2464+
sysret_t sys_channel_send(int fd, rt_channel_msg_t data)
24652465
{
24662466
return lwp_channel_send(FDT_TYPE_LWP, fd, data);
24672467
}
24682468

2469-
rt_err_t sys_channel_send_recv_timeout(int fd, rt_channel_msg_t data, rt_channel_msg_t data_ret, rt_int32_t time)
2469+
sysret_t sys_channel_send_recv_timeout(int fd, rt_channel_msg_t data, rt_channel_msg_t data_ret, rt_int32_t time)
24702470
{
24712471
return lwp_channel_send_recv_timeout(FDT_TYPE_LWP, fd, data, data_ret, time);
24722472
}
24732473

2474-
rt_err_t sys_channel_reply(int fd, rt_channel_msg_t data)
2474+
sysret_t sys_channel_reply(int fd, rt_channel_msg_t data)
24752475
{
24762476
return lwp_channel_reply(FDT_TYPE_LWP, fd, data);
24772477
}
24782478

2479-
rt_err_t sys_channel_recv_timeout(int fd, rt_channel_msg_t data, rt_int32_t time)
2479+
sysret_t sys_channel_recv_timeout(int fd, rt_channel_msg_t data, rt_int32_t time)
24802480
{
24812481
return lwp_channel_recv_timeout(FDT_TYPE_LWP, fd, data, time);
24822482
}
@@ -2641,17 +2641,17 @@ sysret_t sys_shm_free(void *mem)
26412641
#endif
26422642

26432643
/* device interfaces */
2644-
rt_err_t sys_device_init(rt_device_t dev)
2644+
sysret_t sys_device_init(rt_device_t dev)
26452645
{
26462646
return rt_device_init(dev);
26472647
}
26482648

2649-
rt_err_t sys_device_register(rt_device_t dev, const char *name, rt_uint16_t flags)
2649+
sysret_t sys_device_register(rt_device_t dev, const char *name, rt_uint16_t flags)
26502650
{
26512651
return rt_device_register(dev, name, flags);
26522652
}
26532653

2654-
rt_err_t sys_device_control(rt_device_t dev, int cmd, void *arg)
2654+
sysret_t sys_device_control(rt_device_t dev, int cmd, void *arg)
26552655
{
26562656
return rt_device_control(dev, cmd, arg);
26572657
}
@@ -2661,12 +2661,12 @@ rt_device_t sys_device_find(const char* name)
26612661
return rt_device_find(name);
26622662
}
26632663

2664-
rt_err_t sys_device_open(rt_device_t dev, rt_uint16_t oflag)
2664+
sysret_t sys_device_open(rt_device_t dev, rt_uint16_t oflag)
26652665
{
26662666
return rt_device_open(dev, oflag);
26672667
}
26682668

2669-
rt_err_t sys_device_close(rt_device_t dev)
2669+
sysret_t sys_device_close(rt_device_t dev)
26702670
{
26712671
return rt_device_close(dev);
26722672
}
@@ -3129,7 +3129,7 @@ rt_tick_t sys_tick_get(void)
31293129
return rt_tick_get();
31303130
}
31313131

3132-
rt_err_t sys_thread_mdelay(rt_int32_t ms)
3132+
sysret_t sys_thread_mdelay(rt_int32_t ms)
31333133
{
31343134
return rt_thread_mdelay(ms);
31353135
}
@@ -3779,7 +3779,7 @@ sysret_t sys_getdents(int fd, struct libc_dirent *dirp, size_t nbytes)
37793779
return ret;
37803780
}
37813781

3782-
rt_err_t sys_get_errno(void)
3782+
sysret_t sys_get_errno(void)
37833783
{
37843784
return rt_get_errno();
37853785
}
@@ -4356,7 +4356,7 @@ sysret_t sys_fsync(int fd)
43564356
mqd_t sys_mq_open(const char *name, int flags, mode_t mode, struct mq_attr *attr)
43574357
{
43584358
mqd_t mqdes;
4359-
rt_err_t ret = 0;
4359+
sysret_t ret = 0;
43604360
#ifdef ARCH_MM_MMU
43614361
char *kname = RT_NULL;
43624362
int a_err = 0;

0 commit comments

Comments
 (0)