TBD remove enhanced CSL capabilities bit and define eCSL devices are …

…sleepy-device-capable by default.
suveshpratapa · Oct 16, 2024 · 6c81478 · 6c81478
1 parent 3590125
commit 6c81478
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 24 deletions.
diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
@@ -142,8 +142,6 @@ CHIP_ERROR SilabsMatterConfig::InitOpenThread(void)
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
 #if CHIP_DEVICE_CONFIG_THREAD_SSED
     ReturnErrorOnFailure(ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SynchronizedSleepyEndDevice));
-#elif CHIP_DEVICE_CONFIG_THREAD_ECSL_SED
-    ReturnErrorOnFailure(ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_EnhancedCslSleepyEndDevice));
 #else
     ReturnErrorOnFailure(ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice));
 #endif

diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h
@@ -143,7 +143,6 @@ class ConnectivityManager
         kThreadDeviceType_MinimalEndDevice            = 3,
         kThreadDeviceType_SleepyEndDevice             = 4,
         kThreadDeviceType_SynchronizedSleepyEndDevice = 5,
-        kThreadDeviceType_EnhancedCslSleepyEndDevice  = 6,
     };
 
     enum BLEAdvertisingMode

diff --git a/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp b/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
@@ -266,8 +266,6 @@ ThreadCapabilities GenericThreadDriver::GetSupportedThreadFeatures()
     capabilites.SetField(ThreadCapabilities::kIsFullThreadDevice, CHIP_DEVICE_CONFIG_THREAD_FTD);
     capabilites.SetField(ThreadCapabilities::kIsSynchronizedSleepyEndDeviceCapable,
                          (!CHIP_DEVICE_CONFIG_THREAD_FTD && CHIP_DEVICE_CONFIG_THREAD_SSED));
-    capabilites.SetField(ThreadCapabilities::kIsEnhancedCslSleepyEndDeviceCapable,
-                         (!CHIP_DEVICE_CONFIG_THREAD_FTD && CHIP_DEVICE_CONFIG_THREAD_ECSL_SED));
     return capabilites;
 }
 

diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
@@ -549,10 +549,6 @@ ConnectivityManager::ThreadDeviceType GenericThreadStackManagerImpl_OpenThread<I
         ExitNow(deviceType = ConnectivityManager::kThreadDeviceType_SynchronizedSleepyEndDevice);
 #endif // CHIP_DEVICE_CONFIG_THREAD_SSED
 
-#if CHIP_DEVICE_CONFIG_THREAD_ECSL_SED
-    ExitNow(deviceType = ConnectivityManager::kThreadDeviceType_EnhancedCslSleepyEndDevice);
-#endif // CHIP_DEVICE_CONFIG_THREAD_ECSL_SED
-
     ExitNow(deviceType = ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
 
 exit:
@@ -579,9 +575,6 @@ GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetThreadDeviceType(Connec
     case ConnectivityManager::kThreadDeviceType_SleepyEndDevice:
 #if CHIP_DEVICE_CONFIG_THREAD_SSED
     case ConnectivityManager::kThreadDeviceType_SynchronizedSleepyEndDevice:
-#endif
-#if CHIP_DEVICE_CONFIG_THREAD_ECSL_SED
-    case ConnectivityManager::kThreadDeviceType_EnhancedCslSleepyEndDevice:
 #endif
         break;
     default:
@@ -603,17 +596,16 @@ GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetThreadDeviceType(Connec
             deviceTypeStr = "MINIMAL END DEVICE";
             break;
         case ConnectivityManager::kThreadDeviceType_SleepyEndDevice:
+#if CHIP_DEVICE_CONFIG_THREAD_ECSL_SED
+            deviceTypeStr = "ENHANCED CSL SLEEPY END DEVICE";
+#else
             deviceTypeStr = "SLEEPY END DEVICE";
+#endif
             break;
 #if CHIP_DEVICE_CONFIG_THREAD_SSED
         case ConnectivityManager::kThreadDeviceType_SynchronizedSleepyEndDevice:
             deviceTypeStr = "SYNCHRONIZED SLEEPY END DEVICE";
             break;
-#endif
-#if CHIP_DEVICE_CONFIG_THREAD_ECSL_SED
-        case ConnectivityManager::kThreadDeviceType_EnhancedCslSleepyEndDevice:
-            deviceTypeStr = "ENHANCED CSL SLEEPY END DEVICE";
-            break;
 #endif
         default:
             deviceTypeStr = "(unknown)";
@@ -644,7 +636,6 @@ GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetThreadDeviceType(Connec
         break;
     case ConnectivityManager::kThreadDeviceType_SleepyEndDevice:
     case ConnectivityManager::kThreadDeviceType_SynchronizedSleepyEndDevice:
-    case ConnectivityManager::kThreadDeviceType_EnhancedCslSleepyEndDevice:
         linkMode.mDeviceType   = false;
         linkMode.mRxOnWhenIdle = false;
         break;
@@ -1213,13 +1204,11 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetPollingInter
         otErr         = otLinkCslSetPeriod(mOTInst, pollingInterval.count() * 1000 / OT_US_PER_TEN_SYMBOLS);
         curIntervalMS = otLinkCslGetPeriod(mOTInst) * OT_US_PER_TEN_SYMBOLS / 1000;
 #endif // OPENTHREAD_API_VERSION
-#elif CHIP_DEVICE_CONFIG_THREAD_ECSL_SED
+#else
+#if CHIP_DEVICE_CONFIG_THREAD_ECSL_SED
         // Set initial CSL period to 0 for eCSL SEDs. The value is later negotiated with its WC parent.
         otErr         = otLinkSetCslPeriod(mOTInst, 0);
-        curIntervalMS = 0;
-        otErr         = otLinkSetPollPeriod(mOTInst, pollingInterval.count());
-        curIntervalMS = otLinkGetPollPeriod(mOTInst);
-#else
+#endif // CHIP_DEVICE_CONFIG_THREAD_ECSL_SED
         otErr         = otLinkSetPollPeriod(mOTInst, pollingInterval.count());
         curIntervalMS = otLinkGetPollPeriod(mOTInst);
 #endif

diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h