Merge pull request #1021 from toyowata/master

RTOS - Add workaround for internal fault
pull/1022/head
Martin Kojtal 2015-04-08 08:16:24 +02:00
commit 51db2fd50c
2 changed files with 14 additions and 0 deletions

View File

@ -2066,6 +2066,10 @@ osStatus osMailPut (osMailQId queue_id, void *mail) {
return osMessagePut(*((void **)queue_id), (uint32_t)mail, 0); return osMessagePut(*((void **)queue_id), (uint32_t)mail, 0);
} }
#ifdef __arm__
#pragma push
#pragma Ospace
#endif // __arm__
/// Get a mail from a queue /// Get a mail from a queue
os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) { os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {
osEvent ret; osEvent ret;
@ -2080,3 +2084,6 @@ os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {
return ret; return ret;
} }
#ifdef __arm__
#pragma pop
#endif // __arm__

View File

@ -1862,6 +1862,10 @@ osStatus osMailPut (osMailQId queue_id, void *mail) {
return osMessagePut(*((void **)queue_id), (uint32_t)mail, 0); return osMessagePut(*((void **)queue_id), (uint32_t)mail, 0);
} }
#ifdef __arm__
#pragma push
#pragma Ospace
#endif // __arm__
/// Get a mail from a queue /// Get a mail from a queue
os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) { os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {
osEvent ret; osEvent ret;
@ -1876,3 +1880,6 @@ os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {
return ret; return ret;
} }
#ifdef __arm__
#pragma pop
#endif // __arm__