Merge pull request #291 from smaillet-ms/Fix-RTX-Build

Fixed MCBSTM32F400 networking build with latest CMSIS-RTX

Author: smaillet-ms

DeviceCode/Targets/OS/CMSIS_RTOS/CpuOsIrq.h

@@ -35,12 +35,14 @@ class CriticalSection
 {
 public:
     CriticalSection( )
-        : Owner( NoOwner )
+        : osMutexInitMember( MutexDef )
+        , MutexId( 0 )
+        , Owner( NoOwner )
         , RefCount( 0 )
     {
-        osMutexInitMember( MutexDef );
+        osMutexConstructMember( MutexDef );
         MutexId = osMutexCreate( osMutex( MutexDef ) );
-	    ASSERT( MutexId != NULL);
+        ASSERT( MutexId != NULL);
     }
 
     void lock( )

DeviceCode/Targets/OS/CMSIS_RTOS/DeviceCode/lwip_1_4_1_os/arch/mutex

@@ -12,8 +12,10 @@ namespace std
     {
     public:
         recursive_mutex( )
+            : MutexId( 0 )
+            , osMutexInitMember( MutexDef )
         {
-            osMutexInitMember( MutexDef );
+            osMutexConstructMember( MutexDef );
             MutexId = osMutexCreate( osMutex( MutexDef ) );
         }
 

DeviceCode/Targets/OS/CMSIS_RTOS/DeviceCode/lwip_1_4_1_os/arch/sysarch_timeout.h

@@ -14,8 +14,8 @@ namespace lwIP
 {
     namespace SysArch
     {
-		typedef void (*TimerCallback) (void const *);
-		
+        typedef void (*TimerCallback) (void const *);
+        
         const uint64_t SystemTimeUnitsPerMicrosecond = 10; // HAL system time is in 100ns intervals
         const uint64_t SystemTimeUnitsPerMillisecond = 1000 * SystemTimeUnitsPerMicrosecond;
 
@@ -36,7 +36,7 @@ namespace lwIP
         template< typename OsTimerT >
         class TimeoutCompare
         {
-		public:
+        public:
             // Compare this Timeout with the specified handler and arg
             // returns 0 if equal, negative value if this instance is less
             // and 1 if this instance is greater.
@@ -49,7 +49,7 @@ namespace lwIP
             {
                 return Compare( lhs, rhs.get_Handler(), rhs.get_Arg() );
             }
-			
+            
             static int Compare( const OsTimerT& lhs, TimerCallback handler, void* arg )
             {
                 if( handler < lhs.get_Handler() )
@@ -81,7 +81,7 @@ namespace lwIP
             Timeout( sys_timeout_handler handler, void* arg )
                 : OsTimer( reinterpret_cast<TimerCallback>(handler), arg )
             {
-				this->Initialize();
+                this->Initialize();
             }
 
             // To prevent the timer from triggering and attempting to call a partially

DeviceCode/Targets/OS/CMSIS_RTOS/cmsis_os_cpp.h

@@ -6,16 +6,17 @@
 #define CMSIS_VERSION(m,mm) ( ( ( m )<< 16 ) | ( mm ) )
 
 #if osCMSIS < CMSIS_VERSION(1, 2)
-#error "Unsupported CMSIS version: This header requires a CMSIS implementation with at least version 1.2"
+#error "Unsupported CMSIS version: This header requires a CMSIS-RTOS API implementation with at least version 1.2"
 #endif
 
-#if osCMSIS_RTX < CMSIS_VERSION(4, 75)
+#if !defined(osCMSIS_RTX) || osCMSIS_RTX != CMSIS_VERSION(4, 78)
 // unfortunately the implementation of the osXxxxDef and other similar macros
 // are implementation defined and, at least for CMSIS-RTX cannot be used to
 // declare a C++ data member. Thus, this header is specific to a particular 
 // version of CMSIS-RTX and requires re-evaluation and verification on any
-// later versions.
-#error "Unsupported CMSIS-RTOS implementation: This header requires the CMSIS-RTX implementation of CMSIS-RTOS with version 4.75"
+// other versions. The structures can and have changed even on minor version
+// changes, so the check here is for an exact match on the supported version.
+#error "Unsupported CMSIS-RTOS implementation: This header requires the CMSIS-RTX v4.78 implementation of the CMSIS-RTOS API"
 #endif
 
 // The following two fields are culled from the CMSIS-RTX header implementation
@@ -25,31 +26,41 @@
     uint32_t os_mutex_cb_##name[4]; /* = { 0 }; */\
     osMutexDef_t os_mutex_def_##name/* = { (os_mutex_cb_##name) }*/
 
-// This variant of the standard CMSIS-RTOS macro allows use as a member initializer
-// list for a constructor.
+// This macro is used in the C++ class constructor initializer list to create
+// default initialized members
 #define osMutexInitMember( name )\
+        os_mutex_cb_##name()\
+        ,os_mutex_def_##name()
+
+// This variant of the standard CMSIS-RTOS macro constructs a member
+// since a standard constructor isn't available.
+#define osMutexConstructMember( name )\
     memset( &os_mutex_cb_##name, 0, sizeof( os_mutex_cb_##name ) );\
     memset( &os_mutex_def_##name, 0, sizeof( os_mutex_def_##name ) );\
     os_mutex_def_##name.mutex = &os_mutex_cb_##name
 
+// This macor is used to define a timer instance as a member of a class or struct
 #define osTimerDefMember( name )\
-    uint32_t os_timer_cb_##name[5]; /* = { 0 }*/\
+    uint32_t os_timer_cb_##name[6]; /* = { 0 }*/\
     osTimerDef_t os_timer_def_##name /* = { (function), (os_timer_cb_##name) }*/
 
+// This macro is used in the C++ class constructor initializer list to create
+// initialized members
 #define osTimerInitMember( name )\
         os_timer_cb_##name()\
         ,os_timer_def_##name()
 
 // ARMCC 5.04 and earlier don't support C++11 initializer list syntax for member initialization
 // Therefore, this is used in the constructor to set the internal members as needed.
 #define osTimerConstructMember( name, function )\
+        memset( &os_timer_cb_##name, 0, sizeof( os_timer_cb_##name ) );\
         os_timer_def_##name.ptimer = function;\
         os_timer_def_##name.timer = &os_timer_cb_##name
 
 namespace MsOpenTech
 {
     namespace CMSIS_RTOS
-    {	
+    {
         class Timer
         {
         public:
@@ -69,7 +80,7 @@ namespace MsOpenTech
             void Start( uint32_t initialTimeout, bool periodic )
             {
                 TimerId = osTimerCreate( osTimer(TimerDef), periodic ? osTimerPeriodic : osTimerOnce, CallbackArg );
-							  osTimerStart(TimerId, initialTimeout);
+                              osTimerStart(TimerId, initialTimeout);
             }
 
             // C++11 move semantics not supported in the ARM compiler 5.04 and earlier

Solutions/MCBSTM32F400/TinyCLR/scatterfile_tinyclr_mdk.xml

@@ -114,7 +114,7 @@
             <FileMapping Name="*" Options="(VectorTable +FIRST)" />
         </ExecRegion>
 
-        <ExecRegion Name="ER_RAM_RW" Base="+0" Options="ABSOLUTE" Size="">
+        <ExecRegion Name="ER_RAM_RW" Base="+0" Options="ABSOLUTE NOCOMPRESS" Size="">
             <FileMapping Name="*" Options="(+RW-DATA, +ZI)" />
         </ExecRegion>