NAS MM refactor

src/ue/nas/mm/base.cpp

@@ -50,22 +50,12 @@ void NasMm::performMmCycle()
     if (m_mmState == EMmState::MM_NULL)
         return;
 
-    if (!m_usim->isValid())
-    {
-        switchMmState(EMmState::MM_DEREGISTERED, EMmSubState::MM_DEREGISTERED_NO_SUPI);
-        return;
-    }
-
     if (m_mmSubState == EMmSubState::MM_DEREGISTERED_NA)
     {
         if (switchToECallInactivityIfNeeded())
             return;
 
         if (m_usim->isValid())
-        {
-            if (m_cmState == ECmState::CM_IDLE)
-                switchMmState(EMmState::MM_DEREGISTERED, EMmSubState::MM_DEREGISTERED_PLMN_SEARCH);
-            else
         {
             if (m_usim->m_servingCell.has_value())
             {
@@ -83,7 +73,6 @@ void NasMm::performMmCycle()
                 switchMmState(EMmState::MM_DEREGISTERED, EMmSubState::MM_DEREGISTERED_PLMN_SEARCH);
             }
         }
-        }
         else
         {
             switchMmState(EMmState::MM_DEREGISTERED, EMmSubState::MM_DEREGISTERED_NO_SUPI);

src/ue/nas/usim/usim.hpp

@@ -67,7 +67,7 @@ class Usim
     std::optional<nas::IETimeZoneAndTime> m_universalTimeAndLocalTimeZone{};
     std::optional<nas::IEDaylightSavingTime> m_networkDaylightSavingTime{};
 
-    // eCall related
+    // Others
     bool m_isECallOnly{};
 
   public: