summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cpu.c4
-rw-r--r--src/idle.c10
-rw-r--r--src/ipc.c166
-rw-r--r--src/mem.c2
-rw-r--r--src/mempool.c8
-rw-r--r--src/object.c28
-rw-r--r--src/scheduler.c22
-rw-r--r--src/signal.c4
-rwxr-xr-xsrc/thread.c54
-rw-r--r--src/timer.c16
10 files changed, 157 insertions, 157 deletions
diff --git a/src/cpu.c b/src/cpu.c
index b689ecf2d7..2371ec2e5b 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -19,7 +19,7 @@ rt_hw_spinlock_t _cpus_lock;
*/
static void _cpu_preempt_disable(void)
{
- register rt_base_t level;
+ rt_base_t level;
struct rt_thread *current_thread;
/* disable interrupt */
@@ -44,7 +44,7 @@ static void _cpu_preempt_disable(void)
*/
static void _cpu_preempt_enable(void)
{
- register rt_base_t level;
+ rt_base_t level;
struct rt_thread *current_thread;
/* disable interrupt */
diff --git a/src/idle.c b/src/idle.c
index 7ea0cd15de..ea8eb61c46 100644
--- a/src/idle.c
+++ b/src/idle.c
@@ -155,13 +155,13 @@ void rt_thread_defunct_enqueue(rt_thread_t thread)
*/
rt_thread_t rt_thread_defunct_dequeue(void)
{
- register rt_base_t lock;
+ rt_base_t level;
rt_thread_t thread = RT_NULL;
rt_list_t *l = &_rt_thread_defunct;
#ifdef RT_USING_SMP
/* disable interrupt */
- lock = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
if (l->next != l)
{
thread = rt_list_entry(l->next,
@@ -169,16 +169,16 @@ rt_thread_t rt_thread_defunct_dequeue(void)
tlist);
rt_list_remove(&(thread->tlist));
}
- rt_hw_interrupt_enable(lock);
+ rt_hw_interrupt_enable(level);
#else
if (l->next != l)
{
thread = rt_list_entry(l->next,
struct rt_thread,
tlist);
- lock = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
rt_list_remove(&(thread->tlist));
- rt_hw_interrupt_enable(lock);
+ rt_hw_interrupt_enable(level);
}
#endif
return thread;
diff --git a/src/ipc.c b/src/ipc.c
index e7e92976e5..6fd9ce596b 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -220,13 +220,13 @@ rt_inline rt_err_t _ipc_list_resume(rt_list_t *list)
rt_inline rt_err_t _ipc_list_resume_all(rt_list_t *list)
{
struct rt_thread *thread;
- register rt_ubase_t temp;
+ rt_base_t level;
/* wakeup all suspended threads */
while (!rt_list_isempty(list))
{
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* get next suspended thread */
thread = rt_list_entry(list->next, struct rt_thread, tlist);
@@ -241,7 +241,7 @@ rt_inline rt_err_t _ipc_list_resume_all(rt_list_t *list)
rt_thread_resume(thread);
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
}
return RT_EOK;
@@ -483,7 +483,7 @@ RTM_EXPORT(rt_sem_delete);
*/
rt_err_t rt_sem_take(rt_sem_t sem, rt_int32_t timeout)
{
- register rt_base_t temp;
+ rt_base_t level;
struct rt_thread *thread;
/* parameter check */
@@ -493,7 +493,7 @@ rt_err_t rt_sem_take(rt_sem_t sem, rt_int32_t timeout)
RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(sem->parent.parent)));
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
RT_DEBUG_LOG(RT_DEBUG_IPC, ("thread %s take sem:%s, which value is: %d\n",
rt_thread_self()->name,
@@ -506,14 +506,14 @@ rt_err_t rt_sem_take(rt_sem_t sem, rt_int32_t timeout)
sem->value --;
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
}
else
{
/* no waiting, return with timeout */
if (timeout == 0)
{
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_ETIMEOUT;
}
@@ -551,7 +551,7 @@ rt_err_t rt_sem_take(rt_sem_t sem, rt_int32_t timeout)
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* do schedule */
rt_schedule();
@@ -605,7 +605,7 @@ RTM_EXPORT(rt_sem_trytake);
*/
rt_err_t rt_sem_release(rt_sem_t sem)
{
- register rt_base_t temp;
+ rt_base_t level;
register rt_bool_t need_schedule;
/* parameter check */
@@ -617,7 +617,7 @@ rt_err_t rt_sem_release(rt_sem_t sem)
need_schedule = RT_FALSE;
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
RT_DEBUG_LOG(RT_DEBUG_IPC, ("thread %s releases sem:%s, which value is: %d\n",
rt_thread_self()->name,
@@ -638,13 +638,13 @@ rt_err_t rt_sem_release(rt_sem_t sem)
}
else
{
- rt_hw_interrupt_enable(temp); /* enable interrupt */
+ rt_hw_interrupt_enable(level); /* enable interrupt */
return -RT_EFULL; /* value overflowed */
}
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* resume a thread, re-schedule */
if (need_schedule == RT_TRUE)
@@ -671,7 +671,7 @@ RTM_EXPORT(rt_sem_release);
*/
rt_err_t rt_sem_control(rt_sem_t sem, int cmd, void *arg)
{
- rt_ubase_t level;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(sem != RT_NULL);
@@ -913,7 +913,7 @@ RTM_EXPORT(rt_mutex_delete);
*/
rt_err_t rt_mutex_take(rt_mutex_t mutex, rt_int32_t timeout)
{
- register rt_base_t temp;
+ rt_base_t level;
struct rt_thread *thread;
/* this function must not be used in interrupt even if time = 0 */
@@ -928,7 +928,7 @@ rt_err_t rt_mutex_take(rt_mutex_t mutex, rt_int32_t timeout)
thread = rt_thread_self();
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(mutex->parent.parent)));
@@ -948,7 +948,7 @@ rt_err_t rt_mutex_take(rt_mutex_t mutex, rt_int32_t timeout)
}
else
{
- rt_hw_interrupt_enable(temp); /* enable interrupt */
+ rt_hw_interrupt_enable(level); /* enable interrupt */
return -RT_EFULL; /* value overflowed */
}
}
@@ -971,7 +971,7 @@ rt_err_t rt_mutex_take(rt_mutex_t mutex, rt_int32_t timeout)
}
else
{
- rt_hw_interrupt_enable(temp); /* enable interrupt */
+ rt_hw_interrupt_enable(level); /* enable interrupt */
return -RT_EFULL; /* value overflowed */
}
}
@@ -984,7 +984,7 @@ rt_err_t rt_mutex_take(rt_mutex_t mutex, rt_int32_t timeout)
thread->error = -RT_ETIMEOUT;
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_ETIMEOUT;
}
@@ -1023,7 +1023,7 @@ rt_err_t rt_mutex_take(rt_mutex_t mutex, rt_int32_t timeout)
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* do schedule */
rt_schedule();
@@ -1037,14 +1037,14 @@ rt_err_t rt_mutex_take(rt_mutex_t mutex, rt_int32_t timeout)
{
/* the mutex is taken successfully. */
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
}
}
}
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
RT_OBJECT_HOOK_CALL(rt_object_take_hook, (&(mutex->parent.parent)));
@@ -1089,7 +1089,7 @@ RTM_EXPORT(rt_mutex_trytake);
*/
rt_err_t rt_mutex_release(rt_mutex_t mutex)
{
- register rt_base_t temp;
+ rt_base_t level;
struct rt_thread *thread;
rt_bool_t need_schedule;
@@ -1106,7 +1106,7 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
thread = rt_thread_self();
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
RT_DEBUG_LOG(RT_DEBUG_IPC,
("mutex_release:current thread %s, mutex value: %d, hold: %d\n",
@@ -1120,7 +1120,7 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
thread->error = -RT_ERROR;
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_ERROR;
}
@@ -1159,7 +1159,7 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
}
else
{
- rt_hw_interrupt_enable(temp); /* enable interrupt */
+ rt_hw_interrupt_enable(level); /* enable interrupt */
return -RT_EFULL; /* value overflowed */
}
@@ -1177,7 +1177,7 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
}
else
{
- rt_hw_interrupt_enable(temp); /* enable interrupt */
+ rt_hw_interrupt_enable(level); /* enable interrupt */
return -RT_EFULL; /* value overflowed */
}
@@ -1188,7 +1188,7 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* perform a schedule */
if (need_schedule == RT_TRUE)
@@ -1441,7 +1441,7 @@ rt_err_t rt_event_send(rt_event_t event, rt_uint32_t set)
{
struct rt_list_node *n;
struct rt_thread *thread;
- register rt_ubase_t level;
+ rt_base_t level;
register rt_base_t status;
rt_bool_t need_schedule;
@@ -1569,7 +1569,7 @@ rt_err_t rt_event_recv(rt_event_t event,
rt_uint32_t *recved)
{
struct rt_thread *thread;
- register rt_ubase_t level;
+ rt_base_t level;
register rt_base_t status;
/* parameter check */
@@ -1702,7 +1702,7 @@ RTM_EXPORT(rt_event_recv);
*/
rt_err_t rt_event_control(rt_event_t event, int cmd, void *arg)
{
- rt_ubase_t level;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(event != RT_NULL);
@@ -1993,7 +1993,7 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
rt_int32_t timeout)
{
struct rt_thread *thread;
- register rt_ubase_t temp;
+ rt_base_t level;
rt_uint32_t tick_delta;
/* parameter check */
@@ -2011,12 +2011,12 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
RT_OBJECT_HOOK_CALL(rt_object_put_hook, (&(mb->parent.parent)));
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* for non-blocking call */
if (mb->entry == mb->size && timeout == 0)
{
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_EFULL;
}
@@ -2030,7 +2030,7 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
if (timeout == 0)
{
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_EFULL;
}
@@ -2057,7 +2057,7 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* re-schedule */
rt_schedule();
@@ -2070,7 +2070,7 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
}
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* if it's not waiting forever and then re-calculate timeout tick */
if (timeout > 0)
@@ -2096,7 +2096,7 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
}
else
{
- rt_hw_interrupt_enable(temp); /* enable interrupt */
+ rt_hw_interrupt_enable(level); /* enable interrupt */
return -RT_EFULL; /* value overflowed */
}
@@ -2106,7 +2106,7 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
_ipc_list_resume(&(mb->parent.suspend_thread));
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
rt_schedule();
@@ -2114,7 +2114,7 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return RT_EOK;
}
@@ -2163,7 +2163,7 @@ RTM_EXPORT(rt_mb_send);
*/
rt_err_t rt_mb_urgent(rt_mailbox_t mb, rt_ubase_t value)
{
- register rt_ubase_t temp;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(mb != RT_NULL);
@@ -2172,11 +2172,11 @@ rt_err_t rt_mb_urgent(rt_mailbox_t mb, rt_ubase_t value)
RT_OBJECT_HOOK_CALL(rt_object_put_hook, (&(mb->parent.parent)));
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
if (mb->entry == mb->size)
{
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_EFULL;
}
@@ -2202,7 +2202,7 @@ rt_err_t rt_mb_urgent(rt_mailbox_t mb, rt_ubase_t value)
_ipc_list_resume(&(mb->parent.suspend_thread));
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
rt_schedule();
@@ -2210,7 +2210,7 @@ rt_err_t rt_mb_urgent(rt_mailbox_t mb, rt_ubase_t value)
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return RT_EOK;
}
@@ -2238,7 +2238,7 @@ RTM_EXPORT(rt_mb_urgent);
rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
{
struct rt_thread *thread;
- register rt_ubase_t temp;
+ rt_base_t level;
rt_uint32_t tick_delta;
/* parameter check */
@@ -2256,12 +2256,12 @@ rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(mb->parent.parent)));
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* for non-blocking call */
if (mb->entry == 0 && timeout == 0)
{
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_ETIMEOUT;
}
@@ -2276,7 +2276,7 @@ rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
if (timeout == 0)
{
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
thread->error = -RT_ETIMEOUT;
@@ -2305,7 +2305,7 @@ rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* re-schedule */
rt_schedule();
@@ -2318,7 +2318,7 @@ rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
}
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* if it's not waiting forever and then re-calculate timeout tick */
if (timeout > 0)
@@ -2350,7 +2350,7 @@ rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
_ipc_list_resume(&(mb->suspend_sender_thread));
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
RT_OBJECT_HOOK_CALL(rt_object_take_hook, (&(mb->parent.parent)));
@@ -2360,7 +2360,7 @@ rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
RT_OBJECT_HOOK_CALL(rt_object_take_hook, (&(mb->parent.parent)));
@@ -2385,7 +2385,7 @@ RTM_EXPORT(rt_mb_recv);
*/
rt_err_t rt_mb_control(rt_mailbox_t mb, int cmd, void *arg)
{
- rt_ubase_t level;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(mb != RT_NULL);
@@ -2744,7 +2744,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
rt_size_t size,
rt_int32_t timeout)
{
- register rt_ubase_t temp;
+ rt_base_t level;
struct rt_mq_message *msg;
rt_uint32_t tick_delta;
struct rt_thread *thread;
@@ -2770,7 +2770,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
RT_OBJECT_HOOK_CALL(rt_object_put_hook, (&(mq->parent.parent)));
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* get a free list, there must be an empty item */
msg = (struct rt_mq_message *)mq->msg_queue_free;
@@ -2778,7 +2778,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
if (msg == RT_NULL && timeout == 0)
{
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_EFULL;
}
@@ -2793,7 +2793,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
if (timeout == 0)
{
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_EFULL;
}
@@ -2820,7 +2820,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* re-schedule */
rt_schedule();
@@ -2833,7 +2833,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
}
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* if it's not waiting forever and then re-calculate timeout tick */
if (timeout > 0)
@@ -2849,7 +2849,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
mq->msg_queue_free = msg->next;
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* the msg is the new tailer of list, the next shall be NULL */
msg->next = RT_NULL;
@@ -2857,7 +2857,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
rt_memcpy(msg + 1, buffer, size);
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* link msg to message queue */
if (mq->msg_queue_tail != RT_NULL)
{
@@ -2878,7 +2878,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
}
else
{
- rt_hw_interrupt_enable(temp); /* enable interrupt */
+ rt_hw_interrupt_enable(level); /* enable interrupt */
return -RT_EFULL; /* value overflowed */
}
@@ -2888,7 +2888,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
_ipc_list_resume(&(mq->parent.suspend_thread));
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
rt_schedule();
@@ -2896,7 +2896,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return RT_EOK;
}
@@ -2952,7 +2952,7 @@ RTM_EXPORT(rt_mq_send);
*/
rt_err_t rt_mq_urgent(rt_mq_t mq, const void *buffer, rt_size_t size)
{
- register rt_ubase_t temp;
+ rt_base_t level;
struct rt_mq_message *msg;
/* parameter check */
@@ -2968,7 +2968,7 @@ rt_err_t rt_mq_urgent(rt_mq_t mq, const void *buffer, rt_size_t size)
RT_OBJECT_HOOK_CALL(rt_object_put_hook, (&(mq->parent.parent)));
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* get a free list, there must be an empty item */
msg = (struct rt_mq_message *)mq->msg_queue_free;
@@ -2976,7 +2976,7 @@ rt_err_t rt_mq_urgent(rt_mq_t mq, const void *buffer, rt_size_t size)
if (msg == RT_NULL)
{
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_EFULL;
}
@@ -2984,13 +2984,13 @@ rt_err_t rt_mq_urgent(rt_mq_t mq, const void *buffer, rt_size_t size)
mq->msg_queue_free = msg->next;
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* copy buffer */
rt_memcpy(msg + 1, buffer, size);
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* link msg to the beginning of message queue */
msg->next = (struct rt_mq_message *)mq->msg_queue_head;
@@ -3007,7 +3007,7 @@ rt_err_t rt_mq_urgent(rt_mq_t mq, const void *buffer, rt_size_t size)
}
else
{
- rt_hw_interrupt_enable(temp); /* enable interrupt */
+ rt_hw_interrupt_enable(level); /* enable interrupt */
return -RT_EFULL; /* value overflowed */
}
@@ -3017,7 +3017,7 @@ rt_err_t rt_mq_urgent(rt_mq_t mq, const void *buffer, rt_size_t size)
_ipc_list_resume(&(mq->parent.suspend_thread));
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
rt_schedule();
@@ -3025,7 +3025,7 @@ rt_err_t rt_mq_urgent(rt_mq_t mq, const void *buffer, rt_size_t size)
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return RT_EOK;
}
@@ -3064,7 +3064,7 @@ rt_err_t rt_mq_recv(rt_mq_t mq,
rt_int32_t timeout)
{
struct rt_thread *thread;
- register rt_ubase_t temp;
+ rt_base_t level;
struct rt_mq_message *msg;
rt_uint32_t tick_delta;
@@ -3084,12 +3084,12 @@ rt_err_t rt_mq_recv(rt_mq_t mq,
RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(mq->parent.parent)));
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* for non-blocking call */
if (mq->entry == 0 && timeout == 0)
{
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
return -RT_ETIMEOUT;
}
@@ -3104,7 +3104,7 @@ rt_err_t rt_mq_recv(rt_mq_t mq,
if (timeout == 0)
{
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
thread->error = -RT_ETIMEOUT;
@@ -3133,7 +3133,7 @@ rt_err_t rt_mq_recv(rt_mq_t mq,
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* re-schedule */
rt_schedule();
@@ -3146,7 +3146,7 @@ rt_err_t rt_mq_recv(rt_mq_t mq,
}
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* if it's not waiting forever and then re-calculate timeout tick */
if (timeout > 0)
@@ -3174,13 +3174,13 @@ rt_err_t rt_mq_recv(rt_mq_t mq,
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* copy message */
rt_memcpy(buffer, msg + 1, size > mq->msg_size ? mq->msg_size : size);
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* put message to free list */
msg->next = (struct rt_mq_message *)mq->msg_queue_free;
mq->msg_queue_free = msg;
@@ -3191,7 +3191,7 @@ rt_err_t rt_mq_recv(rt_mq_t mq,
_ipc_list_resume(&(mq->suspend_sender_thread));
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
RT_OBJECT_HOOK_CALL(rt_object_take_hook, (&(mq->parent.parent)));
@@ -3201,7 +3201,7 @@ rt_err_t rt_mq_recv(rt_mq_t mq,
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
RT_OBJECT_HOOK_CALL(rt_object_take_hook, (&(mq->parent.parent)));
@@ -3226,7 +3226,7 @@ RTM_EXPORT(rt_mq_recv);
*/
rt_err_t rt_mq_control(rt_mq_t mq, int cmd, void *arg)
{
- rt_ubase_t level;
+ rt_base_t level;
struct rt_mq_message *msg;
/* parameter check */
diff --git a/src/mem.c b/src/mem.c
index f1e1eeba55..4261229256 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -563,7 +563,7 @@ RTM_EXPORT(rt_smem_free);
int memcheck(int argc, char *argv[])
{
int position;
- rt_ubase_t level;
+ rt_base_t level;
struct rt_small_mem_item *mem;
struct rt_small_mem *m;
struct rt_object_information *information;
diff --git a/src/mempool.c b/src/mempool.c
index ea0ea94cfa..44010bbace 100644
--- a/src/mempool.c
+++ b/src/mempool.c
@@ -146,7 +146,7 @@ RTM_EXPORT(rt_mp_init);
rt_err_t rt_mp_detach(struct rt_mempool *mp)
{
struct rt_thread *thread;
- register rt_ubase_t level;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(mp != RT_NULL);
@@ -264,7 +264,7 @@ RTM_EXPORT(rt_mp_create);
rt_err_t rt_mp_delete(rt_mp_t mp)
{
struct rt_thread *thread;
- register rt_ubase_t level;
+ rt_base_t level;
RT_DEBUG_NOT_IN_INTERRUPT;
@@ -319,7 +319,7 @@ RTM_EXPORT(rt_mp_delete);
void *rt_mp_alloc(rt_mp_t mp, rt_int32_t time)
{
rt_uint8_t *block_ptr;
- register rt_base_t level;
+ rt_base_t level;
struct rt_thread *thread;
rt_uint32_t before_sleep = 0;
@@ -417,7 +417,7 @@ void rt_mp_free(void *block)
rt_uint8_t **block_ptr;
struct rt_mempool *mp;
struct rt_thread *thread;
- register rt_base_t level;
+ rt_base_t level;
/* parameter check */
if (block == RT_NULL) return;
diff --git a/src/object.c b/src/object.c
index 259d82fc62..af13731e21 100644
--- a/src/object.c
+++ b/src/object.c
@@ -253,7 +253,7 @@ RTM_EXPORT(rt_object_get_information);
int rt_object_get_length(enum rt_object_class_type type)
{
int count = 0;
- rt_ubase_t level;
+ rt_base_t level;
struct rt_list_node *node = RT_NULL;
struct rt_object_information *information = RT_NULL;
@@ -288,7 +288,7 @@ RTM_EXPORT(rt_object_get_length);
int rt_object_get_pointers(enum rt_object_class_type type, rt_object_t *pointers, int maxlen)
{
int index = 0;
- rt_ubase_t level;
+ rt_base_t level;
struct rt_object *object;
struct rt_list_node *node = RT_NULL;
@@ -330,7 +330,7 @@ void rt_object_init(struct rt_object *object,
enum rt_object_class_type type,
const char *name)
{
- register rt_base_t temp;
+ rt_base_t level;
struct rt_list_node *node = RT_NULL;
struct rt_object_information *information;
#ifdef RT_USING_MODULE
@@ -370,7 +370,7 @@ void rt_object_init(struct rt_object *object,
RT_OBJECT_HOOK_CALL(rt_object_attach_hook, (object));
/* lock interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
#ifdef RT_USING_MODULE
if (module)
@@ -386,7 +386,7 @@ void rt_object_init(struct rt_object *object,
}
/* unlock interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
}
/**
@@ -397,7 +397,7 @@ void rt_object_init(struct rt_object *object,
*/
void rt_object_detach(rt_object_t object)
{
- register rt_base_t temp;
+ rt_base_t level;
/* object check */
RT_ASSERT(object != RT_NULL);
@@ -408,13 +408,13 @@ void rt_object_detach(rt_object_t object)
object->type = 0;
/* lock interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* remove from old list */
rt_list_remove(&(object->list));
/* unlock interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
}
#ifdef RT_USING_HEAP
@@ -430,7 +430,7 @@ void rt_object_detach(rt_object_t object)
rt_object_t rt_object_allocate(enum rt_object_class_type type, const char *name)
{
struct rt_object *object;
- register rt_base_t temp;
+ rt_base_t level;
struct rt_object_information *information;
#ifdef RT_USING_MODULE
struct rt_dlmodule *module = dlmodule_self();
@@ -466,7 +466,7 @@ rt_object_t rt_object_allocate(enum rt_object_class_type type, const char *name)
RT_OBJECT_HOOK_CALL(rt_object_attach_hook, (object));
/* lock interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
#ifdef RT_USING_MODULE
if (module)
@@ -482,7 +482,7 @@ rt_object_t rt_object_allocate(enum rt_object_class_type type, const char *name)
}
/* unlock interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* return object */
return object;
@@ -495,7 +495,7 @@ rt_object_t rt_object_allocate(enum rt_object_class_type type, const char *name)
*/
void rt_object_delete(rt_object_t object)
{
- register rt_base_t temp;
+ rt_base_t level;
/* object check */
RT_ASSERT(object != RT_NULL);
@@ -507,13 +507,13 @@ void rt_object_delete(rt_object_t object)
object->type = RT_Object_Class_Null;
/* lock interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* remove from old list */
rt_list_remove(&(object->list));
/* unlock interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* free the memory of object */
RT_KERNEL_FREE(object);
diff --git a/src/scheduler.c b/src/scheduler.c
index 6123aaf42a..a6729b9b09 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -103,7 +103,7 @@ static void _rt_scheduler_stack_check(struct rt_thread *thread)
(rt_ubase_t)thread->sp >
(rt_ubase_t)thread->stack_addr + (rt_ubase_t)thread->stack_size)
{
- rt_ubase_t level;
+ rt_base_t level;
rt_kprintf("thread:%s stack overflow\n", thread->name);
@@ -655,7 +655,7 @@ void rt_schedule_insert_thread(struct rt_thread *thread)
int cpu_id;
int bind_cpu;
rt_uint32_t cpu_mask;
- register rt_base_t level;
+ rt_base_t level;
RT_ASSERT(thread != RT_NULL);
@@ -717,12 +717,12 @@ __exit:
#else
void rt_schedule_insert_thread(struct rt_thread *thread)
{
- register rt_base_t temp;
+ rt_base_t level;
RT_ASSERT(thread != RT_NULL);
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* it's current thread, it should be RUNNING thread */
if (thread == rt_current_thread)
@@ -748,7 +748,7 @@ void rt_schedule_insert_thread(struct rt_thread *thread)
__exit:
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
}
#endif /* RT_USING_SMP */
@@ -762,7 +762,7 @@ __exit:
#ifdef RT_USING_SMP
void rt_schedule_remove_thread(struct rt_thread *thread)
{
- register rt_base_t level;
+ rt_base_t level;
RT_ASSERT(thread != RT_NULL);
@@ -814,7 +814,7 @@ void rt_schedule_remove_thread(struct rt_thread *thread)
#else
void rt_schedule_remove_thread(struct rt_thread *thread)
{
- register rt_base_t level;
+ rt_base_t level;
RT_ASSERT(thread != RT_NULL);
@@ -851,7 +851,7 @@ void rt_schedule_remove_thread(struct rt_thread *thread)
#ifdef RT_USING_SMP
void rt_enter_critical(void)
{
- register rt_base_t level;
+ rt_base_t level;
struct rt_thread *current_thread;
/* disable interrupt */
@@ -890,7 +890,7 @@ void rt_enter_critical(void)
#else
void rt_enter_critical(void)
{
- register rt_base_t level;
+ rt_base_t level;
/* disable interrupt */
level = rt_hw_interrupt_disable();
@@ -913,7 +913,7 @@ RTM_EXPORT(rt_enter_critical);
#ifdef RT_USING_SMP
void rt_exit_critical(void)
{
- register rt_base_t level;
+ rt_base_t level;
struct rt_thread *current_thread;
/* disable interrupt */
@@ -954,7 +954,7 @@ void rt_exit_critical(void)
#else
void rt_exit_critical(void)
{
- register rt_base_t level;
+ rt_base_t level;
/* disable interrupt */
level = rt_hw_interrupt_disable();
diff --git a/src/signal.c b/src/signal.c
index 14201ee948..60996a6e08 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -91,7 +91,7 @@ static void _signal_entry(void *parameter)
*/
static void _signal_deliver(rt_thread_t tid)
{
- rt_ubase_t level;
+ rt_base_t level;
level = rt_hw_interrupt_disable();
@@ -321,7 +321,7 @@ void rt_signal_unmask(int signo)
int rt_signal_wait(const rt_sigset_t *set, rt_siginfo_t *si, rt_int32_t timeout)
{
int ret = RT_EOK;
- rt_base_t level;
+ rt_base_t level;
rt_thread_t tid = rt_thread_self();
struct siginfo_node *si_node = RT_NULL, *si_prev = RT_NULL;
diff --git a/src/thread.c b/src/thread.c
index d0cdc4043a..45107ced3c 100755
--- a/src/thread.c
+++ b/src/thread.c
@@ -91,7 +91,7 @@ void rt_thread_inited_sethook(void (*hook)(rt_thread_t thread))
static void _thread_exit(void)
{
struct rt_thread *thread;
- register rt_base_t level;
+ rt_base_t level;
/* get current thread */
thread = rt_thread_self();
@@ -127,7 +127,7 @@ static void _thread_exit(void)
static void _thread_timeout(void *parameter)
{
struct rt_thread *thread;
- register rt_base_t temp;
+ rt_base_t level;
thread = (struct rt_thread *)parameter;
@@ -137,7 +137,7 @@ static void _thread_timeout(void *parameter)
RT_ASSERT(rt_object_get_type((rt_object_t)thread) == RT_Object_Class_Thread);
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* set error number */
thread->error = -RT_ETIMEOUT;
@@ -149,7 +149,7 @@ static void _thread_timeout(void *parameter)
rt_schedule_insert_thread(thread);
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
/* do schedule */
rt_schedule();
@@ -327,7 +327,7 @@ RTM_EXPORT(rt_thread_init);
rt_thread_t rt_thread_self(void)
{
#ifdef RT_USING_SMP
- rt_base_t lock;
+ register rt_base_t lock;
rt_thread_t self;
lock = rt_hw_local_irq_disable();
@@ -393,7 +393,7 @@ RTM_EXPORT(rt_thread_startup);
*/
rt_err_t rt_thread_detach(rt_thread_t thread)
{
- rt_base_t lock;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(thread != RT_NULL);
@@ -410,7 +410,7 @@ rt_err_t rt_thread_detach(rt_thread_t thread)
}
/* disable interrupt */
- lock = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* release thread timer */
rt_timer_detach(&(thread->thread_timer));
@@ -422,7 +422,7 @@ rt_err_t rt_thread_detach(rt_thread_t thread)
rt_thread_defunct_enqueue(thread);
/* enable interrupt */
- rt_hw_interrupt_enable(lock);
+ rt_hw_interrupt_enable(level);
return RT_EOK;
}
@@ -496,7 +496,7 @@ RTM_EXPORT(rt_thread_create);
*/
rt_err_t rt_thread_delete(rt_thread_t thread)
{
- rt_base_t lock;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(thread != RT_NULL);
@@ -513,7 +513,7 @@ rt_err_t rt_thread_delete(rt_thread_t thread)
}
/* disable interrupt */
- lock = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* release thread timer */
rt_timer_detach(&(thread->thread_timer));
@@ -525,7 +525,7 @@ rt_err_t rt_thread_delete(rt_thread_t thread)
rt_thread_defunct_enqueue(thread);
/* enable interrupt */
- rt_hw_interrupt_enable(lock);
+ rt_hw_interrupt_enable(level);
return RT_EOK;
}
@@ -543,14 +543,14 @@ RTM_EXPORT(rt_thread_delete);
rt_err_t rt_thread_yield(void)
{
struct rt_thread *thread;
- rt_base_t lock;
+ rt_base_t level;
thread = rt_thread_self();
- lock = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
thread->remaining_tick = thread->init_tick;
thread->stat |= RT_THREAD_STAT_YIELD;
rt_schedule();
- rt_hw_interrupt_enable(lock);
+ rt_hw_interrupt_enable(level);
return RT_EOK;
}
@@ -567,7 +567,7 @@ RTM_EXPORT(rt_thread_yield);
*/
rt_err_t rt_thread_sleep(rt_tick_t tick)
{
- register rt_base_t temp;
+ rt_base_t level;
struct rt_thread *thread;
/* set to current thread */
@@ -576,7 +576,7 @@ rt_err_t rt_thread_sleep(rt_tick_t tick)
RT_ASSERT(rt_object_get_type((rt_object_t)thread) == RT_Object_Class_Thread);
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* reset thread error */
thread->error = RT_EOK;
@@ -589,7 +589,7 @@ rt_err_t rt_thread_sleep(rt_tick_t tick)
rt_timer_start(&(thread->thread_timer));
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
rt_schedule();
@@ -626,7 +626,7 @@ RTM_EXPORT(rt_thread_delay);
*/
rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick)
{
- register rt_base_t level;
+ rt_base_t level;
struct rt_thread *thread;
rt_tick_t cur_tick;
@@ -719,7 +719,7 @@ RTM_EXPORT(rt_thread_mdelay);
*/
rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
{
- register rt_base_t temp;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(thread != RT_NULL);
@@ -730,7 +730,7 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
case RT_THREAD_CTRL_CHANGE_PRIORITY:
{
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* for ready thread, change queue */
if ((thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_READY)
@@ -768,7 +768,7 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
}
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
break;
}
@@ -837,7 +837,7 @@ RTM_EXPORT(rt_thread_control);
rt_err_t rt_thread_suspend(rt_thread_t thread)
{
register rt_base_t stat;
- register rt_base_t temp;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(thread != RT_NULL);
@@ -854,7 +854,7 @@ rt_err_t rt_thread_suspend(rt_thread_t thread)
}
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* change thread stat */
rt_schedule_remove_thread(thread);
@@ -864,7 +864,7 @@ rt_err_t rt_thread_suspend(rt_thread_t thread)
rt_timer_stop(&(thread->thread_timer));
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
RT_OBJECT_HOOK_CALL(rt_thread_suspend_hook, (thread));
return RT_EOK;
@@ -883,7 +883,7 @@ RTM_EXPORT(rt_thread_suspend);
*/
rt_err_t rt_thread_resume(rt_thread_t thread)
{
- register rt_base_t temp;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(thread != RT_NULL);
@@ -900,7 +900,7 @@ rt_err_t rt_thread_resume(rt_thread_t thread)
}
/* disable interrupt */
- temp = rt_hw_interrupt_disable();
+ level = rt_hw_interrupt_disable();
/* remove from suspend list */
rt_list_remove(&(thread->tlist));
@@ -911,7 +911,7 @@ rt_err_t rt_thread_resume(rt_thread_t thread)
rt_schedule_insert_thread(thread);
/* enable interrupt */
- rt_hw_interrupt_enable(temp);
+ rt_hw_interrupt_enable(level);
RT_OBJECT_HOOK_CALL(rt_thread_resume_hook, (thread));
return RT_EOK;
diff --git a/src/timer.c b/src/timer.c
index 1f048c9b09..c9b890eed0 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -156,7 +156,7 @@ static void _timer_init(rt_timer_t timer,
static rt_err_t _timer_list_next_timeout(rt_list_t timer_list[], rt_tick_t *timeout_tick)
{
struct rt_timer *timer;
- register rt_base_t level;
+ rt_base_t level;
/* disable interrupt */
level = rt_hw_interrupt_disable();
@@ -288,7 +288,7 @@ RTM_EXPORT(rt_timer_init);
*/
rt_err_t rt_timer_detach(rt_timer_t timer)
{
- register rt_base_t level;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(timer != RT_NULL);
@@ -363,7 +363,7 @@ RTM_EXPORT(rt_timer_create);
*/
rt_err_t rt_timer_delete(rt_timer_t timer)
{
- register rt_base_t level;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(timer != RT_NULL);
@@ -398,7 +398,7 @@ rt_err_t rt_timer_start(rt_timer_t timer)
{
unsigned int row_lvl;
rt_list_t *timer_list;
- register rt_base_t level;
+ rt_base_t level;
register rt_bool_t need_schedule;
rt_list_t *row_head[RT_TIMER_SKIP_LIST_LEVEL];
unsigned int tst_nr;
@@ -522,7 +522,7 @@ RTM_EXPORT(rt_timer_start);
*/
rt_err_t rt_timer_stop(rt_timer_t timer)
{
- register rt_base_t level;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(timer != RT_NULL);
@@ -558,7 +558,7 @@ RTM_EXPORT(rt_timer_stop);
*/
rt_err_t rt_timer_control(rt_timer_t timer, int cmd, void *arg)
{
- register rt_base_t level;
+ rt_base_t level;
/* parameter check */
RT_ASSERT(timer != RT_NULL);
@@ -618,7 +618,7 @@ void rt_timer_check(void)
{
struct rt_timer *t;
rt_tick_t current_tick;
- register rt_base_t level;
+ rt_base_t level;
rt_list_t list;
rt_list_init(&list);
@@ -704,7 +704,7 @@ void rt_soft_timer_check(void)
{
rt_tick_t current_tick;
struct rt_timer *t;
- register rt_base_t level;
+ rt_base_t level;
rt_list_t list;
rt_list_init(&list);