Added a critical section protection for Ctx.PingSlotState and Ctx.MulticastSlotState variables update

Author: mluis1

src/mac/LoRaMacClassB.c

@@ -672,14 +672,18 @@ void LoRaMacClassBSetBeaconState( BeaconState_t beaconState )
 void LoRaMacClassBSetPingSlotState( PingSlotState_t pingSlotState )
 {
 #ifdef LORAMAC_CLASSB_ENABLED
+    CRITICAL_SECTION_BEGIN( );
     Ctx.PingSlotState = pingSlotState;
+    CRITICAL_SECTION_END( );
 #endif // LORAMAC_CLASSB_ENABLED
 }
 
 void LoRaMacClassBSetMulticastSlotState( PingSlotState_t multicastSlotState )
 {
 #ifdef LORAMAC_CLASSB_ENABLED
+    CRITICAL_SECTION_BEGIN( );
     Ctx.MulticastSlotState = multicastSlotState;
+    CRITICAL_SECTION_END( );
 #endif // LORAMAC_CLASSB_ENABLED
 }
 
@@ -991,7 +995,7 @@ static void LoRaMacClassBProcessPingSlot( void )
                                *Ctx.LoRaMacClassBParams.LoRaMacDevAddr,
                                ClassBNvm->PingSlotCtx.PingPeriod,
                                &( Ctx.PingSlotCtx.PingOffset ) );
-            Ctx.PingSlotState = PINGSLOT_STATE_SET_TIMER;
+            LoRaMacClassBSetPingSlotState( PINGSLOT_STATE_SET_TIMER );
         }
             // Intentional fall through
         case PINGSLOT_STATE_SET_TIMER:
@@ -1021,7 +1025,7 @@ static void LoRaMacClassBProcessPingSlot( void )
                 }
 
                 // Start the timer if the ping slot time is in range
-                Ctx.PingSlotState = PINGSLOT_STATE_IDLE;
+                LoRaMacClassBSetPingSlotState( PINGSLOT_STATE_IDLE );
                 TimerSetValue( &Ctx.PingSlotTimer, pingSlotTime );
                 TimerStart( &Ctx.PingSlotTimer );
             }
@@ -1054,12 +1058,12 @@ static void LoRaMacClassBProcessPingSlot( void )
                 {
                     // Close multicast slot window, if necessary. Multicast slots have priority
                     Radio.Standby( );
-                    Ctx.MulticastSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
+                    LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
                     TimerSetValue( &Ctx.MulticastSlotTimer, CLASSB_PING_SLOT_WINDOW );
                     TimerStart( &Ctx.MulticastSlotTimer );
                 }
 
-                Ctx.PingSlotState = PINGSLOT_STATE_RX;
+                LoRaMacClassBSetPingSlotState( PINGSLOT_STATE_RX );
 
                 pingSlotRxConfig.Datarate = ClassBNvm->PingSlotCtx.Datarate;
                 pingSlotRxConfig.DownlinkDwellTime = Ctx.LoRaMacClassBParams.LoRaMacParams->DownlinkDwellTime;
@@ -1082,15 +1086,15 @@ static void LoRaMacClassBProcessPingSlot( void )
             else
             {
                 // Multicast slots have priority. Skip Rx
-                Ctx.PingSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
+                LoRaMacClassBSetPingSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
                 TimerSetValue( &Ctx.PingSlotTimer, CLASSB_PING_SLOT_WINDOW );
                 TimerStart( &Ctx.PingSlotTimer );
             }
             break;
         }
         default:
         {
-            Ctx.PingSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
+            LoRaMacClassBSetPingSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
             break;
         }
     }
@@ -1143,7 +1147,7 @@ static void LoRaMacClassBProcessMulticastSlot( void )
                 }
                 cur++;
             }
-            Ctx.MulticastSlotState = PINGSLOT_STATE_SET_TIMER;
+            LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_SET_TIMER );
         }
             // Intentional fall through
         case PINGSLOT_STATE_SET_TIMER:
@@ -1194,7 +1198,7 @@ static void LoRaMacClassBProcessMulticastSlot( void )
                 }
 
                 // Start the timer if the ping slot time is in range
-                Ctx.MulticastSlotState = PINGSLOT_STATE_IDLE;
+                LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_IDLE );
                 TimerSetValue( &Ctx.MulticastSlotTimer, multicastSlotTime );
                 TimerStart( &Ctx.MulticastSlotTimer );
             }
@@ -1207,7 +1211,7 @@ static void LoRaMacClassBProcessMulticastSlot( void )
             // Verify if the multicast channel is valid
             if( Ctx.PingSlotCtx.NextMulticastChannel == NULL )
             {
-                Ctx.MulticastSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
+                LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
                 TimerSetValue( &Ctx.MulticastSlotTimer, 1 );
                 TimerStart( &Ctx.MulticastSlotTimer );
                 break;
@@ -1236,12 +1240,12 @@ static void LoRaMacClassBProcessMulticastSlot( void )
                 {
                     // Close ping slot window, if necessary. Multicast slots have priority
                     Radio.Standby( );
-                    Ctx.PingSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
+                    LoRaMacClassBSetPingSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
                     TimerSetValue( &Ctx.PingSlotTimer, CLASSB_PING_SLOT_WINDOW );
                     TimerStart( &Ctx.PingSlotTimer );
                 }
 
-                Ctx.MulticastSlotState = PINGSLOT_STATE_RX;
+                LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_RX );
 
                 multicastSlotRxConfig.Datarate = Ctx.PingSlotCtx.NextMulticastChannel->ChannelParams.RxParams.Params.ClassB.Datarate;
                 multicastSlotRxConfig.DownlinkDwellTime = Ctx.LoRaMacClassBParams.LoRaMacParams->DownlinkDwellTime;
@@ -1264,15 +1268,15 @@ static void LoRaMacClassBProcessMulticastSlot( void )
             else
             {
                 // Unicast slots have priority. Skip Rx
-                Ctx.MulticastSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
+                LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
                 TimerSetValue( &Ctx.MulticastSlotTimer, CLASSB_PING_SLOT_WINDOW );
                 TimerStart( &Ctx.MulticastSlotTimer );
             }
             break;
         }
         default:
         {
-            Ctx.MulticastSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
+            LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
             break;
         }
     }
@@ -1788,11 +1792,11 @@ void LoRaMacClassBStartRxSlots( void )
 #ifdef LORAMAC_CLASSB_ENABLED
     if( ClassBNvm->PingSlotCtx.Ctrl.Assigned == 1 )
     {
-        Ctx.PingSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
+        LoRaMacClassBSetPingSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
         TimerSetValue( &Ctx.PingSlotTimer, 1 );
         TimerStart( &Ctx.PingSlotTimer );
 
-        Ctx.MulticastSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
+        LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
         TimerSetValue( &Ctx.MulticastSlotTimer, 1 );
         TimerStart( &Ctx.MulticastSlotTimer );
     }