Unify OTA for silabs platform (#26131)

project-chip · Nov 23, 2023 · 2295872 · 2295872
1 parent a304d43
commit 2295872
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 219 deletions.
diff --git a/...les/platform/silabs/SiWx917/OTAConfig.cpp → examples/platform/silabs/OTAConfig.cpp b/...les/platform/silabs/SiWx917/OTAConfig.cpp → examples/platform/silabs/OTAConfig.cpp
diff --git a/examples/platform/silabs/SiWx917/OTAConfig.h → examples/platform/silabs/OTAConfig.h b/examples/platform/silabs/SiWx917/OTAConfig.h → examples/platform/silabs/OTAConfig.h
@@ -22,7 +22,7 @@
 #include <app/clusters/ota-requestor/DefaultOTARequestor.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/silabs/efr32/OTAImageProcessorImpl.h>
+#include <platform/silabs/OTAImageProcessorImpl.h>
 
 class OTAConfig
 {

diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -176,7 +176,7 @@ config("siwx917-common-config") {
   }
 
   if (chip_enable_ota_requestor) {
-    defines += [ "EFR32_OTA_ENABLED" ]
+    defines += [ "SILABS_OTA_ENABLED" ]
   }
 
   if (enable_heap_monitoring) {

diff --git a/examples/platform/silabs/SiWx917/matter_config.cpp b/examples/platform/silabs/SiWx917/matter_config.cpp
@@ -56,7 +56,7 @@ using namespace ::chip::DeviceLayer;
 
 #include "SilabsDeviceDataProvider.h"
 
-#if EFR32_OTA_ENABLED
+#if SILABS_OTA_ENABLED
 void SilabsMatterConfig::InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
 {
 #if 0 // TODO : OTA is not planned now for CCP

diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn
@@ -221,7 +221,7 @@ config("efr32-common-config") {
   }
 
   if (chip_enable_ota_requestor) {
-    defines += [ "EFR32_OTA_ENABLED" ]
+    defines += [ "SILABS_OTA_ENABLED" ]
   }
 
   if (enable_heap_monitoring) {
@@ -302,7 +302,7 @@ source_set("efr32-common") {
   }
 
   if (chip_enable_ota_requestor) {
-    sources += [ "OTAConfig.cpp" ]
+    sources += [ "${silabs_common_plat_dir}/OTAConfig.cpp" ]
   }
 
   if (!disable_lcd) {

diff --git a/examples/platform/silabs/efr32/OTAConfig.cpp b/examples/platform/silabs/efr32/OTAConfig.cpp
diff --git a/examples/platform/silabs/efr32/OTAConfig.h b/examples/platform/silabs/efr32/OTAConfig.h
diff --git a/examples/platform/silabs/efr32/matter_config.cpp b/examples/platform/silabs/efr32/matter_config.cpp
@@ -110,7 +110,7 @@ CHIP_ERROR SilabsMatterConfig::InitOpenThread(void)
 }
 #endif // CHIP_ENABLE_OPENTHREAD
 
-#if EFR32_OTA_ENABLED
+#if SILABS_OTA_ENABLED
 void SilabsMatterConfig::InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
 {
     OTAConfig::Init();
@@ -125,7 +125,7 @@ void SilabsMatterConfig::ConnectivityEventCallback(const ChipDeviceEvent * event
         ((event->Type == DeviceEventType::kInternetConnectivityChange) &&
          (event->InternetConnectivityChange.IPv6 == kConnectivity_Established)))
     {
-#if EFR32_OTA_ENABLED
+#if SILABS_OTA_ENABLED
         SILABS_LOG("Scheduling OTA Requestor initialization")
         chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Seconds32(OTAConfig::kInitOTARequestorDelaySec),
                                                     InitOTARequestorHandler, nullptr);

diff --git a/...rm/silabs/SiWx917/OTAImageProcessorImpl.h → src/platform/silabs/OTAImageProcessorImpl.h b/...rm/silabs/SiWx917/OTAImageProcessorImpl.h → src/platform/silabs/OTAImageProcessorImpl.h
diff --git a/src/platform/silabs/SiWx917/BUILD.gn b/src/platform/silabs/SiWx917/BUILD.gn
@@ -67,7 +67,7 @@ static_library("SiWx917") {
   if (chip_enable_ota_requestor) {
     sources += [
       #"OTAImageProcessorImpl.cpp",
-      #"OTAImageProcessorImpl.h",
+      #"${silabs_platform_dir}/OTAImageProcessorImpl.h",
     ]
   }
 

diff --git a/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp b/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp
@@ -16,9 +16,9 @@
  *    limitations under the License.
  */
 
-#include "OTAImageProcessorImpl.h"
 #include <app/clusters/ota-requestor/OTADownloader.h>
 #include <app/clusters/ota-requestor/OTARequestorInterface.h>
+#include <platform/silabs/OTAImageProcessorImpl.h>
 
 extern "C" {
 #include "btl_interface.h"

diff --git a/src/platform/silabs/efr32/BUILD.gn b/src/platform/silabs/efr32/BUILD.gn
@@ -76,8 +76,8 @@ static_library("efr32") {
 
   if (chip_enable_ota_requestor) {
     sources += [
+      "${silabs_platform_dir}/OTAImageProcessorImpl.h",
       "OTAImageProcessorImpl.cpp",
-      "OTAImageProcessorImpl.h",
     ]
   }
 

diff --git a/src/platform/silabs/efr32/OTAImageProcessorImpl.cpp b/src/platform/silabs/efr32/OTAImageProcessorImpl.cpp
@@ -16,9 +16,9 @@
  *    limitations under the License.
  */
 
-#include "OTAImageProcessorImpl.h"
 #include <app/clusters/ota-requestor/OTADownloader.h>
 #include <app/clusters/ota-requestor/OTARequestorInterface.h>
+#include <platform/silabs/OTAImageProcessorImpl.h>
 
 extern "C" {
 #include "btl_interface.h"

diff --git a/src/platform/silabs/efr32/OTAImageProcessorImpl.h b/src/platform/silabs/efr32/OTAImageProcessorImpl.h