Skip to content

Commit 3d4e357

Browse files
chirag-silabschirag-silabs
committed
restyling the PR
1 parent 05f1504 commit 3d4e357

File tree

3 files changed

+32
-29
lines changed

3 files changed

+32
-29
lines changed

‎src/platform/silabs/rs911x/BLEManagerImpl.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,14 @@ void BLEManagerImpl::sl_ble_init()
210210
randomAddrBLE[(RSI_BLE_ADDR_LENGTH - 1)] |= 0xC0;
211211

212212
// registering the GAP callback functions
213-
rsi_ble_gap_register_callbacks(NULL, NULL, SilabsBleWrapper::rsi_ble_on_disconnect_event, NULL, NULL, NULL, SilabsBleWrapper::rsi_ble_on_enhance_conn_status_event,
214-
NULL, NULL, NULL);
213+
rsi_ble_gap_register_callbacks(NULL, NULL, SilabsBleWrapper::rsi_ble_on_disconnect_event, NULL, NULL, NULL,
214+
SilabsBleWrapper::rsi_ble_on_enhance_conn_status_event, NULL, NULL, NULL);
215215

216216
// registering the GATT call back functions
217-
rsi_ble_gatt_register_callbacks(NULL, NULL, NULL, NULL, NULL, NULL, NULL, SilabsBleWrapper::rsi_ble_on_gatt_write_event, NULL, NULL,
218-
SilabsBleWrapper::rsi_ble_on_read_req_event, SilabsBleWrapper::rsi_ble_on_mtu_event, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
219-
NULL, SilabsBleWrapper::rsi_ble_on_event_indication_confirmation, NULL);
217+
rsi_ble_gatt_register_callbacks(NULL, NULL, NULL, NULL, NULL, NULL, NULL, SilabsBleWrapper::rsi_ble_on_gatt_write_event, NULL,
218+
NULL, SilabsBleWrapper::rsi_ble_on_read_req_event, SilabsBleWrapper::rsi_ble_on_mtu_event, NULL,
219+
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
220+
SilabsBleWrapper::rsi_ble_on_event_indication_confirmation, NULL);
220221

221222
// Exchange of GATT info with BLE stack
222223
SilabsBleWrapper::rsi_ble_add_matter_service();

‎src/platform/silabs/rs911x/wfx_sl_ble_init.cpp

+9-7
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
* See the License for the specific language governing permissions and
2121
* limitations under the License.
2222
*/
23+
#include "wfx_sl_ble_init.h"
2324
#include <lib/support/logging/CHIPLogging.h>
2425
#include <platform/CHIPDeviceLayer.h>
2526
#include <platform/silabs/BLEManagerImpl.h>
26-
#include "wfx_sl_ble_init.h"
2727

2828
using namespace chip::DeviceLayer::Internal;
2929

@@ -108,7 +108,8 @@ void SilabsBleWrapper::rsi_ble_on_disconnect_event(rsi_ble_event_disconnect_t *
108108
* @return none
109109
* @section description
110110
*/
111-
void SilabsBleWrapper::rsi_ble_on_event_indication_confirmation(uint16_t resp_status, rsi_ble_set_att_resp_t * rsi_ble_event_set_att_rsp)
111+
void SilabsBleWrapper::rsi_ble_on_event_indication_confirmation(uint16_t resp_status,
112+
rsi_ble_set_att_resp_t * rsi_ble_event_set_att_rsp)
112113
{
113114
bleEvent.eventType = BleEventType_e::RSI_BLE_GATT_INDICATION_CONFIRMATION;
114115
bleEvent.eventData->resp_status = resp_status;
@@ -147,8 +148,8 @@ void SilabsBleWrapper::rsi_ble_on_read_req_event(uint16_t event_id, rsi_ble_read
147148
* @section description
148149
* This function is used to store all attribute records
149150
*/
150-
void SilabsBleWrapper::rsi_gatt_add_attribute_to_list(rsi_ble_t * p_val, uint16_t handle, uint16_t data_len, uint8_t * data, uuid_t uuid,
151-
uint8_t char_prop)
151+
void SilabsBleWrapper::rsi_gatt_add_attribute_to_list(rsi_ble_t * p_val, uint16_t handle, uint16_t data_len, uint8_t * data,
152+
uuid_t uuid, uint8_t char_prop)
152153
{
153154
if ((p_val->DATA_ix + data_len) >= BLE_ATT_REC_SIZE)
154155
{ //! Check for max data length for the characteristic value
@@ -181,7 +182,8 @@ void SilabsBleWrapper::rsi_gatt_add_attribute_to_list(rsi_ble_t * p_val, uint16_
181182
* @section description
182183
* This function is used at application to add characteristic attribute
183184
*/
184-
void SilabsBleWrapper::rsi_ble_add_char_serv_att(void * serv_handler, uint16_t handle, uint8_t val_prop, uint16_t att_val_handle, uuid_t att_val_uuid)
185+
void SilabsBleWrapper::rsi_ble_add_char_serv_att(void * serv_handler, uint16_t handle, uint8_t val_prop, uint16_t att_val_handle,
186+
uuid_t att_val_uuid)
185187
{
186188
rsi_ble_req_add_att_t new_att = { 0 };
187189

@@ -229,8 +231,8 @@ void SilabsBleWrapper::rsi_ble_add_char_serv_att(void * serv_handler, uint16_t h
229231
* This function is used at application to create new service.
230232
*/
231233

232-
void SilabsBleWrapper::rsi_ble_add_char_val_att(void * serv_handler, uint16_t handle, uuid_t att_type_uuid, uint8_t val_prop, uint8_t * data,
233-
uint8_t data_len, uint8_t auth_read)
234+
void SilabsBleWrapper::rsi_ble_add_char_val_att(void * serv_handler, uint16_t handle, uuid_t att_type_uuid, uint8_t val_prop,
235+
uint8_t * data, uint8_t data_len, uint8_t auth_read)
234236
{
235237
rsi_ble_req_add_att_t new_att = { 0 };
236238
rsi_ble_t att_list;

‎src/platform/silabs/rs911x/wfx_sl_ble_init.h

+17-17
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ namespace chip {
8484
namespace DeviceLayer {
8585
namespace Internal {
8686

87-
class SilabsBleWrapper {
87+
class SilabsBleWrapper
88+
{
8889
public:
8990
typedef enum BleEventType
9091
{
@@ -121,22 +122,21 @@ class SilabsBleWrapper {
121122
sl_wfx_msg_t * eventData;
122123
} BleEvent_t;
123124

124-
// ALL Ble functions
125-
static void rsi_ble_on_connect_event(rsi_ble_event_conn_status_t * resp_conn);
126-
static void rsi_ble_on_disconnect_event(rsi_ble_event_disconnect_t * resp_disconnect, uint16_t reason);
127-
static void rsi_ble_on_enhance_conn_status_event(rsi_ble_event_enhance_conn_status_t * resp_enh_conn);
128-
static void rsi_ble_on_gatt_write_event(uint16_t event_id, rsi_ble_event_write_t * rsi_ble_write);
129-
static void rsi_ble_on_mtu_event(rsi_ble_event_mtu_t * rsi_ble_mtu);
130-
static void rsi_ble_on_event_indication_confirmation(uint16_t resp_status, rsi_ble_set_att_resp_t * rsi_ble_event_set_att_rsp);
131-
static void rsi_ble_on_read_req_event(uint16_t event_id, rsi_ble_read_req_t * rsi_ble_read_req);
132-
static void rsi_gatt_add_attribute_to_list(rsi_ble_t * p_val, uint16_t handle, uint16_t data_len, uint8_t * data, uuid_t uuid,
133-
uint8_t char_prop);
134-
static void rsi_ble_add_char_serv_att(void * serv_handler, uint16_t handle, uint8_t val_prop, uint16_t att_val_handle,
135-
uuid_t att_val_uuid);
136-
static void rsi_ble_add_char_val_att(void * serv_handler, uint16_t handle, uuid_t att_type_uuid, uint8_t val_prop, uint8_t * data,
137-
uint8_t data_len, uint8_t auth_read);
138-
static uint32_t rsi_ble_add_matter_service(void);
139-
125+
// ALL Ble functions
126+
static void rsi_ble_on_connect_event(rsi_ble_event_conn_status_t * resp_conn);
127+
static void rsi_ble_on_disconnect_event(rsi_ble_event_disconnect_t * resp_disconnect, uint16_t reason);
128+
static void rsi_ble_on_enhance_conn_status_event(rsi_ble_event_enhance_conn_status_t * resp_enh_conn);
129+
static void rsi_ble_on_gatt_write_event(uint16_t event_id, rsi_ble_event_write_t * rsi_ble_write);
130+
static void rsi_ble_on_mtu_event(rsi_ble_event_mtu_t * rsi_ble_mtu);
131+
static void rsi_ble_on_event_indication_confirmation(uint16_t resp_status, rsi_ble_set_att_resp_t * rsi_ble_event_set_att_rsp);
132+
static void rsi_ble_on_read_req_event(uint16_t event_id, rsi_ble_read_req_t * rsi_ble_read_req);
133+
static void rsi_gatt_add_attribute_to_list(rsi_ble_t * p_val, uint16_t handle, uint16_t data_len, uint8_t * data, uuid_t uuid,
134+
uint8_t char_prop);
135+
static void rsi_ble_add_char_serv_att(void * serv_handler, uint16_t handle, uint8_t val_prop, uint16_t att_val_handle,
136+
uuid_t att_val_uuid);
137+
static void rsi_ble_add_char_val_att(void * serv_handler, uint16_t handle, uuid_t att_type_uuid, uint8_t val_prop,
138+
uint8_t * data, uint8_t data_len, uint8_t auth_read);
139+
static uint32_t rsi_ble_add_matter_service(void);
140140
};
141141

142142
} // namespace Internal

0 commit comments

Comments
 (0)