[Silabs] BLE bringup on the SiWx917 board (#24108)

* BLE bringup on the CCP board * Restyle the PR
project-chip · Oct 17, 2023 · 444a3d7 · 444a3d7
1 parent ad38ea0
commit 444a3d7
Show file tree

Hide file tree

Showing 6 changed files with 183 additions and 299 deletions.
diff --git a/examples/platform/silabs/SiWx917/SiWx917/rsi_if.c b/examples/platform/silabs/SiWx917/SiWx917/rsi_if.c
@@ -63,6 +63,7 @@ bool hasNotifiedIPV4 = false;
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
 bool hasNotifiedWifiConnectivity = false;
 
+extern rsi_semaphore_handle_t sl_ble_init_sem;
 /*
  * This file implements the interface to the RSI SAPIs
  */
@@ -275,7 +276,7 @@ static int32_t wfx_rsi_init(void)
 
  /* 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)
+ if ((status = rsi_wireless_init(OPER_MODE_0, RSI_OPERMODE_WLAN_BLE)) != RSI_SUCCESS)
  {
  WFX_RSI_LOG("%s: error: rsi_wireless_init failed with status: %02x", __func__, status);
  return status;
@@ -331,6 +332,7 @@ static int32_t wfx_rsi_init(void)
  }
 #endif
  wfx_rsi.dev_state |= WFX_RSI_ST_DEV_READY;
+ rsi_semaphore_post(&sl_ble_init_sem);
  WFX_RSI_LOG("%s: RSI: OK", __func__);
  return RSI_SUCCESS;
 }

diff --git a/src/platform/silabs/BLEManagerImpl.h b/src/platform/silabs/BLEManagerImpl.h
@@ -66,6 +66,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
  void HandleTxConfirmationEvent(BLE_CONNECTION_OBJECT conId);
  void HandleTXCharCCCDWrite(rsi_ble_event_write_t * evt);
  void HandleSoftTimerEvent(void);
+ CHIP_ERROR StartAdvertising(void);
 #else
  void HandleConnectEvent(volatile sl_bt_msg_t * evt);
  void HandleConnectionCloseEvent(volatile sl_bt_msg_t * evt);
@@ -74,7 +75,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
  void HandleTxConfirmationEvent(BLE_CONNECTION_OBJECT conId);
  void HandleTXCharCCCDWrite(volatile sl_bt_msg_t * evt);
  void HandleSoftTimerEvent(volatile sl_bt_msg_t * evt);
-
+ CHIP_ERROR StartAdvertising(void);
 #endif // RS91X_BLE_ENABLE
 
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
@@ -180,7 +181,6 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
  CHIP_ERROR MapBLEError(int bleErr);
  void DriveBLEState(void);
  CHIP_ERROR ConfigureAdvertisingData(void);
- CHIP_ERROR StartAdvertising(void);
  CHIP_ERROR StopAdvertising(void);
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
  CHIP_ERROR EncodeAdditionalDataTlv();