Skip to content

Commit bf4739e

Browse files
sgbihusgbihu
committed
Fix Jira 673 BLE Api should pass arguments that are typedef
1 parent 2762ab4 commit bf4739e

27 files changed

+232
-217
lines changed

‎libraries/CurieBLE/examples/LEDCentral/LEDCentral.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ bool adv_found(uint8_t type,
131131
Serial.println("AD malformed");
132132
return true;
133133
}
134-
struct bt_uuid * serviceuuid = ledService.uuid();
134+
bt_uuid_t * serviceuuid = ledService.uuid();
135135
for (i = 0; i < data_len; i += MAX_UUID_SIZE)
136136
{
137-
if (memcmp (((struct bt_uuid_128*)serviceuuid)->val, &data[i], MAX_UUID_SIZE) != 0)
137+
if (memcmp (((bt_uuid_128_t*)serviceuuid)->val, &data[i], MAX_UUID_SIZE) != 0)
138138
{
139139
continue;
140140
}

‎libraries/CurieBLE/src/BLEAttribute.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ BLEAttribute::BLEAttribute(const char* uuid, enum BLEAttributeType type) :
5454
{
5555
uint16_t temp = (_uuid.val[1] << 8)| _uuid.val[0];
5656
_uuid.uuid.type = BT_UUID_TYPE_16;
57-
((struct bt_uuid_16*)(&_uuid.uuid))->val = temp;
57+
((bt_uuid_16_t*)(&_uuid.uuid))->val = temp;
5858
}
5959
else
6060
{
@@ -72,9 +72,9 @@ BLEAttribute::uuid_cstr() const {
7272
return _uuid_cstr;
7373
}
7474

75-
struct bt_uuid *BLEAttribute::uuid(void)
75+
bt_uuid_t *BLEAttribute::uuid(void)
7676
{
77-
return (struct bt_uuid *)&_uuid;
77+
return (bt_uuid_t *)&_uuid;
7878
}
7979

8080

‎libraries/CurieBLE/src/BLEAttribute.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,22 @@ class BLEAttribute {
5555
*
5656
* @param none
5757
*
58-
* @return struct bt_uuid* The pointer of UUID
58+
* @return bt_uuid_t* The pointer of UUID
5959
*
6060
* @note none
6161
*/
62-
struct bt_uuid *uuid(void);
62+
bt_uuid_t *uuid(void);
6363

6464
protected:
6565
//friend BLEPeripheral;
6666
friend BLEProfile;
6767

68-
friend ssize_t profile_write_process(struct bt_conn *conn,
69-
const struct bt_gatt_attr *attr,
68+
friend ssize_t profile_write_process(bt_conn_t *conn,
69+
const bt_gatt_attr_t *attr,
7070
const void *buf, uint16_t len,
7171
uint16_t offset);
72-
friend ssize_t profile_read_process(struct bt_conn *conn,
73-
const struct bt_gatt_attr *attr,
72+
friend ssize_t profile_read_process(bt_conn_t *conn,
73+
const bt_gatt_attr_t *attr,
7474
void *buf, uint16_t len,
7575
uint16_t offset);
7676

@@ -82,9 +82,9 @@ class BLEAttribute {
8282

8383
static unsigned char numAttributes(void);
8484
// The below APIs are for central device to discover the
85-
virtual void discover(struct bt_gatt_discover_params *params) = 0;
86-
virtual void discover(const struct bt_gatt_attr *attr,
87-
struct bt_gatt_discover_params *params) = 0;
85+
virtual void discover(bt_gatt_discover_params_t *params) = 0;
86+
virtual void discover(const bt_gatt_attr_t *attr,
87+
bt_gatt_discover_params_t *params) = 0;
8888

8989
/**
9090
* @brief Get attribute's discover state
@@ -103,7 +103,7 @@ class BLEAttribute {
103103
static unsigned char _numAttributes;
104104

105105
const char* _uuid_cstr;
106-
struct bt_uuid_128 _uuid;
106+
bt_uuid_128_t _uuid;
107107

108108
enum BLEAttributeType _type;
109109
uint16_t _handle;

‎libraries/CurieBLE/src/BLECentral.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ bool BLECentral::stopScan()
4040

4141
bool BLECentral::connect(const bt_addr_le_t *addr, const ble_conn_param_t *param)
4242
{
43-
struct bt_le_conn_param conn_param;
43+
bt_le_conn_param_t conn_param;
4444

4545
conn_param.latency = param->latency;
4646
conn_param.interval_max = (uint16_t)MSEC_TO_UNITS(param->interval_max, UNIT_1_25_MS);
@@ -73,7 +73,7 @@ void BLECentral::setAdvertiseHandler(ble_advertise_handle_cb_t advcb)
7373

7474
void BLECentral::setScanParam(float interval, float window)
7575
{
76-
struct bt_le_scan_param scan_param;
76+
bt_le_scan_param_t scan_param;
7777
scan_param.type = BT_HCI_LE_SCAN_ACTIVE;
7878
scan_param.filter_dup = BT_HCI_LE_SCAN_FILTER_DUP_ENABLE;
7979
scan_param.interval = (uint16_t)((interval * 8) / 5);
@@ -96,8 +96,8 @@ bool BLECentral::begin(void)
9696
}
9797

9898
// Start scan
99-
const struct bt_le_scan_param *scan_param = BLECentralRole::instance()->getScanParam();
100-
struct bt_le_scan_param zero_param;
99+
const bt_le_scan_param_t *scan_param = BLECentralRole::instance()->getScanParam();
100+
bt_le_scan_param_t zero_param;
101101
memset(&zero_param, 0x00, sizeof (zero_param));
102102
if (0 == memcmp(&zero_param, scan_param, sizeof (zero_param)))
103103
{

‎libraries/CurieBLE/src/BLECentralRole.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const BLECentralHelper *BLECentralRole::central(void) const
7575
return &_central;
7676
}
7777

78-
bool BLECentralRole::connect(const bt_addr_le_t *addr, const struct bt_le_conn_param *param)
78+
bool BLECentralRole::connect(const bt_addr_le_t *addr, const bt_le_conn_param_t *param)
7979
{
8080
BLEPeripheralHelper* temp = NULL;
8181
BLEPeripheralHelper* unused = NULL;
@@ -108,7 +108,7 @@ bool BLECentralRole::connect(const bt_addr_le_t *addr, const struct bt_le_conn_p
108108
if (!link_existed)
109109
{
110110
// Send connect request
111-
struct bt_conn* conn = bt_conn_create_le(addr, param);
111+
bt_conn_t* conn = bt_conn_create_le(addr, param);
112112
if (NULL != conn)
113113
{
114114
unused->setAddress(*addr);
@@ -130,18 +130,18 @@ bool BLECentralRole::startScan()
130130
return true;
131131
}
132132

133-
bool BLECentralRole::startScan(const struct bt_le_scan_param &scan_param)
133+
bool BLECentralRole::startScan(const bt_le_scan_param_t &scan_param)
134134
{
135135
setScanParam(scan_param);
136136
return startScan();
137137
}
138138

139-
void BLECentralRole::setScanParam(const struct bt_le_scan_param &scan_param)
139+
void BLECentralRole::setScanParam(const bt_le_scan_param_t &scan_param)
140140
{
141141
memcpy(&_scan_param, &scan_param, sizeof (_scan_param));
142142
}
143143

144-
const struct bt_le_scan_param* BLECentralRole::getScanParam()
144+
const bt_le_scan_param_t* BLECentralRole::getScanParam()
145145
{
146146
return &_scan_param;
147147
}
@@ -158,7 +158,7 @@ bool BLECentralRole::stopScan()
158158
return true;
159159
}
160160

161-
BLEPeripheralHelper* BLECentralRole::peripheral(struct bt_conn *conn)
161+
BLEPeripheralHelper* BLECentralRole::peripheral(bt_conn_t *conn)
162162
{
163163
BLEPeripheralHelper* temp = NULL;
164164
const bt_addr_le_t *addr = bt_conn_get_dst(conn);
@@ -219,7 +219,7 @@ void BLECentralRole::handleDeviceFound(const bt_addr_le_t *addr,
219219
}
220220
}
221221

222-
void BLECentralRole::handleConnectEvent(struct bt_conn *conn, uint8_t err)
222+
void BLECentralRole::handleConnectEvent(bt_conn_t *conn, uint8_t err)
223223
{
224224
if (_event_handlers[BLEConnected])
225225
{
@@ -228,7 +228,7 @@ void BLECentralRole::handleConnectEvent(struct bt_conn *conn, uint8_t err)
228228
}
229229
}
230230

231-
void BLECentralRole::handleDisconnectEvent(struct bt_conn *conn, uint8_t reason)
231+
void BLECentralRole::handleDisconnectEvent(bt_conn_t *conn, uint8_t reason)
232232
{
233233
if (_event_handlers[BLEDisconnected])
234234
{
@@ -238,7 +238,7 @@ void BLECentralRole::handleDisconnectEvent(struct bt_conn *conn, uint8_t reason)
238238
}
239239
}
240240

241-
void BLECentralRole::handleParamUpdated(struct bt_conn *conn,
241+
void BLECentralRole::handleParamUpdated(bt_conn_t *conn,
242242
uint16_t interval,
243243
uint16_t latency,
244244
uint16_t timeout)

‎libraries/CurieBLE/src/BLECentralRole.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class BLECentralRole: public BLERoleBase {
4646
*
4747
* @note none
4848
*/
49-
bool startScan(const struct bt_le_scan_param &scan_param);
49+
bool startScan(const bt_le_scan_param_t &scan_param);
5050

5151
/**
5252
* @brief Stop scan
@@ -70,7 +70,7 @@ class BLECentralRole: public BLERoleBase {
7070
*
7171
* @note none
7272
*/
73-
bool connect(const bt_addr_le_t *addr, const struct bt_le_conn_param *param);
73+
bool connect(const bt_addr_le_t *addr, const bt_le_conn_param_t *param);
7474

7575
/**
7676
* @brief Set the scan parameter
@@ -81,18 +81,18 @@ class BLECentralRole: public BLERoleBase {
8181
*
8282
* @note none
8383
*/
84-
void setScanParam(const struct bt_le_scan_param &scan_param);
84+
void setScanParam(const bt_le_scan_param_t &scan_param);
8585

8686
/**
8787
* @brief Get the scan parameter
8888
*
8989
* @param none
9090
*
91-
* @return const struct bt_le_scan_param* The scan parameter that current used
91+
* @return const bt_le_scan_param_t* The scan parameter that current used
9292
*
9393
* @note none
9494
*/
95-
const struct bt_le_scan_param* getScanParam();
95+
const bt_le_scan_param_t* getScanParam();
9696

9797
/**
9898
* @brief Discover the peripheral device profile
@@ -144,7 +144,7 @@ class BLECentralRole: public BLERoleBase {
144144
*
145145
* @note none
146146
*/
147-
BLEPeripheralHelper* peripheral(struct bt_conn *conn);
147+
BLEPeripheralHelper* peripheral(bt_conn_t *conn);
148148

149149
/**
150150
* @brief Get BLE central helper that for APP use
@@ -205,7 +205,7 @@ class BLECentralRole: public BLERoleBase {
205205
*
206206
* @note none
207207
*/
208-
void handleConnectEvent(struct bt_conn *conn, uint8_t err);
208+
void handleConnectEvent(bt_conn_t *conn, uint8_t err);
209209

210210
/**
211211
* @brief Handle the disconnected event
@@ -218,7 +218,7 @@ class BLECentralRole: public BLERoleBase {
218218
*
219219
* @note none
220220
*/
221-
void handleDisconnectEvent(struct bt_conn *conn, uint8_t reason);
221+
void handleDisconnectEvent(bt_conn_t *conn, uint8_t reason);
222222

223223
/**
224224
* @brief Handle the conntion update request
@@ -235,7 +235,7 @@ class BLECentralRole: public BLERoleBase {
235235
*
236236
* @note none
237237
*/
238-
void handleParamUpdated(struct bt_conn *conn,
238+
void handleParamUpdated(bt_conn_t *conn,
239239
uint16_t interval,
240240
uint16_t latency,
241241
uint16_t timeout);
@@ -266,7 +266,7 @@ class BLECentralRole: public BLERoleBase {
266266
~BLECentralRole();
267267
BLEPeripheralHelper* _peripherial[BLE_MAX_CONN_CFG];
268268
BLECentralHelper _central;
269-
struct bt_le_scan_param _scan_param;
269+
bt_le_scan_param_t _scan_param;
270270

271271
static BLECentralRole* _ble_central_ins;
272272
ble_advertise_handle_cb_t _adv_event_handle;

‎libraries/CurieBLE/src/BLECharacteristic.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
#include "BLEPeripheralHelper.h"
2222
#include "internal/ble_client.h"
2323

24-
uint8_t profile_notify_process (struct bt_conn *conn,
25-
struct bt_gatt_subscribe_params *params,
26-
const void *data, uint16_t length);
27-
uint8_t profile_read_rsp_process(struct bt_conn *conn, int err,
28-
struct bt_gatt_read_params *params,
24+
uint8_t profile_notify_process (bt_conn_t *conn,
25+
bt_gatt_subscribe_params_t *params,
26+
const void *data, uint16_t length);
27+
uint8_t profile_read_rsp_process(bt_conn_t *conn, int err,
28+
bt_gatt_read_params_t *params,
2929
const void *data,
3030
uint16_t length);
3131

3232
unsigned char BLECharacteristic::_numNotifyAttributes = 0;
3333

34-
struct bt_uuid_16 BLECharacteristic::_gatt_chrc_uuid = {BT_UUID_TYPE_16, BT_UUID_GATT_CHRC_VAL};
35-
struct bt_uuid_16 BLECharacteristic::_gatt_ccc_uuid = {BT_UUID_TYPE_16, BT_UUID_GATT_CCC_VAL};
34+
bt_uuid_16_t BLECharacteristic::_gatt_chrc_uuid = {BT_UUID_TYPE_16, BT_UUID_GATT_CHRC_VAL};
35+
bt_uuid_16_t BLECharacteristic::_gatt_ccc_uuid = {BT_UUID_TYPE_16, BT_UUID_GATT_CCC_VAL};
3636

3737
BLECharacteristic::BLECharacteristic(const char* uuid,
3838
const unsigned char properties,
@@ -246,12 +246,12 @@ BLECharacteristic::numNotifyAttributes(void) {
246246
return _numNotifyAttributes;
247247
}
248248

249-
struct _bt_gatt_ccc* BLECharacteristic::getCccCfg(void)
249+
_bt_gatt_ccc_t* BLECharacteristic::getCccCfg(void)
250250
{
251251
return &_ccc_value;
252252
}
253253

254-
struct bt_gatt_chrc* BLECharacteristic::getCharacteristicAttValue(void)
254+
bt_gatt_chrc_t* BLECharacteristic::getCharacteristicAttValue(void)
255255
{
256256
return &_gatt_chrc;
257257
}
@@ -270,32 +270,32 @@ uint8_t BLECharacteristic::getPermission(void)
270270
return perm;
271271
}
272272

273-
struct bt_uuid* BLECharacteristic::getCharacteristicAttributeUuid(void)
273+
bt_uuid_t* BLECharacteristic::getCharacteristicAttributeUuid(void)
274274
{
275-
return (struct bt_uuid*) &_gatt_chrc_uuid;
275+
return (bt_uuid_t*) &_gatt_chrc_uuid;
276276
}
277-
struct bt_uuid* BLECharacteristic::getClientCharacteristicConfigUuid(void)
277+
bt_uuid_t* BLECharacteristic::getClientCharacteristicConfigUuid(void)
278278
{
279-
return (struct bt_uuid*) &_gatt_ccc_uuid;
279+
return (bt_uuid_t*) &_gatt_ccc_uuid;
280280
}
281281

282282

283-
void BLECharacteristic::addCharacteristicDeclaration(struct bt_gatt_attr *gatt_attr)
283+
void BLECharacteristic::addCharacteristicDeclaration(bt_gatt_attr_t *gatt_attr)
284284
{
285285
_attr_chrc_declaration = gatt_attr;
286286
}
287287

288-
void BLECharacteristic::addCharacteristicValue(struct bt_gatt_attr *gatt_attr)
288+
void BLECharacteristic::addCharacteristicValue(bt_gatt_attr_t *gatt_attr)
289289
{
290290
_attr_chrc_value = gatt_attr;
291291
}
292292

293-
void BLECharacteristic::addCharacteristicConfigDescriptor(struct bt_gatt_attr *gatt_attr)
293+
void BLECharacteristic::addCharacteristicConfigDescriptor(bt_gatt_attr_t *gatt_attr)
294294
{
295295
_attr_cccd = gatt_attr;
296296
}
297297

298-
void BLECharacteristic::discover(struct bt_gatt_discover_params *params)
298+
void BLECharacteristic::discover(bt_gatt_discover_params_t *params)
299299
{
300300
params->type = BT_GATT_DISCOVER_CHARACTERISTIC;
301301
params->uuid = this->uuid();
@@ -306,8 +306,8 @@ void BLECharacteristic::discover(struct bt_gatt_discover_params *params)
306306
}
307307

308308

309-
void BLECharacteristic::discover(const struct bt_gatt_attr *attr,
310-
struct bt_gatt_discover_params *params)
309+
void BLECharacteristic::discover(const bt_gatt_attr_t *attr,
310+
bt_gatt_discover_params_t *params)
311311
{
312312
if (!attr)
313313
{
@@ -340,15 +340,15 @@ void BLECharacteristic::discover(const struct bt_gatt_attr *attr,
340340
}
341341
}
342342

343-
struct bt_gatt_subscribe_params *BLECharacteristic::getSubscribeParams()
343+
bt_gatt_subscribe_params_t *BLECharacteristic::getSubscribeParams()
344344
{
345345
return &_sub_params;
346346
}
347347

348348
bool BLECharacteristic::read(BLEPeripheralHelper &peripheral)
349349
{
350350
int retval = 0;
351-
struct bt_conn* conn = NULL;
351+
bt_conn_t* conn = NULL;
352352
if (_reading)
353353
{
354354
// Already in reading state
@@ -387,7 +387,7 @@ bool BLECharacteristic::write(BLEPeripheralHelper &peripheral,
387387
uint16_t length)
388388
{
389389
int retval = 0;
390-
struct bt_conn* conn = NULL;
390+
bt_conn_t* conn = NULL;
391391

392392
conn = bt_conn_lookup_addr_le(peripheral.bt_le_address());
393393
if (NULL == conn)

0 commit comments

Comments
 (0)