cleanup of ble defines and variables

Author: chirag-silabs

src/platform/silabs/rs911x/BLEManagerImpl.cpp

@@ -26,7 +26,6 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 
-#include "cmsis_os2.h"
 #include <platform/internal/BLEManager.h>
 
 #include <ble/Ble.h>
@@ -39,9 +38,6 @@
 #include <setup_payload/AdditionalDataPayloadGenerator.h>
 #endif
 
-// #ifndef SLI_SI91X_MCU_INTERFACE
-// #include "rail.h"
-// #endif
 #include <crypto/RandUtils.h>
 #ifdef __cplusplus
 extern "C" {
@@ -66,7 +62,6 @@ uint8_t dev_address[RSI_DEV_ADDR_LEN];
 uint16_t ble_measurement_hndl;
 
 osSemaphoreId_t sl_rs_ble_init_sem;
-
 osTimerId_t sbleAdvTimeoutTimer;
 
 static osThreadId_t sBleThread;
@@ -96,7 +91,7 @@ void sl_ble_init()
 
     // registering the GAP callback functions
     rsi_ble_gap_register_callbacks(NULL, NULL, rsi_ble_on_disconnect_event, NULL, NULL, NULL, rsi_ble_on_enhance_conn_status_event,
-                                NULL, NULL, NULL);
+                                   NULL, NULL, NULL);
 
     // registering the GATT call back functions
     rsi_ble_gatt_register_callbacks(NULL, NULL, NULL, NULL, NULL, NULL, NULL, rsi_ble_on_gatt_write_event, NULL, NULL,

src/platform/silabs/rs911x/wfx_sl_ble_init.cpp

@@ -20,31 +20,22 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#include <platform/CHIPDeviceLayer.h>
+#include <lib/support/logging/CHIPLogging.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 #include "wfx_sl_ble_init.h"
-#include "ble_config.h"
-#include "cmsis_os2.h"
 #ifdef __cplusplus
 }
 #endif
-#include <platform/CHIPDeviceLayer.h>
-
-#include "silabs_utils.h"
 
 // Global Variables
 rsi_ble_t att_list;
-sl_wfx_msg_t event_msg;
-
 BleEvent_t bleEvent;
-
 static osMessageQueueId_t sBleEventQueue = NULL;
 
-// Memory to initialize driver
-uint8_t bt_global_buf[BT_GLOBAL_BUFF_LEN];
-const uint8_t ShortUUID_CHIPoBLEService[] = { 0xF6, 0xFF };
-
 void InitBleEventQueue()
 {
     sBleEventQueue = osMessageQueueNew(WFX_QUEUE_SIZE, sizeof(WfxEvent_t), NULL);
@@ -61,7 +52,7 @@ void BlePostEvent(BleEvent_t * event)
     sl_status_t status = osMessageQueuePut(sBleEventQueue, event, 0, 0);
     if (status != osOK)
     {
-        SILABS_LOG("BlePostEvent: failed to post event: 0x%lx", status);
+        ChipLogError(DeviceLayer,"BlePostEvent: failed to post event: 0x%lx", status);
         // TODO: Handle error, requeue event depending on queue size or notify relevant task, Chipdie, etc.
     }
 }

src/platform/silabs/rs911x/wfx_sl_ble_init.h

@@ -29,11 +29,8 @@
 #define WFX_SL_BLE_INIT
 
 // BLE include file to refer BLE APIs
-#include "FreeRTOS.h"
+#include "cmsis_os2.h"
 #include "ble_config.h"
-#include "event_groups.h"
-#include "task.h"
-#include "timers.h"
 #include "wfx_host_events.h"
 #include "wfx_rsi.h"
 #include <rsi_ble.h>