[Tizen] Implement GetThreadVersion() for Thread driver (#34976)

arkq · web-flow · commit 0da50e96245d · 2024-08-16T15:04:48.000Z
* [Tizen] Implement GetThreadVersion in thread stack manager

* Move otThreadGetVersion() usage to Thread stack manager class

* Update C++ style

* Make GetThreadVersion public interface

* Implement mock _GetThreadVersion() for Linux, NuttX and WebOS
diff --git a/src/include/platform/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h
@@ -105,6 +105,7 @@ class ThreadStackManager
     CHIP_ERROR GetAndLogThreadTopologyFull();
     CHIP_ERROR GetPrimary802154MACAddress(uint8_t * buf);
     CHIP_ERROR GetExternalIPv6Address(chip::Inet::IPAddress & addr);
+    CHIP_ERROR GetThreadVersion(uint16_t & version);
     CHIP_ERROR GetPollPeriod(uint32_t & buf);
 
     CHIP_ERROR SetThreadProvision(ByteSpan aDataset);
@@ -444,6 +445,11 @@ inline CHIP_ERROR ThreadStackManager::GetExternalIPv6Address(chip::Inet::IPAddre
     return static_cast<ImplClass *>(this)->_GetExternalIPv6Address(addr);
 }
 
+inline CHIP_ERROR ThreadStackManager::GetThreadVersion(uint16_t & version)
+{
+    return static_cast<ImplClass *>(this)->_GetThreadVersion(version);
+}
+
 inline CHIP_ERROR ThreadStackManager::GetPollPeriod(uint32_t & buf)
 {
     return static_cast<ImplClass *>(this)->_GetPollPeriod(buf);
diff --git a/src/platform/Linux/NetworkCommissioningThreadDriver.cpp b/src/platform/Linux/NetworkCommissioningThreadDriver.cpp
@@ -211,9 +211,9 @@ ThreadCapabilities LinuxThreadDriver::GetSupportedThreadFeatures()
 
 uint16_t LinuxThreadDriver::GetThreadVersion()
 {
-    // TODO https://github.com/project-chip/connectedhomeip/issues/30602
-    // Needs to be implemented with DBUS io.openthread.BorderRouter Thread API
-    return 0;
+    uint16_t version = 0;
+    ThreadStackMgrImpl().GetThreadVersion(version);
+    return version;
 }
 
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
diff --git a/src/platform/Linux/ThreadStackManagerImpl.cpp b/src/platform/Linux/ThreadStackManagerImpl.cpp
@@ -563,6 +563,13 @@ CHIP_ERROR ThreadStackManagerImpl::_GetExternalIPv6Address(chip::Inet::IPAddress
     return CHIP_ERROR_NOT_IMPLEMENTED;
 }
 
+CHIP_ERROR ThreadStackManagerImpl::_GetThreadVersion(uint16_t & version)
+{
+    // TODO https://github.com/project-chip/connectedhomeip/issues/30602
+    // Needs to be implemented with DBUS io.openthread.BorderRouter Thread API
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+}
+
 CHIP_ERROR ThreadStackManagerImpl::_GetPollPeriod(uint32_t & buf)
 {
     // TODO: Remove Weave legacy APIs
diff --git a/src/platform/Linux/ThreadStackManagerImpl.h b/src/platform/Linux/ThreadStackManagerImpl.h
@@ -113,7 +113,7 @@ class ThreadStackManagerImpl : public ThreadStackManager
     CHIP_ERROR _GetPrimary802154MACAddress(uint8_t * buf);
 
     CHIP_ERROR _GetExternalIPv6Address(chip::Inet::IPAddress & addr);
-
+    CHIP_ERROR _GetThreadVersion(uint16_t & version);
     CHIP_ERROR _GetPollPeriod(uint32_t & buf);
 
     void _ResetThreadNetworkDiagnosticsCounts();
diff --git a/src/platform/NuttX/NetworkCommissioningThreadDriver.cpp b/src/platform/NuttX/NetworkCommissioningThreadDriver.cpp
@@ -211,9 +211,9 @@ ThreadCapabilities LinuxThreadDriver::GetSupportedThreadFeatures()
 
 uint16_t LinuxThreadDriver::GetThreadVersion()
 {
-    // TODO https://github.com/project-chip/connectedhomeip/issues/30602
-    // Needs to be implemented with DBUS io.openthread.BorderRouter Thread API
-    return 0;
+    uint16_t version = 0;
+    ThreadStackMgrImpl().GetThreadVersion(version);
+    return version;
 }
 
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
diff --git a/src/platform/NuttX/ThreadStackManagerImpl.cpp b/src/platform/NuttX/ThreadStackManagerImpl.cpp
@@ -568,6 +568,13 @@ CHIP_ERROR ThreadStackManagerImpl::_GetExternalIPv6Address(chip::Inet::IPAddress
     return CHIP_ERROR_NOT_IMPLEMENTED;
 }
 
+CHIP_ERROR ThreadStackManagerImpl::_GetThreadVersion(uint16_t & version)
+{
+    // TODO https://github.com/project-chip/connectedhomeip/issues/30602
+    // Needs to be implemented with DBUS io.openthread.BorderRouter Thread API
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+}
+
 CHIP_ERROR ThreadStackManagerImpl::_GetPollPeriod(uint32_t & buf)
 {
     // TODO: Remove Weave legacy APIs
diff --git a/src/platform/NuttX/ThreadStackManagerImpl.h b/src/platform/NuttX/ThreadStackManagerImpl.h
@@ -114,7 +114,7 @@ class ThreadStackManagerImpl : public ThreadStackManager
     CHIP_ERROR _GetPrimary802154MACAddress(uint8_t * buf);
 
     CHIP_ERROR _GetExternalIPv6Address(chip::Inet::IPAddress & addr);
-
+    CHIP_ERROR _GetThreadVersion(uint16_t & version);
     CHIP_ERROR _GetPollPeriod(uint32_t & buf);
 
     CHIP_ERROR _JoinerStart();
diff --git a/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp b/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
@@ -325,7 +325,9 @@ ThreadCapabilities GenericThreadDriver::GetSupportedThreadFeatures()
 
 uint16_t GenericThreadDriver::GetThreadVersion()
 {
-    return otThreadGetVersion();
+    uint16_t version = 0;
+    ThreadStackMgrImpl().GetThreadVersion(version);
+    return version;
 }
 
 } // namespace NetworkCommissioning
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h
@@ -70,7 +70,7 @@ class GenericThreadStackManagerImpl_OpenThread
 
     otInstance * OTInstance() const;
     static void OnOpenThreadStateChange(uint32_t flags, void * context);
-    inline void OverrunErrorTally(void);
+    inline void OverrunErrorTally();
     void
     SetNetworkStatusChangeCallback(NetworkCommissioning::Internal::BaseDriver::NetworkStatusChangeCallback * statusChangeCallback)
     {
@@ -80,21 +80,21 @@ class GenericThreadStackManagerImpl_OpenThread
 protected:
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
-    void _ProcessThreadActivity(void);
+    void _ProcessThreadActivity();
     bool _HaveRouteToAddress(const Inet::IPAddress & destAddr);
     void _OnPlatformEvent(const ChipDeviceEvent * event);
-    bool _IsThreadEnabled(void);
+    bool _IsThreadEnabled();
     CHIP_ERROR _SetThreadEnabled(bool val);
 
-    bool _IsThreadProvisioned(void);
-    bool _IsThreadAttached(void);
+    bool _IsThreadProvisioned();
+    bool _IsThreadAttached();
     CHIP_ERROR _GetThreadProvision(Thread::OperationalDataset & dataset);
     CHIP_ERROR _SetThreadProvision(ByteSpan netInfo);
     CHIP_ERROR _AttachToThreadNetwork(const Thread::OperationalDataset & dataset,
                                       NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * callback);
-    void _OnThreadAttachFinished(void);
-    void _ErasePersistentInfo(void);
-    ConnectivityManager::ThreadDeviceType _GetThreadDeviceType(void);
+    void _OnThreadAttachFinished();
+    void _ErasePersistentInfo();
+    ConnectivityManager::ThreadDeviceType _GetThreadDeviceType();
     CHIP_ERROR _SetThreadDeviceType(ConnectivityManager::ThreadDeviceType deviceType);
     CHIP_ERROR _StartThreadScan(NetworkCommissioning::ThreadDriver::ScanCallback * callback);
     static void _OnNetworkScanFinished(otActiveScanResult * aResult, void * aContext);
@@ -105,16 +105,17 @@ class GenericThreadStackManagerImpl_OpenThread
     CHIP_ERROR _SetPollingInterval(System::Clock::Milliseconds32 pollingInterval);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
-    bool _HaveMeshConnectivity(void);
-    CHIP_ERROR _GetAndLogThreadStatsCounters(void);
-    CHIP_ERROR _GetAndLogThreadTopologyMinimal(void);
-    CHIP_ERROR _GetAndLogThreadTopologyFull(void);
+    bool _HaveMeshConnectivity();
+    CHIP_ERROR _GetAndLogThreadStatsCounters();
+    CHIP_ERROR _GetAndLogThreadTopologyMinimal();
+    CHIP_ERROR _GetAndLogThreadTopologyFull();
     CHIP_ERROR _GetPrimary802154MACAddress(uint8_t * buf);
     CHIP_ERROR _GetExternalIPv6Address(chip::Inet::IPAddress & addr);
-    void _ResetThreadNetworkDiagnosticsCounts(void);
+    CHIP_ERROR _GetThreadVersion(uint16_t & version);
+    void _ResetThreadNetworkDiagnosticsCounts();
     CHIP_ERROR _GetPollPeriod(uint32_t & buf);
-    void _OnWoBLEAdvertisingStart(void);
-    void _OnWoBLEAdvertisingStop(void);
+    void _OnWoBLEAdvertisingStart();
+    void _OnWoBLEAdvertisingStop();
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
     CHIP_ERROR _AddSrpService(const char * aInstanceName, const char * aName, uint16_t aPort,
@@ -144,8 +145,8 @@ class GenericThreadStackManagerImpl_OpenThread
 
     CHIP_ERROR ConfigureThreadStack(otInstance * otInst);
     CHIP_ERROR DoInit(otInstance * otInst);
-    bool IsThreadAttachedNoLock(void);
-    bool IsThreadInterfaceUpNoLock(void);
+    bool IsThreadAttachedNoLock();
+    bool IsThreadInterfaceUpNoLock();
 
 private:
     // ===== Private members for use by this class only.
@@ -282,19 +283,19 @@ inline otInstance * GenericThreadStackManagerImpl_OpenThread<ImplClass>::OTInsta
 }
 
 template <class ImplClass>
-inline void GenericThreadStackManagerImpl_OpenThread<ImplClass>::OverrunErrorTally(void)
+inline void GenericThreadStackManagerImpl_OpenThread<ImplClass>::OverrunErrorTally()
 {
     mOverrunCount++;
 }
 
 template <class ImplClass>
-inline void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnWoBLEAdvertisingStart(void)
+inline void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnWoBLEAdvertisingStart()
 {
     // Do nothing by default.
 }
 
 template <class ImplClass>
-inline void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnWoBLEAdvertisingStop(void)
+inline void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnWoBLEAdvertisingStop()
 {
     // Do nothing by default.
 }
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
@@ -27,6 +27,7 @@
 #define GENERIC_THREAD_STACK_MANAGER_IMPL_OPENTHREAD_IPP
 
 #include <cassert>
+#include <limits>
 
 #include <openthread/cli.h>
 #include <openthread/dataset.h>
@@ -59,7 +60,6 @@
 #include <platform/ThreadStackManager.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <limits>
 extern "C" void otSysProcessDrivers(otInstance * aInstance);
 
 #if CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
@@ -80,7 +80,7 @@ app::Clusters::NetworkCommissioning::Instance
     sThreadNetworkCommissioningInstance(CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID /* Endpoint Id */, &sGenericThreadDriver);
 #endif
 
-void initNetworkCommissioningThreadDriver(void)
+void initNetworkCommissioningThreadDriver()
 {
 #ifndef _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
     sThreadNetworkCommissioningInstance.Init();
@@ -143,7 +143,7 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::OnOpenThreadStateChang
 }
 
 template <class ImplClass>
-void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ProcessThreadActivity(void)
+void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ProcessThreadActivity()
 {
     otTaskletsProcess(mOTInst);
     otSysProcessDrivers(mOTInst);
@@ -256,7 +256,7 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnPlatformEvent(const
 }
 
 template <class ImplClass>
-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadEnabled(void)
+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadEnabled()
 {
     VerifyOrReturnValue(mOTInst, false);
     otDeviceRole curRole;
@@ -330,7 +330,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetThreadProvis
 }
 
 template <class ImplClass>
-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadProvisioned(void)
+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadProvisioned()
 {
     VerifyOrReturnValue(mOTInst, false);
     bool provisioned;
@@ -363,7 +363,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetThreadProvis
 }
 
 template <class ImplClass>
-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadAttached(void)
+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadAttached()
 {
     VerifyOrReturnValue(mOTInst, false);
     otDeviceRole curRole;
@@ -525,7 +525,7 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnNetworkScanFinished
 }
 
 template <class ImplClass>
-ConnectivityManager::ThreadDeviceType GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetThreadDeviceType(void)
+ConnectivityManager::ThreadDeviceType GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetThreadDeviceType()
 {
     VerifyOrReturnValue(mOTInst, ConnectivityManager::kThreadDeviceType_NotSupported);
     ConnectivityManager::ThreadDeviceType deviceType;
@@ -651,7 +651,7 @@ GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetThreadDeviceType(Connec
 }
 
 template <class ImplClass>
-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_HaveMeshConnectivity(void)
+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_HaveMeshConnectivity()
 {
     VerifyOrReturnValue(mOTInst, false);
     bool res;
@@ -700,7 +700,7 @@ bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_HaveMeshConnectivity(
 }
 
 template <class ImplClass>
-CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetAndLogThreadStatsCounters(void)
+CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetAndLogThreadStatsCounters()
 {
     VerifyOrReturnError(mOTInst, CHIP_ERROR_INCORRECT_STATE);
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -795,7 +795,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetAndLogThread
 }
 
 template <class ImplClass>
-CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetAndLogThreadTopologyMinimal(void)
+CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetAndLogThreadTopologyMinimal()
 {
     VerifyOrReturnError(mOTInst, CHIP_ERROR_INCORRECT_STATE);
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1072,7 +1072,14 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetExternalIPv6
 }
 
 template <class ImplClass>
-void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ResetThreadNetworkDiagnosticsCounts(void)
+CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetThreadVersion(uint16_t & version)
+{
+    version = otThreadGetVersion();
+    return CHIP_NO_ERROR;
+}
+
+template <class ImplClass>
+void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ResetThreadNetworkDiagnosticsCounts()
 {
     // Based on the spec, only OverrunCount should be resetted.
     mOverrunCount = 0;
@@ -1175,14 +1182,14 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::DoInit(otInstanc
 }
 
 template <class ImplClass>
-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadAttachedNoLock(void)
+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadAttachedNoLock()
 {
     otDeviceRole curRole = otThreadGetDeviceRole(mOTInst);
     return (curRole != OT_DEVICE_ROLE_DISABLED && curRole != OT_DEVICE_ROLE_DETACHED);
 }
 
 template <class ImplClass>
-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadInterfaceUpNoLock(void)
+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadInterfaceUpNoLock()
 {
     return otIp6IsEnabled(mOTInst);
 }
@@ -1242,7 +1249,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetPollingInter
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 template <class ImplClass>
-void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ErasePersistentInfo(void)
+void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ErasePersistentInfo()
 {
     VerifyOrReturn(mOTInst);
     ChipLogProgress(DeviceLayer, "Erasing Thread persistent info...");
diff --git a/src/platform/OpenThread/OpenThreadUtils.cpp b/src/platform/OpenThread/OpenThreadUtils.cpp
@@ -80,7 +80,7 @@ bool FormatOpenThreadError(char * buf, uint16_t bufSize, CHIP_ERROR err)
 /**
  * Register a text error formatter for OpenThread errors.
  */
-void RegisterOpenThreadErrorFormatter(void)
+void RegisterOpenThreadErrorFormatter()
 {
     static ErrorFormatter sOpenThreadErrorFormatter = { FormatOpenThreadError, NULL };
 
diff --git a/src/platform/OpenThread/OpenThreadUtils.h b/src/platform/OpenThread/OpenThreadUtils.h
@@ -59,7 +59,7 @@ namespace Internal {
 #endif // CHIP_CONFIG_OPENTHREAD_ERROR_MAX
 
 extern CHIP_ERROR MapOpenThreadError(otError otErr);
-extern void RegisterOpenThreadErrorFormatter(void);
+extern void RegisterOpenThreadErrorFormatter();
 
 /**
  * Log information related to a state change in the OpenThread stack.
diff --git a/src/platform/Tizen/NetworkCommissioningThreadDriver.cpp b/src/platform/Tizen/NetworkCommissioningThreadDriver.cpp
diff --git a/src/platform/Tizen/ThreadStackManagerImpl.cpp b/src/platform/Tizen/ThreadStackManagerImpl.cpp
diff --git a/src/platform/Tizen/ThreadStackManagerImpl.h b/src/platform/Tizen/ThreadStackManagerImpl.h
diff --git a/src/platform/webos/NetworkCommissioningThreadDriver.cpp b/src/platform/webos/NetworkCommissioningThreadDriver.cpp
diff --git a/src/platform/webos/ThreadStackManagerImpl.cpp b/src/platform/webos/ThreadStackManagerImpl.cpp
diff --git a/src/platform/webos/ThreadStackManagerImpl.h b/src/platform/webos/ThreadStackManagerImpl.h

Original file line number	Diff line number	Diff line change
`@@ -211,9 +211,9 @@ ThreadCapabilities LinuxThreadDriver::GetSupportedThreadFeatures()`
`211`	`211`
`212`	`212`	`uint16_t LinuxThreadDriver::GetThreadVersion()`
`213`	`213`	`{`
`214`		`- // TODO https://github.com/project-chip/connectedhomeip/issues/30602`
`215`		`- // Needs to be implemented with DBUS io.openthread.BorderRouter Thread API`
`216`		`- return 0;`
	`214`	`+ uint16_t version = 0;`
	`215`	`+ ThreadStackMgrImpl().GetThreadVersion(version);`
	`216`	`+ return version;`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD`
Original file line number	Diff line number	Diff line change
`@@ -563,6 +563,13 @@ CHIP_ERROR ThreadStackManagerImpl::_GetExternalIPv6Address(chip::Inet::IPAddress`
`563`	`563`	`return CHIP_ERROR_NOT_IMPLEMENTED;`
`564`	`564`	`}`
`565`	`565`
	`566`	`+CHIP_ERROR ThreadStackManagerImpl::_GetThreadVersion(uint16_t & version)`
	`567`	`+{`
	`568`	`+ // TODO https://github.com/project-chip/connectedhomeip/issues/30602`
	`569`	`+ // Needs to be implemented with DBUS io.openthread.BorderRouter Thread API`
	`570`	`+ return CHIP_ERROR_NOT_IMPLEMENTED;`
	`571`	`+}`
	`572`	`+`
`566`	`573`	`CHIP_ERROR ThreadStackManagerImpl::_GetPollPeriod(uint32_t & buf)`
`567`	`574`	`{`
`568`	`575`	`// TODO: Remove Weave legacy APIs`
Original file line number	Diff line number	Diff line change
`@@ -568,6 +568,13 @@ CHIP_ERROR ThreadStackManagerImpl::_GetExternalIPv6Address(chip::Inet::IPAddress`
`568`	`568`	`return CHIP_ERROR_NOT_IMPLEMENTED;`
`569`	`569`	`}`
`570`	`570`
	`571`	`+CHIP_ERROR ThreadStackManagerImpl::_GetThreadVersion(uint16_t & version)`
	`572`	`+{`
	`573`	`+ // TODO https://github.com/project-chip/connectedhomeip/issues/30602`
	`574`	`+ // Needs to be implemented with DBUS io.openthread.BorderRouter Thread API`
	`575`	`+ return CHIP_ERROR_NOT_IMPLEMENTED;`
	`576`	`+}`
	`577`	`+`
`571`	`578`	`CHIP_ERROR ThreadStackManagerImpl::_GetPollPeriod(uint32_t & buf)`
`572`	`579`	`{`
`573`	`580`	`// TODO: Remove Weave legacy APIs`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,9 @@ ThreadCapabilities GenericThreadDriver::GetSupportedThreadFeatures()`
`325`	`325`
`326`	`326`	`uint16_t GenericThreadDriver::GetThreadVersion()`
`327`	`327`	`{`
`328`		`- return otThreadGetVersion();`
	`328`	`+ uint16_t version = 0;`
	`329`	`+ ThreadStackMgrImpl().GetThreadVersion(version);`
	`330`	`+ return version;`
`329`	`331`	`}`
`330`	`332`
`331`	`333`	`} // namespace NetworkCommissioning`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`#define GENERIC_THREAD_STACK_MANAGER_IMPL_OPENTHREAD_IPP`
`28`	`28`
`29`	`29`	`#include <cassert>`
	`30`	`+#include <limits>`
`30`	`31`
`31`	`32`	`#include <openthread/cli.h>`
`32`	`33`	`#include <openthread/dataset.h>`
`@@ -59,7 +60,6 @@`
`59`	`60`	`#include <platform/ThreadStackManager.h>`
`60`	`61`	`#include <platform/internal/CHIPDeviceLayerInternal.h>`
`61`	`62`
`62`		`-#include <limits>`
`63`	`63`	`extern "C" void otSysProcessDrivers(otInstance * aInstance);`
`64`	`64`
`65`	`65`	`#if CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI`
`@@ -80,7 +80,7 @@ app::Clusters::NetworkCommissioning::Instance`
`80`	`80`	`sThreadNetworkCommissioningInstance(CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID /* Endpoint Id */, &sGenericThreadDriver);`
`81`	`81`	`#endif`
`82`	`82`
`83`		`-void initNetworkCommissioningThreadDriver(void)`
	`83`	`+void initNetworkCommissioningThreadDriver()`
`84`	`84`	`{`
`85`	`85`	`#ifndef _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_`
`86`	`86`	`sThreadNetworkCommissioningInstance.Init();`
`@@ -143,7 +143,7 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::OnOpenThreadStateChang`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`template <class ImplClass>`
`146`		`-void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ProcessThreadActivity(void)`
	`146`	`+void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ProcessThreadActivity()`
`147`	`147`	`{`
`148`	`148`	`otTaskletsProcess(mOTInst);`
`149`	`149`	`otSysProcessDrivers(mOTInst);`
`@@ -256,7 +256,7 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnPlatformEvent(const`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`template <class ImplClass>`
`259`		`-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadEnabled(void)`
	`259`	`+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadEnabled()`
`260`	`260`	`{`
`261`	`261`	`VerifyOrReturnValue(mOTInst, false);`
`262`	`262`	`otDeviceRole curRole;`
`@@ -330,7 +330,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetThreadProvis`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`template <class ImplClass>`
`333`		`-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadProvisioned(void)`
	`333`	`+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadProvisioned()`
`334`	`334`	`{`
`335`	`335`	`VerifyOrReturnValue(mOTInst, false);`
`336`	`336`	`bool provisioned;`
`@@ -363,7 +363,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetThreadProvis`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`template <class ImplClass>`
`366`		`-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadAttached(void)`
	`366`	`+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadAttached()`
`367`	`367`	`{`
`368`	`368`	`VerifyOrReturnValue(mOTInst, false);`
`369`	`369`	`otDeviceRole curRole;`
`@@ -525,7 +525,7 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnNetworkScanFinished`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`template <class ImplClass>`
`528`		`-ConnectivityManager::ThreadDeviceType GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetThreadDeviceType(void)`
	`528`	`+ConnectivityManager::ThreadDeviceType GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetThreadDeviceType()`
`529`	`529`	`{`
`530`	`530`	`VerifyOrReturnValue(mOTInst, ConnectivityManager::kThreadDeviceType_NotSupported);`
`531`	`531`	`ConnectivityManager::ThreadDeviceType deviceType;`
`@@ -651,7 +651,7 @@ GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetThreadDeviceType(Connec`
`651`	`651`	`}`
`652`	`652`
`653`	`653`	`template <class ImplClass>`
`654`		`-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_HaveMeshConnectivity(void)`
	`654`	`+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_HaveMeshConnectivity()`
`655`	`655`	`{`
`656`	`656`	`VerifyOrReturnValue(mOTInst, false);`
`657`	`657`	`bool res;`
`@@ -700,7 +700,7 @@ bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_HaveMeshConnectivity(`
`700`	`700`	`}`
`701`	`701`
`702`	`702`	`template <class ImplClass>`
`703`		`-CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetAndLogThreadStatsCounters(void)`
	`703`	`+CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetAndLogThreadStatsCounters()`
`704`	`704`	`{`
`705`	`705`	`VerifyOrReturnError(mOTInst, CHIP_ERROR_INCORRECT_STATE);`
`706`	`706`	`CHIP_ERROR err = CHIP_NO_ERROR;`
`@@ -795,7 +795,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetAndLogThread`
`795`	`795`	`}`
`796`	`796`
`797`	`797`	`template <class ImplClass>`
`798`		`-CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetAndLogThreadTopologyMinimal(void)`
	`798`	`+CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetAndLogThreadTopologyMinimal()`
`799`	`799`	`{`
`800`	`800`	`VerifyOrReturnError(mOTInst, CHIP_ERROR_INCORRECT_STATE);`
`801`	`801`	`CHIP_ERROR err = CHIP_NO_ERROR;`
`@@ -1072,7 +1072,14 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetExternalIPv6`
`1072`	`1072`	`}`
`1073`	`1073`
`1074`	`1074`	`template <class ImplClass>`
`1075`		`-void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ResetThreadNetworkDiagnosticsCounts(void)`
	`1075`	`+CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetThreadVersion(uint16_t & version)`
	`1076`	`+{`
	`1077`	`+ version = otThreadGetVersion();`
	`1078`	`+ return CHIP_NO_ERROR;`
	`1079`	`+}`
	`1080`	`+`
	`1081`	`+template <class ImplClass>`
	`1082`	`+void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ResetThreadNetworkDiagnosticsCounts()`
`1076`	`1083`	`{`
`1077`	`1084`	`// Based on the spec, only OverrunCount should be resetted.`
`1078`	`1085`	`mOverrunCount = 0;`
`@@ -1175,14 +1182,14 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::DoInit(otInstanc`
`1175`	`1182`	`}`
`1176`	`1183`
`1177`	`1184`	`template <class ImplClass>`
`1178`		`-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadAttachedNoLock(void)`
	`1185`	`+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadAttachedNoLock()`
`1179`	`1186`	`{`
`1180`	`1187`	`otDeviceRole curRole = otThreadGetDeviceRole(mOTInst);`
`1181`	`1188`	`return (curRole != OT_DEVICE_ROLE_DISABLED && curRole != OT_DEVICE_ROLE_DETACHED);`
`1182`	`1189`	`}`
`1183`	`1190`
`1184`	`1191`	`template <class ImplClass>`
`1185`		`-bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadInterfaceUpNoLock(void)`
	`1192`	`+bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadInterfaceUpNoLock()`
`1186`	`1193`	`{`
`1187`	`1194`	`return otIp6IsEnabled(mOTInst);`
`1188`	`1195`	`}`
`@@ -1242,7 +1249,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetPollingInter`
`1242`	`1249`	`#endif // CHIP_CONFIG_ENABLE_ICD_SERVER`
`1243`	`1250`
`1244`	`1251`	`template <class ImplClass>`
`1245`		`-void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ErasePersistentInfo(void)`
	`1252`	`+void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ErasePersistentInfo()`
`1246`	`1253`	`{`
`1247`	`1254`	`VerifyOrReturn(mOTInst);`
`1248`	`1255`	`ChipLogProgress(DeviceLayer, "Erasing Thread persistent info...");`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ bool FormatOpenThreadError(char * buf, uint16_t bufSize, CHIP_ERROR err)`
`80`	`80`	`/**`
`81`	`81`	`* Register a text error formatter for OpenThread errors.`
`82`	`82`	`*/`
`83`		`-void RegisterOpenThreadErrorFormatter(void)`
	`83`	`+void RegisterOpenThreadErrorFormatter()`
`84`	`84`	`{`
`85`	`85`	`static ErrorFormatter sOpenThreadErrorFormatter = { FormatOpenThreadError, NULL };`
`86`	`86`