From a1053d5dc1e161f30debbbc12366364d5e2ec26b Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 20 Sep 2009 18:39:37 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1174
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/arch/sys_arch.c | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'demos')

diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/arch/sys_arch.c b/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/arch/sys_arch.c
index 8248eed72..414b434a6 100644
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/arch/sys_arch.c
+++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/arch/sys_arch.c
@@ -88,8 +88,10 @@ u32_t sys_arch_sem_wait(sys_sem_t sem, u32_t timeout) {
 
   chSysLock();
   time = chTimeNow();
-  chSemWaitTimeoutS(sem, (systime_t)timeout);
-  time = chTimeNow() - time;
+  if (chSemWaitTimeoutS(sem, (systime_t)timeout) != RDY_OK)
+    time = SYS_ARCH_TIMEOUT;
+  else
+    time = chTimeNow() - time;
   chSysUnlock();
   return time;
 }
@@ -120,17 +122,23 @@ err_t sys_mbox_trypost(sys_mbox_t mbox, void *msg) {
 }
 
 u32_t sys_arch_mbox_fetch(sys_mbox_t mbox, void **msg, u32_t timeout) {
+  systime_t time;
 
-  if (chMBFetchS(mbox, (msg_t *)msg, (systime_t)timeout) == RDY_TIMEOUT)
-    return ERR_MEM;
-  return ERR_OK;
+  chSysLock();
+  time = chTimeNow();
+  if (chMBFetchS(mbox, (msg_t *)msg, (systime_t)timeout) != RDY_OK)
+    time = SYS_ARCH_TIMEOUT;
+  else
+    time = chTimeNow() - time;
+  chSysUnlock();
+  return time;
 }
 
 u32_t sys_arch_mbox_tryfetch(sys_mbox_t mbox, void **msg) {
 
-  if (chMBFetchS(mbox, (msg_t *)msg, TIME_IMMEDIATE) == RDY_TIMEOUT)
-    return ERR_MEM;
-  return ERR_OK;
+  if (chMBFetch(mbox, (msg_t *)msg, TIME_IMMEDIATE) == RDY_TIMEOUT)
+    return SYS_MBOX_EMPTY;
+  return 0;
 }
 
 struct sys_timeouts *sys_arch_timeouts(void) {
-- 
cgit v1.2.3