ST / mbed-rtos

Official mbed Real Time Operating System based on the RTX implementation of the CMSIS-RTOS API open standard.

Dependents:   LoRaWAN-lmic-app LoRaWAN-lmic-app LoRaWAN-test-10secs testes ... more

Files at this revision

API Documentation at this revision

Revision 72:83895f30f8f2, committed 2015-04-10

Comitter:
mbed_official
Date:
Fri Apr 10 07:16:43 2015 +0100
Parent:
71:570e569a5b59
Commit message:
Synchronized with git revision 8311bafba5b8684f95626e096aef2dc8cc6805bf

Full URL: https://github.com/mbedmicro/mbed/commit/8311bafba5b8684f95626e096aef2dc8cc6805bf/

MAXWSNENV - Fixing comments in startup file for ARM compiler.

Changed in this revision

rtx/TARGET_CORTEX_A/rt_CMSIS.c Show annotated file Show diff for this revision Revisions of this file
rtx/TARGET_CORTEX_M/rt_CMSIS.c Show annotated file Show diff for this revision Revisions of this file 
diff -r 570e569a5b59 -r 83895f30f8f2 rtx/TARGET_CORTEX_A/rt_CMSIS.c
--- a/rtx/TARGET_CORTEX_A/rt_CMSIS.c	Wed Apr 08 07:46:03 2015 +0100
+++ b/rtx/TARGET_CORTEX_A/rt_CMSIS.c	Fri Apr 10 07:16:43 2015 +0100
@@ -2066,7 +2066,7 @@
   return osMessagePut(*((void **)queue_id), (uint32_t)mail, 0);
 }
 
-#ifdef __arm__
+#ifdef __CC_ARM
 #pragma push
 #pragma Ospace
 #endif // __arm__
@@ -2084,6 +2084,6 @@
 
   return ret;
 }
-#ifdef __arm__
+#ifdef __CC_ARM
 #pragma pop
 #endif // __arm__

diff -r 570e569a5b59 -r 83895f30f8f2 rtx/TARGET_CORTEX_M/rt_CMSIS.c
--- a/rtx/TARGET_CORTEX_M/rt_CMSIS.c	Wed Apr 08 07:46:03 2015 +0100
+++ b/rtx/TARGET_CORTEX_M/rt_CMSIS.c	Fri Apr 10 07:16:43 2015 +0100
@@ -1862,7 +1862,7 @@
   return osMessagePut(*((void **)queue_id), (uint32_t)mail, 0);
 }
 
-#ifdef __arm__
+#ifdef __CC_ARM
 #pragma push
 #pragma Ospace
 #endif // __arm__
@@ -1880,6 +1880,6 @@
 
   return ret;
 }
-#ifdef __arm__
+#ifdef __CC_ARM
 #pragma pop
 #endif // __arm__