aboutsummaryrefslogtreecommitdiffstats
path: root/os/rt/src
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-08-26 13:07:19 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-08-26 13:07:19 +0000
commitc8dff54685e5e904f7e7c6382144ac22035aad10 (patch)
tree06787ca72a0b8f3cf6acd1ab8c60450ba0251a8a /os/rt/src
parent611c3138873b38fd26c19c43ce3436fe0528604a (diff)
downloadChibiOS-c8dff54685e5e904f7e7c6382144ac22035aad10.tar.gz
ChibiOS-c8dff54685e5e904f7e7c6382144ac22035aad10.tar.bz2
ChibiOS-c8dff54685e5e904f7e7c6382144ac22035aad10.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6226 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/src')
-rw-r--r--os/rt/src/chsys.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/os/rt/src/chsys.c b/os/rt/src/chsys.c
index 5279ef518..19964ec13 100644
--- a/os/rt/src/chsys.c
+++ b/os/rt/src/chsys.c
@@ -227,7 +227,7 @@ void chSysTimerHandlerI(void) {
*
* @xclass
*/
-syssts_t chSysGetAndLockX(void) {
+syssts_t chSysGetStatusAndLockX(void) {
syssts_t sts = port_get_irq_status();
if (port_irq_enabled(sts)) {
@@ -246,13 +246,15 @@ syssts_t chSysGetAndLockX(void) {
*
* @xclass
*/
-void chSysRestoreLockX(syssts_t sts) {
+void chSysRestoreLockAndRescheduleX(syssts_t sts) {
if (port_irq_enabled(sts)) {
if (port_is_isr_context())
chSysUnlockFromISR();
- else
+ else {
+ chSchRescheduleS();
chSysUnlock();
+ }
}
}