Skip to content

Commit 29803c5

Browse files
JordanYatesJordanYates
committed
bluetooth: update bt_gatt_discover_func_t usage
Update all instances of `bt_gatt_discover_func_t` in the tree. Signed-off-by: Jordan Yates <[email protected]>
1 parent d08a2a5 commit 29803c5

File tree

42 files changed

+123
-168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+123
-168
lines changed

‎samples/bluetooth/central_hr/src/main.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@ static uint8_t notify_func(struct bt_conn *conn,
4848

4949
static uint8_t discover_func(struct bt_conn *conn,
5050
const struct bt_gatt_attr *attr,
51-
struct bt_gatt_discover_params *params)
51+
struct bt_gatt_discover_params *params,
52+
int err)
5253
{
53-
int err;
54-
5554
if (!attr) {
5655
printk("Discover complete\n");
5756
(void)memset(params, 0, sizeof(*params));

‎samples/bluetooth/central_ht/src/main.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@ static uint8_t notify_func(struct bt_conn *conn,
7171

7272
static uint8_t discover_func(struct bt_conn *conn,
7373
const struct bt_gatt_attr *attr,
74-
struct bt_gatt_discover_params *params)
74+
struct bt_gatt_discover_params *params,
75+
int err)
7576
{
76-
int err;
77-
7877
if (!attr) {
7978
printk("Discover complete\n");
8079
(void)memset(params, 0, sizeof(*params));

‎samples/bluetooth/central_otc/src/main.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,8 @@ static bool is_discovery_complete(void)
358358
}
359359

360360
static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *attr,
361-
struct bt_gatt_discover_params *params)
361+
struct bt_gatt_discover_params *params, int err)
362362
{
363-
int err;
364-
365363
if (!attr) {
366364
printk("Discover complete\n");
367365
(void)memset(params, 0, sizeof(*params));

‎samples/bluetooth/encrypted_advertising/central/src/central_ead.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ static int gatt_read(struct bt_conn *conn, const struct bt_uuid *uuid, size_t re
260260
}
261261

262262
static uint8_t gatt_discover_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr,
263-
struct bt_gatt_discover_params *params)
263+
struct bt_gatt_discover_params *params, int err)
264264
{
265265
gatt_disc_err = attr ? 0 : BT_ATT_ERR_ATTRIBUTE_NOT_FOUND;
266266

‎samples/bluetooth/mtu_update/central/src/central_mtu_update.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ static uint8_t notify_func(struct bt_conn *conn,
6161
}
6262

6363
static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *attr,
64-
struct bt_gatt_discover_params *params)
64+
struct bt_gatt_discover_params *params, int err)
6565
{
66-
int err;
67-
6866
if (!attr) {
6967
printk("Discover complete\n");
7068
(void)memset(params, 0, sizeof(*params));

‎samples/bluetooth/periodic_adv_rsp/src/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
190190
}
191191

192192
static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *attr,
193-
struct bt_gatt_discover_params *params)
193+
struct bt_gatt_discover_params *params, int err)
194194
{
195195
struct bt_gatt_chrc *chrc;
196196
char str[BT_UUID_STR_LEN];

‎samples/boards/bbc/microbit/pong/src/ble.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,9 @@ static uint8_t notify_func(struct bt_conn *conn,
169169

170170
static uint8_t discover_func(struct bt_conn *conn,
171171
const struct bt_gatt_attr *attr,
172-
struct bt_gatt_discover_params *param)
172+
struct bt_gatt_discover_params *param,
173+
int err)
173174
{
174-
int err;
175-
176175
if (!attr) {
177176
printk("Discover complete\n");
178177
(void)memset(&discov_param, 0, sizeof(discov_param));

‎subsys/bluetooth/audio/aics_client.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ static bool valid_inst_discovered(struct bt_aics *inst)
551551
}
552552

553553
static uint8_t aics_discover_func(struct bt_conn *conn, const struct bt_gatt_attr *attr,
554-
struct bt_gatt_discover_params *params)
554+
struct bt_gatt_discover_params *params, int err)
555555
{
556556
struct bt_aics_client *client_inst = CONTAINER_OF(params,
557557
struct bt_aics_client,
@@ -566,7 +566,7 @@ static uint8_t aics_discover_func(struct bt_conn *conn, const struct bt_gatt_att
566566
atomic_clear_bit(inst->cli.flags, BT_AICS_CLIENT_FLAG_BUSY);
567567

568568
if (inst->cli.cb && inst->cli.cb->discover) {
569-
int err = valid_inst_discovered(inst) ? 0 : -ENOENT;
569+
err = valid_inst_discovered(inst) ? 0 : -ENOENT;
570570

571571
inst->cli.cb->discover(inst, err);
572572
}
@@ -616,8 +616,6 @@ static uint8_t aics_discover_func(struct bt_conn *conn, const struct bt_gatt_att
616616
}
617617

618618
if (sub_params) {
619-
int err;
620-
621619
sub_params->value = BT_GATT_CCC_NOTIFY;
622620
sub_params->value_handle = chrc->value_handle;
623621
/*

‎subsys/bluetooth/audio/bap_broadcast_assistant.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -656,10 +656,10 @@ static void discover_init(struct bap_broadcast_assistant_instance *inst)
656656
*/
657657
static uint8_t char_discover_func(struct bt_conn *conn,
658658
const struct bt_gatt_attr *attr,
659-
struct bt_gatt_discover_params *params)
659+
struct bt_gatt_discover_params *params,
660+
int err)
660661
{
661662
struct bt_gatt_subscribe_params *sub_params = NULL;
662-
int err;
663663
struct bap_broadcast_assistant_instance *inst = inst_by_conn(conn);
664664

665665
if (inst == NULL) {
@@ -725,9 +725,9 @@ static uint8_t char_discover_func(struct bt_conn *conn,
725725

726726
static uint8_t service_discover_func(struct bt_conn *conn,
727727
const struct bt_gatt_attr *attr,
728-
struct bt_gatt_discover_params *params)
728+
struct bt_gatt_discover_params *params,
729+
int err)
729730
{
730-
int err;
731731
struct bt_gatt_service_val *prim_service;
732732
struct bap_broadcast_assistant_instance *inst = inst_by_conn(conn);
733733

‎subsys/bluetooth/audio/bap_unicast_client.c‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3606,7 +3606,8 @@ int bt_bap_unicast_client_release(struct bt_bap_stream *stream)
36063606

36073607
static uint8_t unicast_client_cp_discover_func(struct bt_conn *conn,
36083608
const struct bt_gatt_attr *attr,
3609-
struct bt_gatt_discover_params *discover)
3609+
struct bt_gatt_discover_params *discover,
3610+
int err)
36103611
{
36113612
struct bt_gatt_chrc *chrc;
36123613
uint16_t value_handle;
@@ -3751,12 +3752,12 @@ static bool any_ases_found(const struct unicast_client *client)
37513752

37523753
static uint8_t unicast_client_ase_discover_cb(struct bt_conn *conn,
37533754
const struct bt_gatt_attr *attr,
3754-
struct bt_gatt_discover_params *discover)
3755+
struct bt_gatt_discover_params *discover,
3756+
int err)
37553757
{
37563758
struct unicast_client *client;
37573759
struct bt_gatt_chrc *chrc;
37583760
uint16_t value_handle;
3759-
int err;
37603761

37613762
client = &uni_cli_insts[bt_conn_index(conn)];
37623763

@@ -3911,13 +3912,13 @@ static int unicast_client_pacs_avail_ctx_read(struct bt_conn *conn, uint16_t han
39113912

39123913
static uint8_t unicast_client_pacs_avail_ctx_discover_cb(struct bt_conn *conn,
39133914
const struct bt_gatt_attr *attr,
3914-
struct bt_gatt_discover_params *discover)
3915+
struct bt_gatt_discover_params *discover,
3916+
int err)
39153917
{
39163918
uint8_t index = bt_conn_index(conn);
39173919
const struct bt_gatt_chrc *chrc;
39183920
uint8_t chrc_properties;
39193921
uint16_t value_handle;
3920-
int err;
39213922

39223923
if (!attr) {
39233924
/* If available_ctx is not found, we terminate the discovery as
@@ -4096,12 +4097,12 @@ static int unicast_client_pacs_location_read(struct bt_conn *conn, uint16_t hand
40964097

40974098
static uint8_t unicast_client_pacs_location_discover_cb(struct bt_conn *conn,
40984099
const struct bt_gatt_attr *attr,
4099-
struct bt_gatt_discover_params *discover)
4100+
struct bt_gatt_discover_params *discover,
4101+
int err)
41004102
{
41014103
uint8_t index = bt_conn_index(conn);
41024104
const struct bt_gatt_chrc *chrc;
41034105
uint16_t value_handle;
4104-
int err;
41054106

41064107
if (!attr) {
41074108
/* If location is not found, we just continue reading the
@@ -4212,12 +4213,12 @@ static uint8_t unicast_client_pacs_context_read_func(struct bt_conn *conn, uint8
42124213

42134214
static uint8_t unicast_client_pacs_context_discover_cb(struct bt_conn *conn,
42144215
const struct bt_gatt_attr *attr,
4215-
struct bt_gatt_discover_params *discover)
4216+
struct bt_gatt_discover_params *discover,
4217+
int err)
42164218
{
42174219
struct unicast_client *client = &uni_cli_insts[bt_conn_index(conn)];
42184220
struct bt_gatt_chrc *chrc;
42194221
uint16_t value_handle;
4220-
int err;
42214222

42224223
if (attr == NULL) {
42234224
LOG_ERR("Unable to find %s PAC context", bt_audio_dir_str(client->dir));
@@ -4404,12 +4405,12 @@ static uint8_t unicast_client_read_func(struct bt_conn *conn, uint8_t err,
44044405

44054406
static uint8_t unicast_client_pac_discover_cb(struct bt_conn *conn,
44064407
const struct bt_gatt_attr *attr,
4407-
struct bt_gatt_discover_params *discover)
4408+
struct bt_gatt_discover_params *discover,
4409+
int err)
44084410
{
44094411
struct unicast_client *client = &uni_cli_insts[bt_conn_index(conn)];
44104412
struct bt_gatt_chrc *chrc;
44114413
uint16_t value_handle;
4412-
int err;
44134414

44144415
if (attr == NULL) {
44154416
LOG_DBG("Unable to find %s PAC", bt_audio_dir_str(client->dir));

0 commit comments

Comments
 (0)