libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

more updates on previous change 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1627 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
mbbill@gmail.com 2011-07-13 12:02:01 +00:00
parent 98d59d153e
commit 573b73465e
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ipc.c
View File

@ -1327,12 +1327,23 @@ rt_err_t rt_mb_send_wait (rt_mailbox_t mb, rt_uint32_t value, rt_int32_t timeout
/* disable interrupt */ /* disable interrupt */
temp = rt_hw_interrupt_disable(); temp = rt_hw_interrupt_disable();
/* for non-blocking call */
if (mb->entry == mb->size && timeout == 0)
{
rt_hw_interrupt_enable(temp);
return -RT_EFULL;
}
tick_delta = 0;
/* get current thread */ /* get current thread */
thread = rt_thread_self(); thread = rt_thread_self();
/* mailbox is full */ /* mailbox is full */
while (mb->entry == mb->size) while (mb->entry == mb->size)
{ {
RT_DEBUG_NOT_IN_INTERRUPT;
/* reset error number in thread */ /* reset error number in thread */
thread->error = RT_EOK; thread->error = RT_EOK;
@ -1346,8 +1357,6 @@ rt_err_t rt_mb_send_wait (rt_mailbox_t mb, rt_uint32_t value, rt_int32_t timeout
return -RT_EFULL; return -RT_EFULL;
} }
RT_DEBUG_NOT_IN_INTERRUPT;
/* suspend current thread */ /* suspend current thread */
rt_ipc_list_suspend(&(mb->suspend_sender_thread), rt_ipc_list_suspend(&(mb->suspend_sender_thread),
thread, mb->parent.parent.flag); thread, mb->parent.parent.flag);
@ -1464,8 +1473,6 @@ rt_err_t rt_mb_recv (rt_mailbox_t mb, rt_uint32_t* value, rt_int32_t timeout)
return -RT_ETIMEOUT; return -RT_ETIMEOUT;
} }
RT_DEBUG_NOT_IN_INTERRUPT;
tick_delta = 0; tick_delta = 0;
/* get current thread */ /* get current thread */
@ -1474,6 +1481,8 @@ rt_err_t rt_mb_recv (rt_mailbox_t mb, rt_uint32_t* value, rt_int32_t timeout)
/* mailbox is empty */ /* mailbox is empty */
while (mb->entry == 0) while (mb->entry == 0)
{ {
RT_DEBUG_NOT_IN_INTERRUPT;
/* reset error number in thread */ /* reset error number in thread */
thread->error = RT_EOK; thread->error = RT_EOK;
@ -1969,8 +1978,6 @@ rt_err_t rt_mq_recv (rt_mq_t mq, void* buffer, rt_size_t size, rt_int32_t timeou
return -RT_ETIMEOUT; return -RT_ETIMEOUT;
} }
RT_DEBUG_NOT_IN_INTERRUPT;
tick_delta = 0; tick_delta = 0;
/* get current thread */ /* get current thread */
@ -1979,6 +1986,8 @@ rt_err_t rt_mq_recv (rt_mq_t mq, void* buffer, rt_size_t size, rt_int32_t timeou
/* message queue is empty */ /* message queue is empty */
while (mq->entry == 0) while (mq->entry == 0)
{ {
RT_DEBUG_NOT_IN_INTERRUPT;
/* reset error number in thread */ /* reset error number in thread */
thread->error = RT_EOK; thread->error = RT_EOK;