[NXP] Remove circular dependency with application code in platform fi…

…le ConfigurationmanagerImpl.cpp (#30891)
project-chip · May 10, 2024 · 0c24fd2 · 0c24fd2
1 parent 68b856f
commit 0c24fd2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/examples/all-clusters-app/nxp/common/main/AppTask.cpp b/examples/all-clusters-app/nxp/common/main/AppTask.cpp
@@ -473,5 +473,7 @@ void AppTask::SwitchCommissioningStateHandler(void)
 
 void AppTask::FactoryResetHandler(void)
 {
-    ConfigurationMgr().InitiateFactoryReset();
+    /* Emit the ShutDown event before factory reset */
+    chip::Server::GetInstance().GenerateShutDownEvent();
+    chip::Server::GetInstance().ScheduleFactoryReset();
 }
diff --git a/src/platform/nxp/common/ConfigurationManagerImpl.cpp b/src/platform/nxp/common/ConfigurationManagerImpl.cpp
@@ -27,7 +27,6 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include "NXPConfig.h"
-#include <app/server/Server.h>
 #include <platform/ConfigurationManager.h>
 #include <platform/DiagnosticDataProvider.h>
 #include <platform/internal/GenericConfigurationManagerImpl.ipp>
@@ -148,12 +147,7 @@ bool ConfigurationManagerImpl::CanFactoryReset()
 
 void ConfigurationManagerImpl::InitiateFactoryReset()
 {
-    PlatformMgr().ScheduleWork([](intptr_t) {
-        // Emit ShutDown event and delete all fabrics.
-        PlatformMgr().HandleServerShuttingDown();
-        Server::GetInstance().GetFabricTable().DeleteAllFabrics();
-        DoFactoryReset(0);
-    });
+    PlatformMgr().ScheduleWork(DoFactoryReset);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key persistedStorageKey,