diff --git a/examples/platform/silabs/FreeRTOSConfig.h b/examples/platform/silabs/FreeRTOSConfig.h index 4cad6b1e9803dc..8d3236763f35e6 100644 --- a/examples/platform/silabs/FreeRTOSConfig.h +++ b/examples/platform/silabs/FreeRTOSConfig.h @@ -107,11 +107,15 @@ extern "C" { #include +#ifdef SIWX_917 +extern uint32_t SystemCoreClock; +#else // For EFR32 #include "RTE_Components.h" #include CMSIS_device_header #include "em_assert.h" #include "em_device.h" +#endif #if defined(SL_COMPONENT_CATALOG_PRESENT) #include "sl_component_catalog.h" diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp index 1392dd9dc2b382..36f78aa84839c2 100644 --- a/examples/platform/silabs/MatterConfig.cpp +++ b/examples/platform/silabs/MatterConfig.cpp @@ -48,7 +48,7 @@ using namespace ::chip::DeviceLayer; #include // If building with the EFR32-provided crypto backend, we can use the // opaque keystore -#if CHIP_CRYPTO_PLATFORM +#if CHIP_CRYPTO_PLATFORM && !(defined(SIWX_917)) #include static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeystore; #endif @@ -215,7 +215,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName) initParams.testEventTriggerDelegate = &testEventTriggerDelegate; #endif // SILABS_TEST_EVENT_TRIGGER_ENABLED -#if CHIP_CRYPTO_PLATFORM +#if CHIP_CRYPTO_PLATFORM && !(defined(SIWX_917)) // When building with EFR32 crypto, use the opaque key store // instead of the default (insecure) one. gOperationalKeystore.Init(); @@ -255,7 +255,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName) } #ifdef SL_WIFI -void SilabsMatterConfig::InitWiFi(void) +CHIP_ERROR SilabsMatterConfig::InitWiFi(void) { #ifdef WF200_WIFI // Start wfx bus communication task. @@ -271,6 +271,7 @@ void SilabsMatterConfig::InitWiFi(void) return CHIP_ERROR_INTERNAL; } #endif /* WF200_WIFI */ + return CHIP_NO_ERROR; } #endif // SL_WIFI diff --git a/examples/platform/silabs/MatterConfig.h b/examples/platform/silabs/MatterConfig.h index 2c565f7caa7321..86c8b7e0a66ba4 100644 --- a/examples/platform/silabs/MatterConfig.h +++ b/examples/platform/silabs/MatterConfig.h @@ -29,7 +29,7 @@ class SilabsMatterConfig private: static CHIP_ERROR InitOpenThread(void); - static void InitWiFi(void); + static CHIP_ERROR InitWiFi(void); static void ConnectivityEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); static void InitOTARequestorHandler(chip::System::Layer * systemLayer, void * appState); }; diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn index 3fd6164b576ea1..f0600f012e19e7 100644 --- a/examples/platform/silabs/SiWx917/BUILD.gn +++ b/examples/platform/silabs/SiWx917/BUILD.gn @@ -183,9 +183,10 @@ config("siwx917-common-config") { defines += [ "QR_CODE_ENABLED" ] } - if (chip_enable_ota_requestor) { - defines += [ "SILABS_OTA_ENABLED" ] - } + # TODO: Renable once ota is supported + # if (chip_enable_ota_requestor) { + # defines += [ "SILABS_OTA_ENABLED" ] + # } if (enable_heap_monitoring) { defines += [ "HEAP_MONITORING" ] diff --git a/examples/platform/silabs/SiWx917/uart.cpp b/examples/platform/silabs/SiWx917/uart.cpp index 966fe44d7efd25..ac7bb8af3e774a 100644 --- a/examples/platform/silabs/SiWx917/uart.cpp +++ b/examples/platform/silabs/SiWx917/uart.cpp @@ -53,7 +53,7 @@ void ARM_USART_SignalEvent(uint32_t event) case ARM_USART_EVENT_RECEIVE_COMPLETE: #ifdef ENABLE_CHIP_SHELL chip::NotifyShellProcessFromISR(); -#endif; +#endif case ARM_USART_EVENT_TRANSFER_COMPLETE: case ARM_USART_EVENT_TX_COMPLETE: case ARM_USART_EVENT_TX_UNDERFLOW: diff --git a/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp b/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp index f226caeaaa8395..0eba1701c5dec1 100644 --- a/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp +++ b/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp @@ -26,6 +26,10 @@ extern "C" void RSI_Board_LED_Toggle(int); extern "C" void RSI_Wakeupsw_config(void); extern "C" void RSI_Wakeupsw_config_gpio0(void); +#if SILABS_LOG_ENABLED +#include "silabs_utils.h" +#endif + namespace chip { namespace DeviceLayer { namespace Silabs {