[Silabs] wifi removing warnings for 917SoC (#26051)

* Addressed warnings for 917 * removed cflags from gni, removed comments * Applied restyle * updated matter_support pointer to latest commit * addressed redefined warning --------- Co-authored-by: chirag-silabs <[email protected]>
project-chip · Apr 14, 2023 · 8f9c3a9 · 8f9c3a9
1 parent b42e176
commit 8f9c3a9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 33 deletions.
diff --git a/examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_timer.c b/examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_timer.c
@@ -23,7 +23,7 @@
 #ifdef RSI_WITH_OS
 /* FreeRTOS includes. */
 #include "FreeRTOS.h"
-#include "StackMacros.h"
+#include "stack_macros.h"
 #include "task.h"
 #include "timers.h"
 

diff --git a/examples/platform/silabs/SiWx917/SiWx917/rsi_if.c b/examples/platform/silabs/SiWx917/SiWx917/rsi_if.c
@@ -491,14 +491,14 @@ static void wfx_rsi_do_join(void)
 void wfx_rsi_task(void * arg)
 {
     EventBits_t flags;
-    int32_t status = 0;
+    int32_t status;
     TickType_t last_dhcp_poll, now;
     struct netif * sta_netif;
     (void) arg;
-    uint32_t rsi_status = wfx_rsi_init();
-    if (rsi_status != RSI_SUCCESS)
+    status = wfx_rsi_init();
+    if (status != RSI_SUCCESS)
     {
-        SILABS_LOG("%s: error: wfx_rsi_init with status: %02x", __func__, rsi_status);
+        SILABS_LOG("%s: error: wfx_rsi_init with status: %02x", __func__, status);
         return;
     }
     wfx_lwip_start();

diff --git a/examples/platform/silabs/SiWx917/SiWx917/wfx_rsi.h b/examples/platform/silabs/SiWx917/SiWx917/wfx_rsi.h
@@ -89,6 +89,7 @@ int32_t wfx_rsi_get_ap_info(wfx_wifi_scan_result_t * ap);
 int32_t wfx_rsi_get_ap_ext(wfx_wifi_scan_ext_t * extra_info);
 int32_t wfx_rsi_reset_count();
 int32_t wfx_rsi_disconnect();
+int32_t wfx_rsi_init_platform();
 #define SILABS_LOG(...) efr32Log(__VA_ARGS__);
 
 #ifdef __cplusplus

diff --git a/examples/platform/silabs/SiWx917/device/src/startup_RS1xxxx.c b/examples/platform/silabs/SiWx917/device/src/startup_RS1xxxx.c
@@ -37,11 +37,11 @@ __attribute__((section(".co_stack"))) unsigned long pulStack[STACK_SIZE];
 #define WEAK __attribute__((weak))
 
 /*----------Declaration of the default fault handlers-------------------------*/
-// #ifndef __START
-// extern void  _start(void) __attribute__((noreturn));    /* Pre Main (C library entry point) */
-// #else
-// extern int  __START(void) __attribute__((noreturn));    /* main entry point */
-// #endif
+#ifndef __START
+extern void _start(void) __attribute__((noreturn)); /* Pre Main (C library entry point) */
+#else
+extern int __START(void) __attribute__((noreturn)); /* main entry point */
+#endif
 
 /* System exception vector handler */
 __attribute__((used)) void WEAK Reset_Handler(void);

diff --git a/src/platform/silabs/SiWx917/CHIPCryptoPALTinyCrypt.cpp b/src/platform/silabs/SiWx917/CHIPCryptoPALTinyCrypt.cpp
@@ -842,7 +842,6 @@ static inline Spake2p_Context * to_inner_spake2p_context(Spake2pOpaqueContext *
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::InitInternal(void)
 {
     CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
 
     Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
 
@@ -864,11 +863,6 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::InitInternal(void)
     G = curve_G;
 
     return error;
-
-exit:
-    _log_mbedTLS_error(result);
-    Clear();
-    return error;
 }
 
 void Spake2p_P256_SHA256_HKDF_HMAC::Clear()
@@ -926,20 +920,18 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::MacVerify(const uint8_t * key, size_t
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FELoad(const uint8_t * in, size_t in_len, void * fe)
 {
     CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
 
     uECC_word_t tmp[2 * NUM_ECC_WORDS] = { 0 };
     uECC_vli_bytesToNative(tmp, in, NUM_ECC_BYTES);
 
     uECC_vli_mmod((uECC_word_t *) fe, tmp, curve_n);
 
-exit:
-    _log_mbedTLS_error(result);
     return error;
 }
 
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEWrite(const void * fe, uint8_t * out, size_t out_len)
 {
+    (void) out_len;
     uECC_vli_nativeToBytes(out, NUM_ECC_BYTES, (const unsigned int *) fe);
 
     return CHIP_NO_ERROR;
@@ -967,12 +959,9 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEGenerate(void * fe)
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEMul(void * fer, const void * fe1, const void * fe2)
 {
     CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
 
     uECC_vli_modMult((uECC_word_t *) fer, (const uECC_word_t *) fe1, (const uECC_word_t *) fe2, (const uECC_word_t *) curve_n);
 
-exit:
-    _log_mbedTLS_error(result);
     return error;
 }
 
@@ -1018,7 +1007,6 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointAddMul(void * R, const void * P1,
     uECC_word_t R1[2 * NUM_ECC_WORDS];
     uECC_word_t R2[2 * NUM_ECC_WORDS];
     uECC_word_t z[NUM_ECC_WORDS];
-    uint8_t ret = UECC_SUCCESS;
 
     if (EccPoint_mult_safer(R1, (const uECC_word_t *) P1, (const uECC_word_t *) fe1) != UECC_SUCCESS)
     {
@@ -1490,7 +1478,6 @@ CHIP_ERROR ExtractPubkeyFromX509Cert(const ByteSpan & certificate, Crypto::P256P
     CHIP_ERROR error = CHIP_NO_ERROR;
     mbedtls_x509_crt mbed_cert;
     mbedtls_uecc_keypair * keypair = nullptr;
-    size_t pubkey_size             = 0;
 
     mbedtls_x509_crt_init(&mbed_cert);
 

diff --git a/src/platform/silabs/SiWx917/bluetooth/wfx_sl_ble_init.h b/src/platform/silabs/SiWx917/bluetooth/wfx_sl_ble_init.h
@@ -17,7 +17,9 @@
 
 #ifndef WFX_SL_BLE_INIT
 #define WFX_SL_BLE_INIT
+#ifndef RSI_BLE_ENABLE
 #define RSI_BLE_ENABLE (1)
+#endif // RSI_BLE_ENABLE
 
 // BLE include file to refer BLE APIs
 #include "FreeRTOS.h"

diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -181,15 +181,7 @@ template("siwx917_sdk") {
     cflags += [
       "-Wno-maybe-uninitialized",
       "-Wno-shadow",
-      "-Wno-empty-body",
-      "-Wno-cpp",
-      "-Wno-missing-braces",
-      "-Wno-sign-compare",
       "-Wno-error",
-      "-Wno-unknown-warning-option",
-      "-Wno-unused-variable",
-      "-Wno-implicit-function-declaration",
-      "-Wno-unused-function",
     ]
 
     if (defined(invoker.defines)) {

diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
+3 −4		matter/mbedtls/tinycrypt/src/ecc.c
+1 −1		matter/mbedtls/tinycrypt/src/pkwrite.c
+2 −0		platform/emdrv/nvm3/inc/ccp_flash_intf.h
+2 −3		platform/emdrv/nvm3/src/ccp_flash_dev.c
+0 −2		platform/emdrv/nvm3/src/ccp_flash_intf.c
+5 −2		platform/emdrv/nvm3/src/nvm3_hal_flash_ccp.c
+5 −0		platform/emdrv/nvm3/src/nvm3_lock.c