aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2017-04-02 10:10:03 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2017-04-02 10:10:03 +0000
commit2000bff59bdde16770dd6d4274e44a2387de979e (patch)
tree7d114197d175954afeaf0358ba0f2cd6a9827ebd
parent25a9ad2c3a0033a78f119cb6ec08d649a80c2acc (diff)
downloadChibiOS-2000bff59bdde16770dd6d4274e44a2387de979e.tar.gz
ChibiOS-2000bff59bdde16770dd6d4274e44a2387de979e.tar.bz2
ChibiOS-2000bff59bdde16770dd6d4274e44a2387de979e.zip
Fixed bug #823.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10137 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/common/abstractions/cmsis_os/cmsis_os.c5
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 4 deletions
diff --git a/os/common/abstractions/cmsis_os/cmsis_os.c b/os/common/abstractions/cmsis_os/cmsis_os.c
index d925cd73d..eded466dc 100644
--- a/os/common/abstractions/cmsis_os/cmsis_os.c
+++ b/os/common/abstractions/cmsis_os/cmsis_os.c
@@ -148,19 +148,16 @@ osStatus osThreadTerminate(osThreadId thread_id) {
* @note This can interfere with the priority inheritance mechanism.
*/
osStatus osThreadSetPriority(osThreadId thread_id, osPriority newprio) {
- osPriority oldprio;
thread_t * tp = (thread_t *)thread_id;
chSysLock();
/* Changing priority.*/
#if CH_CFG_USE_MUTEXES
- oldprio = (osPriority)tp->realprio;
if ((tp->prio == tp->realprio) || ((tprio_t)newprio > tp->prio))
tp->prio = (tprio_t)newprio;
tp->realprio = (tprio_t)newprio;
#else
- oldprio = tp->prio;
tp->prio = (tprio_t)newprio;
#endif
@@ -202,7 +199,7 @@ osStatus osThreadSetPriority(osThreadId thread_id, osPriority newprio) {
chSysUnlock();
- return oldprio;
+ return osOK;
}
/**
diff --git a/readme.txt b/readme.txt
index ee17396ce..f6c758a81 100644
--- a/readme.txt
+++ b/readme.txt
@@ -157,6 +157,8 @@
- RT: Merged RT4.
- NIL: Merged NIL2.
- NIL: Added STM32F7 demo.
+- HAL: Fixed osThreadSetPriority() returns old priority instead of a status
+ code (bug #823)(backported to 16.1.8).
- HAL: Fixed problem in rtcSTM32SetPeriodicWakeup() (bug #821)(backported
to 16.1.8).
- HAL: Fixed STM32 RTCv1 synchronization problem (bug #820)(backported