[Silabs] [WiFi] Modifying the temp_reset struct from pointer to variable (#32504)
* modifying the temp_reset struct from pointer to variable
* Restyled by clang-format
---------
Co-authored-by: Restyled.io <commits@restyled.io>
diff --git a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c
index 60489cd..079f12f 100644
--- a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c
+++ b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c
@@ -94,7 +94,7 @@
* This file implements the interface to the wifi sdk
*/
-wfx_wifi_scan_ext_t * temp_reset;
+static wfx_wifi_scan_ext_t temp_reset;
volatile sl_status_t callback_status = SL_STATUS_OK;
@@ -132,13 +132,13 @@
sl_wifi_statistics_t test = { 0 };
status = sl_wifi_get_statistics(SL_WIFI_CLIENT_INTERFACE, &test);
VERIFY_STATUS_AND_RETURN(status);
- extra_info->beacon_lost_count = test.beacon_lost_count - temp_reset->beacon_lost_count;
- extra_info->beacon_rx_count = test.beacon_rx_count - temp_reset->beacon_rx_count;
- extra_info->mcast_rx_count = test.mcast_rx_count - temp_reset->mcast_rx_count;
- extra_info->mcast_tx_count = test.mcast_tx_count - temp_reset->mcast_tx_count;
- extra_info->ucast_rx_count = test.ucast_rx_count - temp_reset->ucast_rx_count;
- extra_info->ucast_tx_count = test.ucast_tx_count - temp_reset->ucast_tx_count;
- extra_info->overrun_count = test.overrun_count - temp_reset->overrun_count;
+ extra_info->beacon_lost_count = test.beacon_lost_count - temp_reset.beacon_lost_count;
+ extra_info->beacon_rx_count = test.beacon_rx_count - temp_reset.beacon_rx_count;
+ extra_info->mcast_rx_count = test.mcast_rx_count - temp_reset.mcast_rx_count;
+ extra_info->mcast_tx_count = test.mcast_tx_count - temp_reset.mcast_tx_count;
+ extra_info->ucast_rx_count = test.ucast_rx_count - temp_reset.ucast_rx_count;
+ extra_info->ucast_tx_count = test.ucast_tx_count - temp_reset.ucast_tx_count;
+ extra_info->overrun_count = test.overrun_count - temp_reset.overrun_count;
return status;
}
@@ -156,13 +156,13 @@
sl_status_t status = SL_STATUS_OK;
status = sl_wifi_get_statistics(SL_WIFI_CLIENT_INTERFACE, &test);
VERIFY_STATUS_AND_RETURN(status);
- temp_reset->beacon_lost_count = test.beacon_lost_count;
- temp_reset->beacon_rx_count = test.beacon_rx_count;
- temp_reset->mcast_rx_count = test.mcast_rx_count;
- temp_reset->mcast_tx_count = test.mcast_tx_count;
- temp_reset->ucast_rx_count = test.ucast_rx_count;
- temp_reset->ucast_tx_count = test.ucast_tx_count;
- temp_reset->overrun_count = test.overrun_count;
+ temp_reset.beacon_lost_count = test.beacon_lost_count;
+ temp_reset.beacon_rx_count = test.beacon_rx_count;
+ temp_reset.mcast_rx_count = test.mcast_rx_count;
+ temp_reset.mcast_tx_count = test.mcast_tx_count;
+ temp_reset.ucast_rx_count = test.ucast_rx_count;
+ temp_reset.ucast_tx_count = test.ucast_tx_count;
+ temp_reset.overrun_count = test.overrun_count;
return status;
}
@@ -182,8 +182,6 @@
sl_status_t join_callback_handler(sl_wifi_event_t event, char * result, uint32_t result_length, void * arg)
{
wfx_rsi.dev_state &= ~(WFX_RSI_ST_STA_CONNECTING);
- temp_reset = (wfx_wifi_scan_ext_t *) malloc(sizeof(wfx_wifi_scan_ext_t));
- memset(temp_reset, 0, sizeof(wfx_wifi_scan_ext_t));
if (SL_WIFI_CHECK_IF_EVENT_FAILED(event))
{
SILABS_LOG("F: Join Event received with %u bytes payload\n", result_length);
@@ -200,6 +198,7 @@
/*
* Join was complete - Do the DHCP
*/
+ memset(&temp_reset, 0, sizeof(wfx_wifi_scan_ext_t));
SILABS_LOG("join_callback_handler: join completed.");
SILABS_LOG("%c: Join Event received with %u bytes payload\n", *result, result_length);
xEventGroupSetBits(wfx_rsi.events, WFX_EVT_STA_CONN);
diff --git a/examples/platform/silabs/efr32/rs911x/rsi_if.c b/examples/platform/silabs/efr32/rs911x/rsi_if.c
index 1ba06d0..d229251 100644
--- a/examples/platform/silabs/efr32/rs911x/rsi_if.c
+++ b/examples/platform/silabs/efr32/rs911x/rsi_if.c
@@ -88,7 +88,7 @@
* This file implements the interface to the RSI SAPIs
*/
static uint8_t wfx_rsi_drv_buf[WFX_RSI_BUF_SZ];
-static wfx_wifi_scan_ext_t * temp_reset;
+static wfx_wifi_scan_ext_t temp_reset;
/******************************************************************
* @fn int32_t wfx_rsi_get_ap_info(wfx_wifi_scan_result_t *ap)
@@ -133,13 +133,13 @@
else
{
rsi_wlan_ext_stats_t * test = (rsi_wlan_ext_stats_t *) buff;
- extra_info->beacon_lost_count = test->beacon_lost_count - temp_reset->beacon_lost_count;
- extra_info->beacon_rx_count = test->beacon_rx_count - temp_reset->beacon_rx_count;
- extra_info->mcast_rx_count = test->mcast_rx_count - temp_reset->mcast_rx_count;
- extra_info->mcast_tx_count = test->mcast_tx_count - temp_reset->mcast_tx_count;
- extra_info->ucast_rx_count = test->ucast_rx_count - temp_reset->ucast_rx_count;
- extra_info->ucast_tx_count = test->ucast_tx_count - temp_reset->ucast_tx_count;
- extra_info->overrun_count = test->overrun_count - temp_reset->overrun_count;
+ extra_info->beacon_lost_count = test->beacon_lost_count - temp_reset.beacon_lost_count;
+ extra_info->beacon_rx_count = test->beacon_rx_count - temp_reset.beacon_rx_count;
+ extra_info->mcast_rx_count = test->mcast_rx_count - temp_reset.mcast_rx_count;
+ extra_info->mcast_tx_count = test->mcast_tx_count - temp_reset.mcast_tx_count;
+ extra_info->ucast_rx_count = test->ucast_rx_count - temp_reset.ucast_rx_count;
+ extra_info->ucast_tx_count = test->ucast_tx_count - temp_reset.ucast_tx_count;
+ extra_info->overrun_count = test->overrun_count - temp_reset.overrun_count;
}
return status;
}
@@ -163,14 +163,14 @@
}
else
{
- rsi_wlan_ext_stats_t * test = (rsi_wlan_ext_stats_t *) buff;
- temp_reset->beacon_lost_count = test->beacon_lost_count;
- temp_reset->beacon_rx_count = test->beacon_rx_count;
- temp_reset->mcast_rx_count = test->mcast_rx_count;
- temp_reset->mcast_tx_count = test->mcast_tx_count;
- temp_reset->ucast_rx_count = test->ucast_rx_count;
- temp_reset->ucast_tx_count = test->ucast_tx_count;
- temp_reset->overrun_count = test->overrun_count;
+ rsi_wlan_ext_stats_t * test = (rsi_wlan_ext_stats_t *) buff;
+ temp_reset.beacon_lost_count = test->beacon_lost_count;
+ temp_reset.beacon_rx_count = test->beacon_rx_count;
+ temp_reset.mcast_rx_count = test->mcast_rx_count;
+ temp_reset.mcast_tx_count = test->mcast_tx_count;
+ temp_reset.ucast_rx_count = test->ucast_rx_count;
+ temp_reset.ucast_tx_count = test->ucast_tx_count;
+ temp_reset.overrun_count = test->overrun_count;
}
return status;
}
@@ -236,8 +236,6 @@
{
SILABS_LOG("%s: status: %02x", __func__, status);
wfx_rsi.dev_state &= ~WFX_RSI_ST_STA_CONNECTING;
- temp_reset = (wfx_wifi_scan_ext_t *) malloc(sizeof(wfx_wifi_scan_ext_t));
- memset(temp_reset, 0, sizeof(wfx_wifi_scan_ext_t));
if (status != RSI_SUCCESS)
{
/*
@@ -253,6 +251,7 @@
/*
* Join was complete - Do the DHCP
*/
+ memset(&temp_reset, 0, sizeof(wfx_wifi_scan_ext_t));
SILABS_LOG("%s: join completed.", __func__);
xEventGroupSetBits(wfx_rsi.events, WFX_EVT_STA_CONN);
wfx_rsi.join_retries = 0;
