Rename Deinit to Shutdown

project-chip · Jan 14, 2025 · f150fb9 · f150fb9
1 parent 5b23629
commit f150fb9
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 27 deletions.
diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
@@ -154,11 +154,11 @@ static void Shutdown(TimerHandle_t xTimer)
     DeviceLayer::StackLock lock;
 
     Esp32AppServer::Shutdown();
-    ESPOpenThreadDeinit();
+    ESPOpenThreadShutdown();
     GetAppTask().StopAppTask();
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-    if (DeviceLayer::Internal::ESP32Utils::DeinitWiFiStack() != CHIP_NO_ERROR)
+    if (DeviceLayer::Internal::ESP32Utils::ShutdownWiFiStack() != CHIP_NO_ERROR)
     {
         ESP_LOGE(TAG, "Failed to deinitialize the Wi-Fi stack");
         return;

diff --git a/examples/platform/esp32/common/Esp32ThreadInit.cpp b/examples/platform/esp32/common/Esp32ThreadInit.cpp
@@ -99,13 +99,13 @@ void ESPOpenThreadInit()
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 }
 
-void ESPOpenThreadDeinit()
+void ESPOpenThreadShutdown()
 {
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
 #if defined(CONFIG_OPENTHREAD_BORDER_ROUTER) && defined(CONFIG_AUTO_UPDATE_RCP)
     openthread_deinit_br_rcp();
 #endif // CONFIG_OPENTHREAD_BORDER_ROUTER && CONFIG_AUTO_UPDATE_RCP
     ThreadStackMgr().StopThreadStack();
-    ThreadStackMgr().DeinitThreadStack();
+    ThreadStackMgr().ShutdownThreadStack();
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 }
diff --git a/examples/platform/esp32/common/Esp32ThreadInit.h b/examples/platform/esp32/common/Esp32ThreadInit.h
@@ -98,4 +98,4 @@
 #endif // CONFIG_OPENTHREAD_ENABLED
 
 void ESPOpenThreadInit();
-void ESPOpenThreadDeinit();
+void ESPOpenThreadShutdown();
diff --git a/src/include/platform/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h
@@ -92,7 +92,7 @@ class ThreadStackManager
     // ===== Members that define the public interface of the ThreadStackManager
 
     CHIP_ERROR InitThreadStack();
-    void DeinitThreadStack();
+    void ShutdownThreadStack();
     void ProcessThreadActivity();
     CHIP_ERROR StartThreadTask();
     void StopThreadStack();
@@ -243,9 +243,9 @@ inline CHIP_ERROR ThreadStackManager::InitThreadStack()
     return static_cast<ImplClass *>(this)->_InitThreadStack();
 }
 
-inline void ThreadStackManager::DeinitThreadStack()
+inline void ThreadStackManager::ShutdownThreadStack()
 {
-    static_cast<ImplClass *>(this)->_DeinitThreadStack();
+    static_cast<ImplClass *>(this)->_ShutdownThreadStack();
 }
 
 inline void ThreadStackManager::ProcessThreadActivity()

diff --git a/src/platform/ESP32/ESP32Utils.cpp b/src/platform/ESP32/ESP32Utils.cpp
@@ -370,7 +370,7 @@ CHIP_ERROR ESP32Utils::InitWiFiStack(void)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ESP32Utils::DeinitWiFiStack(void)
+CHIP_ERROR ESP32Utils::ShutdownWiFiStack(void)
 {
     esp_err_t err = esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, PlatformManagerImpl::HandleESPSystemEvent);
     if (err != ESP_OK)

diff --git a/src/platform/ESP32/ESP32Utils.h b/src/platform/ESP32/ESP32Utils.h
@@ -47,7 +47,7 @@ class ESP32Utils
     static CHIP_ERROR SetWiFiStationProvision(const Internal::DeviceNetworkInfo & netInfo);
     static CHIP_ERROR ClearWiFiStationProvision(void);
     static CHIP_ERROR InitWiFiStack(void);
-    static CHIP_ERROR DeinitWiFiStack(void);
+    static CHIP_ERROR ShutdownWiFiStack(void);
 
     static CHIP_ERROR MapError(esp_err_t error);
     static void RegisterESP32ErrorFormatter();

diff --git a/src/platform/ESP32/ThreadStackManagerImpl.cpp b/src/platform/ESP32/ThreadStackManagerImpl.cpp
@@ -60,7 +60,7 @@ CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()
     return err;
 }
 
-void ThreadStackManagerImpl::_DeinitThreadStack()
+void ThreadStackManagerImpl::_ShutdownThreadStack()
 {
     openthread_deinit_stack();
 }

diff --git a/src/platform/ESP32/ThreadStackManagerImpl.h b/src/platform/ESP32/ThreadStackManagerImpl.h
@@ -58,7 +58,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
 
 public:
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack();
+    void _ShutdownThreadStack();
 
 protected:
     CHIP_ERROR _StartThreadTask();

diff --git a/src/platform/Infineon/CYW30739/ThreadStackManagerImpl.h b/src/platform/Infineon/CYW30739/ThreadStackManagerImpl.h
@@ -45,7 +45,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
 public:
     // ===== Methods that implement the ThreadStackManager abstract interface.
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
 
     void SignalThreadActivityPending();
     void SignalThreadActivityPendingFromISR();

diff --git a/src/platform/Linux/ThreadStackManagerImpl.h b/src/platform/Linux/ThreadStackManagerImpl.h
@@ -50,7 +50,7 @@ class ThreadStackManagerImpl : public ThreadStackManager
     }
 
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void _ProcessThreadActivity();
 
     CHIP_ERROR _StartThreadTask() { return CHIP_NO_ERROR; } // Intentionally left blank

diff --git a/src/platform/NuttX/ThreadStackManagerImpl.h b/src/platform/NuttX/ThreadStackManagerImpl.h
@@ -51,7 +51,7 @@ class ThreadStackManagerImpl : public ThreadStackManager
     }
 
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void _ProcessThreadActivity();
 
     CHIP_ERROR _StartThreadTask() { return CHIP_NO_ERROR; } // Intentionally left blank

diff --git a/src/platform/Tizen/ThreadStackManagerImpl.h b/src/platform/Tizen/ThreadStackManagerImpl.h
@@ -49,7 +49,7 @@ class ThreadStackManagerImpl : public ThreadStackManager
     ThreadStackManagerImpl();
 
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void _ProcessThreadActivity();
 
     CHIP_ERROR _StartThreadTask() { return CHIP_NO_ERROR; } // Intentionally left blank

diff --git a/src/platform/Zephyr/ThreadStackManagerImpl.h b/src/platform/Zephyr/ThreadStackManagerImpl.h
@@ -60,7 +60,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
 public:
     // ===== Methods that implement the ThreadStackManager abstract interface.
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
 
 protected:
     // ===== Methods that implement the ThreadStackManager abstract interface.

diff --git a/src/platform/bouffalolab/common/ThreadStackManagerImpl.h b/src/platform/bouffalolab/common/ThreadStackManagerImpl.h
@@ -70,7 +70,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void _StopThreadStack() {}
 
     // ===== Members for internal use by the following friends.

diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/ThreadStackManagerImpl.h b/src/platform/cc13xx_26xx/cc13x4_26x4/ThreadStackManagerImpl.h
@@ -102,7 +102,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void _StopThreadStack() {}
 
     // ===== Members for internal use by the following friends.

diff --git a/src/platform/nxp/common/ThreadStackManagerImpl.h b/src/platform/nxp/common/ThreadStackManagerImpl.h
@@ -85,7 +85,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
 protected:
     // ===== Methods that implement the ThreadStackManager abstract interface.
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void _StopThreadStack() {}
 
 private:

diff --git a/src/platform/nxp/k32w0/ThreadStackManagerImpl.h b/src/platform/nxp/k32w0/ThreadStackManagerImpl.h
@@ -79,7 +79,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void _StopThreadStack() {}
 
     // ===== Members for internal use by the following friends.

diff --git a/src/platform/nxp/mcxw71_k32w1/ThreadStackManagerImpl.h b/src/platform/nxp/mcxw71_k32w1/ThreadStackManagerImpl.h
@@ -79,7 +79,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void _StopThreadStack() {}
 
     // ===== Members for internal use by the following friends.

diff --git a/src/platform/qpg/ThreadStackManagerImpl.h b/src/platform/qpg/ThreadStackManagerImpl.h
@@ -78,7 +78,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void _StopThreadStack() {}
 
     // ===== Members for internal use by the following friends.

diff --git a/src/platform/silabs/ThreadStackManagerImpl.h b/src/platform/silabs/ThreadStackManagerImpl.h
@@ -80,7 +80,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     CHIP_ERROR _StartThreadTask(void);
     void _StopThreadStack() {}
     void _LockThreadStack(void);

diff --git a/src/platform/stm32/ThreadStackManagerImpl.h b/src/platform/stm32/ThreadStackManagerImpl.h
@@ -87,7 +87,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
 
     // ===== Members for internal use by the following friends.
 

diff --git a/src/platform/telink/ThreadStackManagerImpl.h b/src/platform/telink/ThreadStackManagerImpl.h
@@ -59,7 +59,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
 public:
     // ===== Methods that implement the ThreadStackManager abstract interface.
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void SetRadioBlocked(bool state) { mRadioBlocked = state; }
     bool IsReadyToAttach(void) const { return mReadyToAttach; }
     void Finalize(void);

diff --git a/src/platform/webos/ThreadStackManagerImpl.h b/src/platform/webos/ThreadStackManagerImpl.h
@@ -42,7 +42,7 @@ class ThreadStackManagerImpl : public ThreadStackManager
     }
 
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack() {}
+    void _ShutdownThreadStack() {}
     void _ProcessThreadActivity();
 
     CHIP_ERROR _StartThreadTask() { return CHIP_NO_ERROR; } // Intentionally left blank