提交 657cbfda 编写于 作者: Z zhkag 提交者: guo

修复编译警告

上级 7c6c12cb
...@@ -52,7 +52,7 @@ uint64_t clock_cpu_gettime(void) ...@@ -52,7 +52,7 @@ uint64_t clock_cpu_gettime(void)
* @param parameter the Parameters of timeout function * @param parameter the Parameters of timeout function
* *
*/ */
void clock_cpu_settimeout(uint64_t tick, void (*timeout)(void *param), void *param) int clock_cpu_settimeout(uint64_t tick, void (*timeout)(void *param), void *param)
{ {
if (_cputime_ops) if (_cputime_ops)
return _cputime_ops->cputime_settimeout(tick, timeout, param); return _cputime_ops->cputime_settimeout(tick, timeout, param);
......
...@@ -17,12 +17,12 @@ struct rt_clock_cputime_ops ...@@ -17,12 +17,12 @@ struct rt_clock_cputime_ops
{ {
double (*cputime_getres)(void); double (*cputime_getres)(void);
uint64_t (*cputime_gettime)(void); uint64_t (*cputime_gettime)(void);
void (*cputime_settimeout)(uint64_t tick, void (*timeout)(void *param), void *param); int (*cputime_settimeout)(uint64_t tick, void (*timeout)(void *param), void *param);
}; };
double clock_cpu_getres(void); double clock_cpu_getres(void);
uint64_t clock_cpu_gettime(void); uint64_t clock_cpu_gettime(void);
void clock_cpu_settimeout(uint64_t tick, void (*timeout)(void *param), void *param); int clock_cpu_settimeout(uint64_t tick, void (*timeout)(void *param), void *param);
uint64_t clock_cpu_microsecond(uint64_t cpu_tick); uint64_t clock_cpu_microsecond(uint64_t cpu_tick);
uint64_t clock_cpu_millisecond(uint64_t cpu_tick); uint64_t clock_cpu_millisecond(uint64_t cpu_tick);
......
...@@ -950,6 +950,16 @@ int timer_id_alloc(void) ...@@ -950,6 +950,16 @@ int timer_id_alloc(void)
return -1; return -1;
} }
void timer_id_lock()
{
rt_hw_spin_lock(&_timer_id_lock);
}
void timer_id_unlock()
{
rt_hw_spin_unlock(&_timer_id_lock);
}
struct timer_obj *timer_id_get(int timerid) struct timer_obj *timer_id_get(int timerid)
{ {
struct timer_obj *timer; struct timer_obj *timer;
...@@ -972,15 +982,6 @@ int timer_id_put(int id) ...@@ -972,15 +982,6 @@ int timer_id_put(int id)
_g_timerid[id] = NULL; _g_timerid[id] = NULL;
return 0; return 0;
} }
void timer_id_lock()
{
rt_hw_spin_lock(&_timer_id_lock);
}
void timer_id_unlock()
{
rt_hw_spin_unlock(&_timer_id_lock);
}
/** /**
* @brief Create a per-process timer. * @brief Create a per-process timer.
* *
...@@ -1042,7 +1043,7 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid) ...@@ -1042,7 +1043,7 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid)
return -1; /* todo:memory leak */ return -1; /* todo:memory leak */
} }
_g_timerid[_timerid] = timer; _g_timerid[_timerid] = timer;
*timerid = _timerid; *timerid = (timer_t *)(rt_ubase_t)_timerid;
timer_id_unlock(); timer_id_unlock();
return 0; return 0;
...@@ -1058,15 +1059,15 @@ int timer_delete(timer_t timerid) ...@@ -1058,15 +1059,15 @@ int timer_delete(timer_t timerid)
{ {
struct timer_obj *timer; struct timer_obj *timer;
timer_id_lock(); timer_id_lock();
if (_g_timerid[(int)timerid] == NULL) if (_g_timerid[(rt_ubase_t)timerid] == NULL)
{ {
timer_id_unlock(); timer_id_unlock();
rt_set_errno(EINVAL); rt_set_errno(EINVAL);
LOG_E("can not find timer!"); LOG_E("can not find timer!");
return -1; return -1;
} }
timer = _g_timerid[(int)timerid]; timer = _g_timerid[(rt_ubase_t)timerid];
timer_id_put(timerid); timer_id_put((rt_ubase_t)timerid);
timer_id_unlock(); timer_id_unlock();
if (timer == RT_NULL || rt_object_get_type(&timer->timer.parent) != RT_Object_Class_Timer) if (timer == RT_NULL || rt_object_get_type(&timer->timer.parent) != RT_Object_Class_Timer)
...@@ -1105,7 +1106,7 @@ int timer_getoverrun(timer_t timerid) ...@@ -1105,7 +1106,7 @@ int timer_getoverrun(timer_t timerid)
*/ */
int timer_gettime(timer_t timerid, struct itimerspec *its) int timer_gettime(timer_t timerid, struct itimerspec *its)
{ {
struct timer_obj *timer = timer_id_get(timerid); struct timer_obj *timer = timer_id_get((rt_ubase_t)timerid);
rt_tick_t remaining; rt_tick_t remaining;
rt_uint32_t seconds, nanoseconds; rt_uint32_t seconds, nanoseconds;
...@@ -1172,7 +1173,7 @@ RTM_EXPORT(timer_gettime); ...@@ -1172,7 +1173,7 @@ RTM_EXPORT(timer_gettime);
int timer_settime(timer_t timerid, int flags, const struct itimerspec *value, int timer_settime(timer_t timerid, int flags, const struct itimerspec *value,
struct itimerspec *ovalue) struct itimerspec *ovalue)
{ {
struct timer_obj *timer = timer_id_get(timerid); struct timer_obj *timer = timer_id_get((rt_ubase_t)timerid);
if (timer == NULL || if (timer == NULL ||
rt_object_get_type(&timer->timer.parent) != RT_Object_Class_Timer || rt_object_get_type(&timer->timer.parent) != RT_Object_Class_Timer ||
value->it_interval.tv_nsec < 0 || value->it_interval.tv_nsec < 0 ||
......
...@@ -4338,7 +4338,7 @@ int sys_mq_unlink(const char *name) ...@@ -4338,7 +4338,7 @@ int sys_mq_unlink(const char *name)
lwp_get_from_user(kname, (void *)name, len + 1); lwp_get_from_user(kname, (void *)name, len + 1);
ret = mq_unlink(kname); ret = mq_unlink(kname);
if (err < 0) if (ret < 0)
{ {
ret = GET_ERRNO(); ret = GET_ERRNO();
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册