move RunOnMatterContext to LayerFreeRTOS

project-chip · Jan 7, 2025 · ead181f · ead181f
1 parent 7ecbf7b
commit ead181f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/inet/TCPEndPointImplLwIP.cpp b/src/inet/TCPEndPointImplLwIP.cpp
@@ -788,9 +788,9 @@ err_t TCPEndPointImplLwIP::LwIPHandleIncomingConnection(void * arg, struct tcp_p
 
     if (arg != nullptr)
     {
-        TCPEndPointImplLwIP * listenEP = static_cast<TCPEndPointImplLwIP *>(arg);
-        TCPEndPointImplLwIP * conEP    = nullptr;
-        System::Layer & lSystemLayer   = listenEP->GetSystemLayer();
+        TCPEndPointImplLwIP * listenEP       = static_cast<TCPEndPointImplLwIP *>(arg);
+        TCPEndPointImplLwIP * conEP          = nullptr;
+        System::LayerFreeRTOS & lSystemLayer = static_cast<System::LayerFreeRTOS &>(istenEP->GetSystemLayer());
 
         // Tell LwIP we've accepted the connection so it can decrement the listen PCB's pending_accepts counter.
         tcp_accepted(listenEP->mTCP);

diff --git a/src/system/SystemLayer.cpp b/src/system/SystemLayer.cpp
@@ -31,14 +31,16 @@ CHIP_ERROR Layer::ScheduleLambdaBridge(LambdaBridge && bridge)
     return lReturn;
 }
 
-CHIP_ERROR Layer::RunOnMatterContext(std::function<CHIP_ERROR()> func)
+#if CHIP_SYSTEM_CONFIG_USE_LWIP || CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
+CHIP_ERROR LayerFreeRTOS::RunOnMatterContext(std::function<CHIP_ERROR()> func)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     PlatformEventing::LockMatterStack(*this);
     err = func();
     PlatformEventing::UnlockMatterStack(*this);
     return err;
 }
+#endif // CHIP_SYSTEM_CONFIG_USE_LWIP || CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
 
 } // namespace System
 } // namespace chip
diff --git a/src/system/SystemLayer.h b/src/system/SystemLayer.h
@@ -220,8 +220,6 @@ class DLL_EXPORT Layer
         return ScheduleLambdaBridge(std::move(bridge));
     }
 
-    CHIP_ERROR RunOnMatterContext(std::function<CHIP_ERROR()>);
-
 private:
     CHIP_ERROR ScheduleLambdaBridge(LambdaBridge && bridge);
 
@@ -234,6 +232,7 @@ class DLL_EXPORT Layer
 
 class LayerFreeRTOS : public Layer
 {
+    CHIP_ERROR RunOnMatterContext(std::function<CHIP_ERROR()>);
 };
 
 #endif // CHIP_SYSTEM_CONFIG_USE_LWIP