aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-02-28 13:26:02 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-02-28 13:26:02 +0000
commit1aad9e4509193ea3726a2d021beb2421adca0a93 (patch)
tree48b3161d122c7165b7b8215c693975e01a22d1dd
parentce0845ef81f78144fc4edb5db710bdb1a10d0ba0 (diff)
downloadChibiOS-1aad9e4509193ea3726a2d021beb2421adca0a93.tar.gz
ChibiOS-1aad9e4509193ea3726a2d021beb2421adca0a93.tar.bz2
ChibiOS-1aad9e4509193ea3726a2d021beb2421adca0a93.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1691 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--docs/reports/kernel.txt8
-rw-r--r--os/kernel/src/chcond.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/reports/kernel.txt b/docs/reports/kernel.txt
index 16362d899..b21f6bd97 100644
--- a/docs/reports/kernel.txt
+++ b/docs/reports/kernel.txt
@@ -236,13 +236,13 @@ Platform : MSP430
OS Setup : Full kernel
Compiler : msp430-gcc (GCC) 3.2.3
Options : -O2 -DCH_OPTIMIZE_SPEED=TRUE
-Kernel Size = 5636
+Kernel Size = 5632
Platform : MSP430
OS Setup : Full kernel
Compiler : msp430-gcc (GCC) 3.2.3
Options : -O2 -DCH_OPTIMIZE_SPEED=FALSE
-Kernel Size = 5120
+Kernel Size = 5116
Platform : MSP430
OS Setup : Minimal kernel
@@ -254,13 +254,13 @@ Platform : MSP430
OS Setup : Full kernel
Compiler : msp430-gcc (GCC) 3.2.3
Options : -Os -DCH_OPTIMIZE_SPEED=TRUE
-Kernel Size = 5572
+Kernel Size = 5568
Platform : MSP430
OS Setup : Full kernel
Compiler : msp430-gcc (GCC) 3.2.3
Options : -Os -DCH_OPTIMIZE_SPEED=FALSE
-Kernel Size = 5076
+Kernel Size = 5072
Platform : MSP430
OS Setup : Minimal kernel
diff --git a/os/kernel/src/chcond.c b/os/kernel/src/chcond.c
index 372b9b2f1..a78ff4ec5 100644
--- a/os/kernel/src/chcond.c
+++ b/os/kernel/src/chcond.c
@@ -218,8 +218,8 @@ msg_t chCondWaitTimeoutS(CondVar *cp, systime_t time) {
mp = chMtxUnlockS();
ctp->p_u.wtobjp = cp;
prio_insert(ctp, &cp->c_queue);
- chSchGoSleepTimeoutS(THD_STATE_WTCOND, time);
- msg = ctp->p_u.rdymsg;
+ msg = chSchGoSleepTimeoutS(THD_STATE_WTCOND, time);
+// msg = ctp->p_u.rdymsg;
chMtxLockS(mp);
return msg;
}