From 471db5b25c5d06e1d7951839c563a156e1003490 Mon Sep 17 00:00:00 2001 From: shgutte Date: Thu, 12 Oct 2023 23:05:49 +0530 Subject: [PATCH 1/4] Added changes for build failure --- src/platform/silabs/rs911x/rsi_ble_config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/platform/silabs/rs911x/rsi_ble_config.h b/src/platform/silabs/rs911x/rsi_ble_config.h index 5ac4b0dca2659d..01cb258b5ee340 100644 --- a/src/platform/silabs/rs911x/rsi_ble_config.h +++ b/src/platform/silabs/rs911x/rsi_ble_config.h @@ -82,6 +82,7 @@ #define RSI_BLE_MATTER_CUSTOM_SERVICE_DATA_LENGTH 240 #if (SIWX_917 | EXP_BOARD) +#define RSI_EXT_TCPIP_FEATURE_BITMAP 0 #define CLEAR_ACCEPTLIST (0x00) #define ADD_DEVICE_TO_ACCEPTLIST (0x01) #define DELETE_DEVICE_FROM_ACCEPTLIST (0x02) From 89af0332ab67e68b7d84b88c0cc4c2eb0e2f480e Mon Sep 17 00:00:00 2001 From: shgutte Date: Thu, 12 Oct 2023 15:54:05 +0530 Subject: [PATCH 2/4] Added changes for the wpa3 changes --- src/platform/silabs/rs911x/rsi_ble_config.h | 22 ++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/platform/silabs/rs911x/rsi_ble_config.h b/src/platform/silabs/rs911x/rsi_ble_config.h index 01cb258b5ee340..e6709911926bad 100644 --- a/src/platform/silabs/rs911x/rsi_ble_config.h +++ b/src/platform/silabs/rs911x/rsi_ble_config.h @@ -93,12 +93,28 @@ #define RSI_TCP_IP_FEATURE_BIT_MAP \ (SL_SI91X_TCP_IP_FEAT_DHCPV4_CLIENT) //! TCP/IP feature select bitmap for selecting TCP/IP features #define RSI_CUSTOM_FEATURE_BIT_MAP SL_SI91X_FEAT_CUSTOM_FEAT_EXTENTION_VALID //! To set custom feature select bit map -#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP \ - (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV | \ - SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0) #define RSI_EXT_TCPIP_FEATURE_BITMAP 0 #define RSI_BT_FEATURE_BITMAP (SL_SI91X_BT_RF_TYPE | SL_SI91X_ENABLE_BLE_PROTOCOL) #define RSI_CONFIG_FEATURE_BITMAP 0 #define RSI_TCP_IP_BYPASS RSI_ENABLE //! TCP IP BYPASS feature check + +#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION // Adding Support for WPA3 transition +#ifdef CHIP_9117 +#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP \ + (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV | \ + SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0 | SL_SI91X_EXT_FEAT_IEEE_80211W) +#else +#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(2)) +#endif /* CHIP_9117 */ +#else +#ifdef CHIP_9117 +#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP \ + (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV | \ + SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0) +#else +#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(2)) +#endif /* CHIP_9117 */ +#endif /* WIFI_ENABLE_SECURITY_WPA3_TRANSITION */ + #else // For RS9116 #define RSI_BLE_MAX_NBR_SLAVES (3) #define RSI_BLE_MAX_NBR_MASTERS (1) From 86202a8b18074542a7889b2163c1d6d0786b79fc Mon Sep 17 00:00:00 2001 From: shgutte Date: Thu, 12 Oct 2023 23:50:49 +0530 Subject: [PATCH 3/4] Added chnages for macro --- src/platform/silabs/rs911x/rsi_ble_config.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/platform/silabs/rs911x/rsi_ble_config.h b/src/platform/silabs/rs911x/rsi_ble_config.h index e6709911926bad..d34f6198b3b127 100644 --- a/src/platform/silabs/rs911x/rsi_ble_config.h +++ b/src/platform/silabs/rs911x/rsi_ble_config.h @@ -97,23 +97,19 @@ #define RSI_CONFIG_FEATURE_BITMAP 0 #define RSI_TCP_IP_BYPASS RSI_ENABLE //! TCP IP BYPASS feature check -#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION // Adding Support for WPA3 transition #ifdef CHIP_9117 -#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP \ +#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION // Adding Support for WPA3 transition + #define RSI_EXT_CUSTOM_FEATURE_BIT_MAP \ (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV | \ SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0 | SL_SI91X_EXT_FEAT_IEEE_80211W) #else -#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(2)) -#endif /* CHIP_9117 */ -#else -#ifdef CHIP_9117 #define RSI_EXT_CUSTOM_FEATURE_BIT_MAP \ (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV | \ SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0) -#else +#endif /* WIFI_ENABLE_SECURITY_WPA3_TRANSITION */ +#else // EXP_BOARD #define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(2)) #endif /* CHIP_9117 */ -#endif /* WIFI_ENABLE_SECURITY_WPA3_TRANSITION */ #else // For RS9116 #define RSI_BLE_MAX_NBR_SLAVES (3) From c365767bfcd50f41846a5716e281c2bc2679e25b Mon Sep 17 00:00:00 2001 From: shgutte Date: Fri, 13 Oct 2023 00:00:25 +0530 Subject: [PATCH 4/4] restyling changes --- src/platform/silabs/rs911x/rsi_ble_config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/platform/silabs/rs911x/rsi_ble_config.h b/src/platform/silabs/rs911x/rsi_ble_config.h index d34f6198b3b127..58ca6d7b961d54 100644 --- a/src/platform/silabs/rs911x/rsi_ble_config.h +++ b/src/platform/silabs/rs911x/rsi_ble_config.h @@ -98,8 +98,8 @@ #define RSI_TCP_IP_BYPASS RSI_ENABLE //! TCP IP BYPASS feature check #ifdef CHIP_9117 -#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION // Adding Support for WPA3 transition - #define RSI_EXT_CUSTOM_FEATURE_BIT_MAP \ +#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION // Adding Support for WPA3 transition +#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP \ (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV | \ SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0 | SL_SI91X_EXT_FEAT_IEEE_80211W) #else @@ -107,11 +107,11 @@ (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | RAM_LEVEL_NWP_BASIC_MCU_ADV | \ SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0) #endif /* WIFI_ENABLE_SECURITY_WPA3_TRANSITION */ -#else // EXP_BOARD +#else // EXP_BOARD #define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(2)) #endif /* CHIP_9117 */ -#else // For RS9116 +#else // For RS9116 #define RSI_BLE_MAX_NBR_SLAVES (3) #define RSI_BLE_MAX_NBR_MASTERS (1) //! set handshake type of power mode