code review comments

Author: mykrupp

src/platform/silabs/efr32/BUILD.gn

@@ -91,7 +91,7 @@ static_library("efr32") {
   } else if (chip_enable_ota_requestor) {
     sources += [
       "${silabs_platform_dir}/OTAImageProcessorImpl.h",
-      "${silabs_platform_dir}/efr32/OTAImageProcessorImpl.cpp",
+      "OTAImageProcessorImpl.cpp",
     ]
   }
 

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

@@ -440,16 +440,13 @@ CHIP_ERROR OTAMultiImageProcessorImpl::ReleaseBlock()
 
 void OTAMultiImageProcessorImpl::FetchNextData(uint32_t context)
 {
-    ChipLogError(SoftwareUpdate, "Fetch data 1:");
-
     auto * imageProcessor = &OTAMultiImageProcessorImpl::GetDefaultInstance();
     SystemLayer().ScheduleLambda([imageProcessor] {
         if (imageProcessor->mDownloader)
         {
             imageProcessor->mDownloader->FetchNextData();
         }
     });
-    ChipLogError(SoftwareUpdate, "Fetch data 2:");
 }
 
 OTAMultiImageProcessorImpl & OTAMultiImageProcessorImpl::GetDefaultInstance()

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

@@ -30,7 +30,6 @@
  * This hook is called at the end of OTAMultiImageProcessorImpl::Init.
  * It should generally register the OTATlvProcessor instances.
  */
-CHIP_ERROR OtaHookInit();
 
 namespace chip {
 
@@ -40,6 +39,8 @@ class OTAMultiImageProcessorImpl : public OTAImageProcessorInterface
     using ProviderLocation = chip::OTARequestorInterface::ProviderLocationType;
 
     CHIP_ERROR Init(OTADownloader * downloader);
+    CHIP_ERROR OtaHookInit();
+    static CHIP_ERROR ProcessDescriptor(void * descriptor);
     void Clear();
 
     //////////// OTAImageProcessorInterface Implementation ///////////////

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

@@ -41,6 +41,8 @@ namespace chip {
 #define CHIP_OTA_PROCESSOR_EEPROM_OFFSET CHIP_ERROR_TLV_PROCESSOR(0x0C)
 #define CHIP_OTA_PROCESSOR_EXTERNAL_STORAGE CHIP_ERROR_TLV_PROCESSOR(0x0D)
 #define CHIP_OTA_PROCESSOR_START_IMAGE CHIP_ERROR_TLV_PROCESSOR(0x0E)
+#define SL_GENERIC_OTA_ERROR CHIP_ERROR_TLV_PROCESSOR(0x0E)
+
 
 // Descriptor constants
 inline constexpr size_t kVersionStringSize = 64;

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

@@ -21,23 +21,19 @@
 
 #include <app/clusters/ota-requestor/OTARequestorInterface.h>
 
-#include <platform/silabs/multi-ota/efr32/OTACustomProcessor.h>
 #include <platform/silabs/multi-ota/efr32/OTAFirmwareProcessor.h>
 
-CHIP_ERROR ProcessDescriptor(void * descriptor)
+CHIP_ERROR chip::OTAMultiImageProcessorImpl::ProcessDescriptor(void * descriptor)
 {
     auto desc = static_cast<chip::OTAFirmwareProcessor::Descriptor *>(descriptor);
     ChipLogDetail(SoftwareUpdate, "Descriptor: %ld, %s, %s", desc->version, desc->versionString, desc->buildDate);
 
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR OtaHookInit()
+CHIP_ERROR chip::OTAMultiImageProcessorImpl::OtaHookInit()
 {
     static chip::OTAFirmwareProcessor sApplicationProcessor;
-#if CONFIG_CHIP_SILABS_OTA_FACTORY_DATA_PROCESSOR
-    static chip::OTAFactoryDataProcessor sFactoryDataProcessor;
-#endif // CONFIG_CHIP_SILABS_OTA_FACTORY_DATA_PROCESSOR
 
     sApplicationProcessor.RegisterDescriptorCallback(ProcessDescriptor);