aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2016-01-16 11:23:04 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2016-01-16 11:23:04 +0000
commitb2b371f231bff1128480459ee47e8c491eff620b (patch)
tree2a39eea5ae55e9d8fbb7e4d53d2e51e89d49f2c3
parent6e4f971d5f5f12e96581d8b7221afc81d923cd7c (diff)
downloadChibiOS-b2b371f231bff1128480459ee47e8c491eff620b.tar.gz
ChibiOS-b2b371f231bff1128480459ee47e8c491eff620b.tar.bz2
ChibiOS-b2b371f231bff1128480459ee47e8c491eff620b.zip
Fixed bug #691.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8762 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/osal/nil/osal.h2
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/os/hal/osal/nil/osal.h b/os/hal/osal/nil/osal.h
index bde9aa44f..aac0d5e77 100644
--- a/os/hal/osal/nil/osal.h
+++ b/os/hal/osal/nil/osal.h
@@ -791,7 +791,7 @@ static inline void osalThreadQueueObjectInit(threads_queue_t *tqp) {
static inline msg_t osalThreadEnqueueTimeoutS(threads_queue_t *tqp,
systime_t time) {
- return chSemWaitTimeout(&tqp->sem, time);
+ return chSemWaitTimeoutS(&tqp->sem, time);
}
/**
diff --git a/readme.txt b/readme.txt
index bd7df0b34..69234d74d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -76,6 +76,8 @@
- RT: Removed the p_msg field from the thread_t structure saving a
msg_t-sized field from the structure. Messages now use a new field
into the p_u union. Now synchronous messages are even faster.
+- NIL: Fixed protocol violation in NIL OSAL (bug #691)(backported to
+ 3.0.5 and 16.1.1).
- HAL: Fixed error in HAL buffer queues (bug #689)(backported to 16.1.1).
- RT: Fixed tm_stop - best case bug (bug #688)(backported to 16.1.1
and 3.0.5).