Feature/rs911x ble implementation updated master

examples/lighting-app/efr32/BUILD.gn

@@ -122,6 +122,9 @@ efr32_sdk("sdk") {
   ]
 
   include_dirs = [
+    "${chip_root}/examples/platform/efr32/rs911x",
+    "${chip_root}/examples/platform/efr32/rs911x/hal",
+    "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk/sapi/include",
     "${chip_root}/src/platform/EFR32",
     "${efr32_project_dir}/include",
     "${examples_plat_dir}",

examples/lighting-app/efr32/src/main.cpp

@@ -23,6 +23,7 @@
 #include "init_efrPlatform.h"
 #include "sl_simple_button_instances.h"
 #include "sl_system_kernel.h"
+#include "wfx_host_events.h"
 #include <DeviceInfoProviderImpl.h>
 #include <app/server/Server.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
@@ -33,7 +34,7 @@
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #endif
 
-#define BLE_DEV_NAME "SiLabs-Light"
+#define BLE_DEV_NAME "RSI-BLE"
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::DeviceLayer;

examples/platform/efr32/matter_config.cpp

@@ -46,6 +46,10 @@ using namespace ::chip::Inet;
 using namespace ::chip::DeviceLayer;
 
 #include <crypto/CHIPCryptoPAL.h>
+
+#include "event_groups.h"
+#include "wfx_rsi.h"
+
 // If building with the EFR32-provided crypto backend, we can use the
 // opaque keystore
 #if CHIP_CRYPTO_PLATFORM
@@ -148,8 +152,14 @@ CHIP_ERROR EFR32MatterConfig::InitMatter(const char * appName)
     EFR32_LOG("Init CHIP Stack");
     // Init Chip memory management before the stack
     ReturnErrorOnFailure(chip::Platform::MemoryInit());
+
+//    EFR32_LOG("Init RSI 911x Platform");
+//    wfx_rsi_init_platform();
+
+    EFR32_LOG("Init CHIP PlatformMgr ChipStack");
     ReturnErrorOnFailure(PlatformMgr().InitChipStack());
 
+    EFR32_LOG("Init Set BLE Device Name");
     chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName(appName);
 
 #if CHIP_ENABLE_OPENTHREAD

examples/platform/efr32/rs911x/rs911x.gni

@@ -16,10 +16,12 @@ rs911x_src_plat = [
   "${examples_plat_dir}/rs911x/hal/rsi_hal_mcu_timer.c",
   "${examples_plat_dir}/rs911x/hal/efx_spi.c",
 ]
+
 rs911x_plat_incs = [
   "${wifi_sdk_dir}",
   "${wifi_sdk_dir}/hal",
   "${chip_root}/src/platform/EFR32",
+  "${chip_root}/src/platform/EFR32/RS911x",
 ]
 
 #
@@ -95,6 +97,7 @@ rs911x_defs = [
   "RSI_SPI_INTERFACE",
   "RSI_WITH_OS",
 ]
+
 rs911x_sock_defs = [
   "RS911X_SOCKETS",
   "RSI_IPV6_ENABLE",

examples/platform/efr32/rs911x/rsi_if.c

@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+
 #include "em_bus.h"
 #include "em_cmu.h"
 #include "em_gpio.h"
@@ -31,6 +32,7 @@
 #include "event_groups.h"
 #include "task.h"
 
+#include "wfx_sl_ble_init.h"
 #include "wfx_host_events.h"
 
 #include "rsi_driver.h"
@@ -48,15 +50,17 @@
 #include "rsi_bootup_config.h"
 #include "rsi_error.h"
 
+#include "rsi_bt_common.h"
+#include "rsi_ble_apis.h"
+#include "rsi_bt_common_apis.h"
+#include "rsi_ble_config.h"
+#include "rsi_utils.h"
+
 #include "dhcp_client.h"
 #include "wfx_host_events.h"
 #include "wfx_rsi.h"
 
-/* Rsi driver Task will use as its stack */
-StackType_t driverRsiTaskStack[WFX_RSI_WLAN_TASK_SZ] = { 0 };
 
-/* Structure that will hold the TCB of the wfxRsi Task being created. */
-StaticTask_t driverRsiTaskBuffer;
 
 /* Declare a variable to hold the data associated with the created event group. */
 StaticEventGroup_t rsiDriverEventGroup;
@@ -70,7 +74,7 @@ bool hasNotifiedWifiConnectivity = false;
 /*
  * This file implements the interface to the RSI SAPIs
  */
-static uint8_t wfx_rsi_drv_buf[WFX_RSI_BUF_SZ];
+//static uint8_t wfx_rsi_drv_buf[WFX_RSI_BUF_SZ];
 wfx_wifi_scan_ext_t * temp_reset;
 uint8_t security;
 
@@ -293,76 +297,74 @@ static void wfx_rsi_wlan_pkt_cb(uint16_t status, uint8_t * buf, uint32_t len)
 static int32_t wfx_rsi_init(void)
 {
     int32_t status;
-    uint8_t buf[RSI_RESPONSE_HOLD_BUFF_SIZE];
-    extern void rsi_hal_board_init(void);
-
-    WFX_RSI_LOG("%s: starting(HEAP_SZ = %d)", __func__, SL_HEAP_SIZE);
-    //! Driver initialization
-    status = rsi_driver_init(wfx_rsi_drv_buf, WFX_RSI_BUF_SZ);
-    if ((status < RSI_DRIVER_STATUS) || (status > WFX_RSI_BUF_SZ))
-    {
-        WFX_RSI_LOG("%s: error: RSI drv init failed with status: %02x", __func__, status);
-        return status;
-    }
-
-    WFX_RSI_LOG("%s: rsi_device_init", __func__);
-    /* ! Redpine module intialisation */
-    if ((status = rsi_device_init(LOAD_NWP_FW)) != RSI_SUCCESS)
-    {
-        WFX_RSI_LOG("%s: error: rsi_device_init failed with status: %02x", __func__, status);
-        return status;
-    }
-    WFX_RSI_LOG("%s: start wireless drv task", __func__);
-    /*
-     * Create the driver task
-     */
-    wfx_rsi.drv_task = xTaskCreateStatic((TaskFunction_t) rsi_wireless_driver_task, "rsi_drv", WFX_RSI_WLAN_TASK_SZ, NULL,
-                                         WLAN_TASK_PRIORITY, driverRsiTaskStack, &driverRsiTaskBuffer);
-    if (NULL == wfx_rsi.drv_task)
-    {
-        WFX_RSI_LOG("%s: error: rsi_wireless_driver_task failed", __func__);
-        return RSI_ERROR_INVALID_PARAM;
-    }
-
-    /* Initialize WiSeConnect or Module features. */
-    WFX_RSI_LOG("%s: rsi_wireless_init", __func__);
-    if ((status = rsi_wireless_init(OPER_MODE_0, COEX_MODE_0)) != RSI_SUCCESS)
-    {
-        WFX_RSI_LOG("%s: error: rsi_wireless_init failed with status: %02x", __func__, status);
-        return status;
-    }
+  //  uint8_t buf[RSI_RESPONSE_HOLD_BUFF_SIZE];
+   // extern void rsi_hal_board_init(void);
+
+//    WFX_RSI_LOG("%s: starting(HEAP_SZ = %d)", __func__, SL_HEAP_SIZE);
+//    //! Driver initialization
+//    status = rsi_driver_init(wfx_rsi_drv_buf, WFX_RSI_BUF_SZ);
+//    if ((status < RSI_DRIVER_STATUS) || (status > WFX_RSI_BUF_SZ))
+//    {
+//        WFX_RSI_LOG("%s: error: RSI drv init failed with status: %02x", __func__, status);
+//        return status;
+//    }
+//
+//    WFX_RSI_LOG("%s: rsi_device_init", __func__);
+//    /* ! Redpine module intialisation */
+//    if ((status = rsi_device_init(LOAD_NWP_FW)) != RSI_SUCCESS)
+//    {
+//        WFX_RSI_LOG("%s: error: rsi_device_init failed with status: %02x", __func__, status);
+//        return status;
+//    }
+//    WFX_RSI_LOG("%s: start wireless drv task", __func__);
+//    /*
+//     * Create the driver task
+//     */
+//    wfx_rsi.drv_task = xTaskCreateStatic((TaskFunction_t) rsi_wireless_driver_task, "rsi_drv", WFX_RSI_WLAN_TASK_SZ, NULL,
+//                                         WLAN_TASK_PRIORITY, driverRsiTaskStack, &driverRsiTaskBuffer);
+//    if (NULL == wfx_rsi.drv_task)
+//    {
+//        WFX_RSI_LOG("%s: error: rsi_wireless_driver_task failed", __func__);
+//        return RSI_ERROR_INVALID_PARAM;
+//    }
+//
+//    /* Initialize WiSeConnect or Module features. */
+//    WFX_RSI_LOG("%s: rsi_wireless_init", __func__);
+//    if ((status = rsi_wireless_init(OPER_MODE_0, COEX_MODE_0)) != RSI_SUCCESS)
+//    {
+//        WFX_RSI_LOG("%s: error: rsi_wireless_init failed with status: %02x", __func__, status);
+//        return status;
+//    }
+//
+//    WFX_RSI_LOG("%s: get FW version..", __func__);
+//    /*
+//     * Get the MAC and other info to let the user know about it.
+//     */
+//    if (rsi_wlan_get(RSI_FW_VERSION, buf, sizeof(buf)) != RSI_SUCCESS)
+//    {
+//        WFX_RSI_LOG("%s: error: rsi_wlan_get(RSI_FW_VERSION) failed with status: %02x", __func__, status);
+//        return status;
+//    }
+//
+//    buf[sizeof(buf) - 1] = 0;
+//    WFX_RSI_LOG("%s: RSI firmware version: %s", __func__, buf);
+//    //! Send feature frame
+//    if ((status = rsi_send_feature_frame()) != RSI_SUCCESS)
+//    {
+//        WFX_RSI_LOG("%s: error: rsi_send_feature_frame failed with status: %02x", __func__, status);
+//        return status;
+//    }
+//
+//    WFX_RSI_LOG("%s: sent rsi_send_feature_frame", __func__);
+//    /* initializes wlan radio parameters and WLAN supplicant parameters.
+//     */
+//    (void) rsi_wlan_radio_init(); /* Required so we can get MAC address */
+//    if ((status = rsi_wlan_get(RSI_MAC_ADDRESS, &wfx_rsi.sta_mac.octet[0], RESP_BUFF_SIZE)) != RSI_SUCCESS)
+//    {
+//        WFX_RSI_LOG("%s: error: rsi_wlan_get failed with status: %02x", __func__, status);
+//        return status;
+//    }
 
-    WFX_RSI_LOG("%s: get FW version..", __func__);
-    /*
-     * Get the MAC and other info to let the user know about it.
-     */
-    if (rsi_wlan_get(RSI_FW_VERSION, buf, sizeof(buf)) != RSI_SUCCESS)
-    {
-        WFX_RSI_LOG("%s: error: rsi_wlan_get(RSI_FW_VERSION) failed with status: %02x", __func__, status);
-        return status;
-    }
-
-    buf[sizeof(buf) - 1] = 0;
-    WFX_RSI_LOG("%s: RSI firmware version: %s", __func__, buf);
-    //! Send feature frame
-    if ((status = rsi_send_feature_frame()) != RSI_SUCCESS)
-    {
-        WFX_RSI_LOG("%s: error: rsi_send_feature_frame failed with status: %02x", __func__, status);
-        return status;
-    }
-
-    WFX_RSI_LOG("%s: sent rsi_send_feature_frame", __func__);
-    /* initializes wlan radio parameters and WLAN supplicant parameters.
-     */
-    (void) rsi_wlan_radio_init(); /* Required so we can get MAC address */
-    if ((status = rsi_wlan_get(RSI_MAC_ADDRESS, &wfx_rsi.sta_mac.octet[0], RESP_BUFF_SIZE)) != RSI_SUCCESS)
-    {
-        WFX_RSI_LOG("%s: error: rsi_wlan_get failed with status: %02x", __func__, status);
-        return status;
-    }
-
-    WFX_RSI_LOG("%s: WLAN: MAC %02x:%02x:%02x %02x:%02x:%02x", __func__, wfx_rsi.sta_mac.octet[0], wfx_rsi.sta_mac.octet[1],
-                wfx_rsi.sta_mac.octet[2], wfx_rsi.sta_mac.octet[3], wfx_rsi.sta_mac.octet[4], wfx_rsi.sta_mac.octet[5]);
     wfx_rsi.events = xEventGroupCreateStatic(&rsiDriverEventGroup);
     /*
      * Register callbacks - We are only interested in the connectivity CBs
@@ -849,4 +851,28 @@ int32_t wfx_rsi_send_data(void * p, uint16_t len)
     return status;
 }
 
+
+
 struct wfx_rsi wfx_rsi;
+
+//void rsi_init_task(void * arg)
+//{
+//   uint32_t rsi_status = wfx_sl_module_init();
+//    if (rsi_status != RSI_SUCCESS)
+//    {
+//        WFX_RSI_LOG("%s: error: wfx_sl_module_init with status: %02x", __func__, rsi_status);
+//        return;
+//    }
+//    WFX_RSI_LOG("After wfx_sl_module_init");
+//    rsi_task_suspend((rsi_task_handle_t *)wfx_rsi.init_task);
+//}
+//
+//void wfx_rsi_init_platform()
+//{
+//    /*init task - RS911x*/
+//    WFX_RSI_LOG("WFX:Start ble task");
+//    if (xTaskCreate((TaskFunction_t) rsi_init_task, "rsi_init", WFX_RSI_TASK_SZ, NULL, 54, &wfx_rsi.init_task) != pdPASS)
+//    {
+//        WFX_RSI_LOG("ERR: RSI ble task create");
+//    }
+//}

examples/platform/efr32/rs911x/wfx_rsi.h

@@ -57,6 +57,8 @@ struct wfx_rsi
     EventGroupHandle_t events;
     TaskHandle_t drv_task;
     TaskHandle_t wlan_task;
+    TaskHandle_t init_task;
+    TaskHandle_t ble_task;
     uint16_t dev_state;
     uint16_t ap_chan; /* The chan our STA is using	*/
     wfx_wifi_provision_t sec;
@@ -87,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();
+void wfx_rsi_init_platform();
 #define WFX_RSI_LOG(...) efr32Log(__VA_ARGS__);
 
 #ifdef __cplusplus

src/include/platform/internal/BLEManager.h

@@ -102,7 +102,7 @@ extern BLEManagerImpl & BLEMgrImpl();
 #ifdef EXTERNAL_BLEMANAGERIMPL_HEADER
 #include EXTERNAL_BLEMANAGERIMPL_HEADER
 #elif defined(CHIP_DEVICE_LAYER_TARGET)
-#define BLEMANAGERIMPL_HEADER <platform/CHIP_DEVICE_LAYER_TARGET/BLEManagerImpl.h>
+#define BLEMANAGERIMPL_HEADER <platform/CHIP_DEVICE_LAYER_TARGET/RS911x/BLEManagerImpl.h>
 #include BLEMANAGERIMPL_HEADER
 #endif // defined(CHIP_DEVICE_LAYER_TARGET)
 

src/platform/EFR32/BLEManagerImpl.cpp

@@ -43,7 +43,7 @@ extern "C" {
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/CommissionableDataProvider.h>
-#include <platform/DeviceInstanceInfoProvider.h>
+#include <platform/DeviceInstanceInfoProvider.h>![](C:/Users/shgutte/AppData/Local/Temp/download.jpg)
 #include <sl_bt_rtos_adaptation.h>
 
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
@@ -1017,7 +1017,7 @@ extern "C" void sl_bt_on_event(sl_bt_msg_t * evt)
     break;
     case sl_bt_evt_connection_parameters_id: {
         // ChipLogProgress(DeviceLayer, "Connection parameter ID received");
-    }
+
     break;
     case sl_bt_evt_connection_phy_status_id: {
         // ChipLogProgress(DeviceLayer, "PHY update procedure is completed");
@@ -1045,10 +1045,13 @@ extern "C" void sl_bt_on_event(sl_bt_msg_t * evt)
     case sl_bt_evt_gatt_server_characteristic_status_id: {
         sl_bt_gatt_server_characteristic_status_flag_t StatusFlags;
 
+
+
         StatusFlags = (sl_bt_gatt_server_characteristic_status_flag_t) evt->data.evt_gatt_server_characteristic_status.status_flags;
 
         if (sl_bt_gatt_server_confirmation == StatusFlags)
         {
+
             chip::DeviceLayer::Internal::BLEMgrImpl().HandleTxConfirmationEvent(
                 evt->data.evt_gatt_server_characteristic_status.connection);
         }

src/platform/EFR32/BUILD.gn

@@ -34,8 +34,11 @@ static_library("EFR32") {
   sources = [
     "../FreeRTOS/SystemTimeSupport.cpp",
     "../SingletonConfigurationManager.cpp",
-    "BLEManagerImpl.cpp",
-    "BLEManagerImpl.h",
+    "RS911x/BLEManagerImpl.cpp",
+    "RS911x/wfx_sl_ble_init.h",
+    "RS911x/wfx_sl_ble_init.c",
+    "RS911x/rsi_ble_config.h",
+    "RS911x/BLEManagerImpl.h",
     "BlePlatformConfig.h",
     "CHIPDevicePlatformConfig.h",
     "CHIPDevicePlatformEvent.h",