L3 RRC/NAS developments

src/ue/nas/mm/base.cpp

@@ -70,6 +70,7 @@ void NasMm::onStart(NasSm *sm, Usim *usim)
 {
     m_sm = sm;
     m_usim = usim;
+
     triggerMmCycle();
 }
 
@@ -436,18 +437,28 @@ void NasMm::onSwitchUState(E5UState oldState, E5UState newState)
 {
 }
 
-void NasMm::onSimRemoval()
+void NasMm::onSwitchOn()
 {
-    m_storage->equivalentPlmnList->clear();
+    resetRegAttemptCounter();
+}
+
+void NasMm::onSimInsertion()
+{
+    resetRegAttemptCounter();
+}
 
+void NasMm::onSwitchOff()
+{
     m_storage->serviceAreaList->clear();
 
     m_storage->forbiddenTaiListRoaming->clear();
     m_storage->forbiddenTaiListRps->clear();
 }
 
-void NasMm::onSwitchOff()
+void NasMm::onSimRemoval()
 {
+    m_storage->equivalentPlmnList->clear();
+
     m_storage->serviceAreaList->clear();
 
     m_storage->forbiddenTaiListRoaming->clear();

src/ue/nas/mm/mm.hpp

@@ -87,8 +87,10 @@ class NasMm
     void onSwitchRmState(ERmState oldState, ERmState newState);
     void onSwitchCmState(ECmState oldState, ECmState newState);
     void onSwitchUState(E5UState oldState, E5UState newState);
-    void onSimRemoval();
+    void onSwitchOn();
+    void onSimInsertion();
     void onSwitchOff();
+    void onSimRemoval();
 
   private: /* Messaging */
     void sendNasMessage(const nas::PlainMmMessage &msg);

src/ue/nas/mm/radio.cpp

@@ -107,6 +107,8 @@ void NasMm::performPlmnSelection()
     {
         m_logger->info("Selected plmn[%s]", ToJson(selected).str().c_str());
         m_base->rrcTask->push(new NwUeNasToRrc(NwUeNasToRrc::RRC_NOTIFY));
+
+        resetRegAttemptCounter();
     }
 
     m_base->shCtx.selectedPlmn.set(selected);

src/ue/nas/mm/register.cpp

@@ -948,14 +948,6 @@ void NasMm::resetRegAttemptCounter()
     m_regCounter = 0;
     m_timers->t3519.stop();
     m_storage->storedSuci->clear();
-
-    // TODO: Registration attempt counter shall be reset for these cases as well (not implemented yet)
-    // - the UE is powered on;
-    // - a USIM is inserted
-    // "Additionally, the registration attempt counter shall be reset when the UE is in substate
-    // 5GMM-DEREGISTERED.ATTEMPTING-REGISTRATION or 5GMM-REGISTERED.ATTEMPTING-REGISTRATION-UPDATE, and:"
-    // - a new tracking area is entered;
-    // - timer T3346 is started.
 }
 
 } // namespace nr::ue
\ No newline at end of file