Adds changes for the 917 NCP

Author: shgutte

src/platform/silabs/multi-ota/OTAFirmwareProcessor.cpp

@@ -68,6 +68,7 @@ CHIP_ERROR OTAFirmwareProcessor::Clear()
 CHIP_ERROR OTAFirmwareProcessor::ProcessInternal(ByteSpan & block)
 {
     uint32_t err = SL_BOOTLOADER_OK;
+    ChipLogProgress(SoftwareUpdate,"ProcessInternal Thread Block processing");
     if (!mDescriptorProcessed)
     {
         ReturnErrorOnFailure(ProcessDescriptor(block));

src/platform/silabs/multi-ota/OTAHooks.cpp

@@ -57,7 +57,7 @@ CHIP_ERROR chip::OTAMultiImageProcessorImpl::OtaHookInit()
 #ifndef SLI_SI91X_MCU_INTERFACE
     static chip::OTAFirmwareProcessor sApplicationProcessor;
     sApplicationProcessor.RegisterDescriptorCallback(ProcessDescriptor);
-    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(APPLICATION, &sApplicationProcessor));
+    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kApplicationProcessor), &sApplicationProcessor));
 #endif
 
 #if OTA_TEST_CUSTOM_TLVS
@@ -69,9 +69,9 @@ CHIP_ERROR chip::OTAMultiImageProcessorImpl::OtaHookInit()
     customProcessor2.RegisterDescriptorCallback(ProcessDescriptor);
     customProcessor3.RegisterDescriptorCallback(ProcessDescriptor);
 
-    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(8, &customProcessor1));
-    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(9, &customProcessor2));
-    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(10, &customProcessor3));
+    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kCustomProcessor1), &customProcessor1));
+    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kCustomProcessor2), &customProcessor2));
+    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kCustomProcessor3), &customProcessor3));
 #endif
 
 #ifdef SL_WIFI

src/platform/silabs/multi-ota/OTAMultiImageProcessorImpl.cpp

@@ -29,23 +29,15 @@ using namespace ::chip::DeviceLayer::Internal;
 
 static chip::OTAMultiImageProcessorImpl gImageProcessor;
 
-#if SL_WIFI
-#include <platform/silabs/wifi/ncp/spi_multiplex.h>
-#endif // SL_WIFI
-
 extern "C" {
 #if SL_BTLCTRL_MUX
 #include "btl_interface.h"
 #include "sl_core.h"
 #endif // SL_BTLCTRL_MUX
 #include "em_bus.h" // For CORE_CRITICAL_SECTION
 #ifndef SLI_SI91X_MCU_INTERFACE // required for 917 NCP
-#include "spi_multiplex.h"
 #include "btl_interface.h"
 #endif // SLI_SI91X_MCU_INTERFACE
-#ifdef CHIP_9117
-#include "spi_multiplex.h"
-#endif // CHIP_9117
 }
 
 namespace chip {

src/platform/silabs/multi-ota/OTATlvProcessor.cpp

@@ -36,9 +36,7 @@ typedef enum
     APPLICATION,
     BOOTLOADER,
     FACTORY_DATA,
-    WIFI_917_NCP_TA,
-    WIFI_917_SOC_TA, /* This is used as scan result and start */
-    WIFI_917_NCP_COMBINED
+    WIFI_917_TA_M4_COMBINED,
 } OTAImageType;
 
 #if SL_MATTER_ENABLE_OTA_ENCRYPTION

src/platform/silabs/multi-ota/SiWx917/OTAWiFiFirmwareProcessor.cpp

@@ -75,6 +75,7 @@ CHIP_ERROR OTAWiFiFirmwareProcessor::ProcessInternal(ByteSpan & block)
     // Used to tranfer other block to processor
     static uint8_t writeDataBuffer[1024] __attribute__((aligned(4))) = { 0 };
 
+    ChipLogProgress(SoftwareUpdate,"ProcessInternal WiFi Block processing");
     if (!mDescriptorProcessed)
     {
         ReturnErrorOnFailure(ProcessDescriptor(block));