removing the extern keyword for the queue

Author: chirag-silabs

src/platform/silabs/rs911x/BLEManagerImpl.cpp

@@ -29,7 +29,6 @@
 #include "cmsis_os2.h"
 #include <platform/internal/BLEManager.h>
 
-
 #include <ble/Ble.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
@@ -56,7 +55,6 @@ extern "C" {
 }
 #endif
 
-#define WFX_QUEUE_SIZE 10
 #define BLE_MIN_CONNECTION_INTERVAL_MS 24
 #define BLE_MAX_CONNECTION_INTERVAL_MS 40
 #define BLE_SLAVE_LATENCY_MS 0
@@ -68,7 +66,6 @@ uint8_t dev_address[RSI_DEV_ADDR_LEN];
 uint16_t ble_measurement_hndl;
 
 osSemaphoreId_t sl_rs_ble_init_sem;
-osMessageQueueId_t sBleEventQueue = NULL;
 
 osTimerId_t sbleAdvTimeoutTimer;
 
@@ -99,7 +96,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,
@@ -109,10 +106,7 @@ void sl_ble_init()
     //  Exchange of GATT info with BLE stack
     rsi_ble_add_matter_service();
     rsi_ble_set_random_address_with_value(randomAddrBLE);
-
-    sBleEventQueue = osMessageQueueNew(WFX_QUEUE_SIZE, sizeof(WfxEvent_t), NULL);
-    VerifyOrDie(sBleEventQueue != nullptr);
-
+    InitBleEventQueue();
     chip::DeviceLayer::Internal::BLEMgrImpl().HandleBootEvent();
 }
 
@@ -179,7 +173,7 @@ void sl_ble_event_handling_task(void * args)
     // Application event map
     while (1)
     {
-        status = osMessageQueueGet(sBleEventQueue, &bleEvent, NULL, osWaitForever);
+        status = osMessageQueueGet(GetBleEventQueue(), &bleEvent, NULL, osWaitForever);
         if (status == osOK)
         {
             ProcessEvent(bleEvent);

src/platform/silabs/rs911x/wfx_sl_ble_init.cpp

@@ -29,6 +29,8 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
+#include <platform/CHIPDeviceLayer.h>
+
 #include "silabs_utils.h"
 
 // Global Variables
@@ -37,12 +39,23 @@ sl_wfx_msg_t event_msg;
 
 BleEvent_t bleEvent;
 
-extern osMessageQueueId_t sBleEventQueue;
+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);
+    VerifyOrDie(sBleEventQueue != nullptr);
+}
+
+osMessageQueueId_t GetBleEventQueue()
+{
+    return sBleEventQueue;
+}
+
 void BlePostEvent(BleEvent_t * event)
 {
     sl_status_t status = osMessageQueuePut(sBleEventQueue, event, 0, 0);

src/platform/silabs/rs911x/wfx_sl_ble_init.h

@@ -88,6 +88,7 @@ typedef struct BleEvent_s
 } BleEvent_t;
 
 #define ATT_REC_IN_HOST (0)
+#define WFX_QUEUE_SIZE 10
 
 #define RSI_BT_CTRL_REMOTE_USER_TERMINATED (0x4E13)
 #define RSI_BT_CTRL_REMOTE_DEVICE_TERMINATED_CONNECTION_DUE_TO_LOW_RESOURCES (0x4E14)
@@ -121,8 +122,8 @@ typedef struct BleEvent_s
 #define RSI_BLE_CHARACTERISTIC_TX_GATT_SERVER_CLIENT_HANDLE_LOCATION (5)
 
 // ALL Ble functions
-void BlePostEvent(BleEvent_t * event);
-void BleGetEvent(BleEvent_t event);
+void InitBleEventQueue();
+osMessageQueueId_t GetBleEventQueue();
 void rsi_ble_on_connect_event(rsi_ble_event_conn_status_t * resp_conn);
 void rsi_ble_on_disconnect_event(rsi_ble_event_disconnect_t * resp_disconnect, uint16_t reason);
 void rsi_ble_on_enhance_conn_status_event(rsi_ble_event_enhance_conn_status_t * resp_enh_conn);