Skip to content

Commit 3ddad76

Browse files
committed
Adds changes for the 917 NCP
1 parent a7b01b0 commit 3ddad76

File tree

5 files changed

+7
-15
lines changed

5 files changed

+7
-15
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ CHIP_ERROR OTAFirmwareProcessor::Clear()
6868
CHIP_ERROR OTAFirmwareProcessor::ProcessInternal(ByteSpan & block)
6969
{
7070
uint32_t err = SL_BOOTLOADER_OK;
71+
ChipLogProgress(SoftwareUpdate,"ProcessInternal Thread Block processing");
7172
if (!mDescriptorProcessed)
7273
{
7374
ReturnErrorOnFailure(ProcessDescriptor(block));

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ CHIP_ERROR chip::OTAMultiImageProcessorImpl::OtaHookInit()
5757
#ifndef SLI_SI91X_MCU_INTERFACE
5858
static chip::OTAFirmwareProcessor sApplicationProcessor;
5959
sApplicationProcessor.RegisterDescriptorCallback(ProcessDescriptor);
60-
ReturnErrorOnFailure(imageProcessor.RegisterProcessor(APPLICATION, &sApplicationProcessor));
60+
ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kApplicationProcessor), &sApplicationProcessor));
6161
#endif
6262

6363
#if OTA_TEST_CUSTOM_TLVS
@@ -69,9 +69,9 @@ CHIP_ERROR chip::OTAMultiImageProcessorImpl::OtaHookInit()
6969
customProcessor2.RegisterDescriptorCallback(ProcessDescriptor);
7070
customProcessor3.RegisterDescriptorCallback(ProcessDescriptor);
7171

72-
ReturnErrorOnFailure(imageProcessor.RegisterProcessor(8, &customProcessor1));
73-
ReturnErrorOnFailure(imageProcessor.RegisterProcessor(9, &customProcessor2));
74-
ReturnErrorOnFailure(imageProcessor.RegisterProcessor(10, &customProcessor3));
72+
ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kCustomProcessor1), &customProcessor1));
73+
ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kCustomProcessor2), &customProcessor2));
74+
ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kCustomProcessor3), &customProcessor3));
7575
#endif
7676

7777
#ifdef SL_WIFI

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

-8
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,15 @@ using namespace ::chip::DeviceLayer::Internal;
2929

3030
static chip::OTAMultiImageProcessorImpl gImageProcessor;
3131

32-
#if SL_WIFI
33-
#include <platform/silabs/wifi/ncp/spi_multiplex.h>
34-
#endif // SL_WIFI
35-
3632
extern "C" {
3733
#if SL_BTLCTRL_MUX
3834
#include "btl_interface.h"
3935
#include "sl_core.h"
4036
#endif // SL_BTLCTRL_MUX
4137
#include "em_bus.h" // For CORE_CRITICAL_SECTION
4238
#ifndef SLI_SI91X_MCU_INTERFACE // required for 917 NCP
43-
#include "spi_multiplex.h"
4439
#include "btl_interface.h"
4540
#endif // SLI_SI91X_MCU_INTERFACE
46-
#ifdef CHIP_9117
47-
#include "spi_multiplex.h"
48-
#endif // CHIP_9117
4941
}
5042

5143
namespace chip {

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ typedef enum
3636
APPLICATION,
3737
BOOTLOADER,
3838
FACTORY_DATA,
39-
WIFI_917_NCP_TA,
40-
WIFI_917_SOC_TA, /* This is used as scan result and start */
41-
WIFI_917_NCP_COMBINED
39+
WIFI_917_TA_M4_COMBINED,
4240
} OTAImageType;
4341

4442
#if SL_MATTER_ENABLE_OTA_ENCRYPTION

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

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ CHIP_ERROR OTAWiFiFirmwareProcessor::ProcessInternal(ByteSpan & block)
7575
// Used to tranfer other block to processor
7676
static uint8_t writeDataBuffer[1024] __attribute__((aligned(4))) = { 0 };
7777

78+
ChipLogProgress(SoftwareUpdate,"ProcessInternal WiFi Block processing");
7879
if (!mDescriptorProcessed)
7980
{
8081
ReturnErrorOnFailure(ProcessDescriptor(block));

0 commit comments

Comments
 (0)