Skip to content

Commit 51db2fd

Browse files
committed
Merge pull request #1021 from toyowata/master
RTOS - Add workaround for internal fault
2 parents 4af0805 + 41d37b5 commit 51db2fd

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

libraries/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,6 +2066,10 @@ osStatus osMailPut (osMailQId queue_id, void *mail) {
20662066
return osMessagePut(*((void **)queue_id), (uint32_t)mail, 0);
20672067
}
20682068

2069+
#ifdef __arm__
2070+
#pragma push
2071+
#pragma Ospace
2072+
#endif // __arm__
20692073
/// Get a mail from a queue
20702074
os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {
20712075
osEvent ret;
@@ -2080,3 +2084,6 @@ os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {
20802084

20812085
return ret;
20822086
}
2087+
#ifdef __arm__
2088+
#pragma pop
2089+
#endif // __arm__

libraries/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,6 +1862,10 @@ osStatus osMailPut (osMailQId queue_id, void *mail) {
18621862
return osMessagePut(*((void **)queue_id), (uint32_t)mail, 0);
18631863
}
18641864

1865+
#ifdef __arm__
1866+
#pragma push
1867+
#pragma Ospace
1868+
#endif // __arm__
18651869
/// Get a mail from a queue
18661870
os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {
18671871
osEvent ret;
@@ -1876,3 +1880,6 @@ os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {
18761880

18771881
return ret;
18781882
}
1883+
#ifdef __arm__
1884+
#pragma pop
1885+
#endif // __arm__

0 commit comments

Comments
 (0)