Skip to content

Commit 02226d0

Browse files
Thalleycarlescufi
Thalley
authored and
carlescufi
committed
Bluetooth: Audio: Fix mcc.c conn logging statements
mcc.c does not include `conn_internal.h` so it does not know the `bt_conn` struct, causing logging issues when trying to log a `bt_conn` pointer. Fixed by casting the `conn` pointers to `(void *)`. Signed-off-by: Emil Gydesen <[email protected]>
1 parent 767dd47 commit 02226d0

File tree

1 file changed

+36
-35
lines changed
  • subsys/bluetooth/audio

1 file changed

+36
-35
lines changed

‎subsys/bluetooth/audio/mcc.c‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,8 @@ static uint8_t mcs_notify_handler(struct bt_conn *conn,
935935

936936
mcs_inst = lookup_inst_by_conn(conn);
937937
if (mcs_inst == NULL) {
938-
BT_DBG("Could not find MCS instance from conn %p", conn);
938+
BT_DBG("Could not find MCS instance from conn %p",
939+
(void *)conn);
939940

940941
return BT_GATT_ITER_CONTINUE;
941942
}
@@ -1791,7 +1792,7 @@ int bt_mcc_read_player_name(struct bt_conn *conn)
17911792

17921793
mcs_inst = lookup_inst_by_conn(conn);
17931794
if (mcs_inst == NULL) {
1794-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
1795+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
17951796

17961797
return -EINVAL;
17971798
} else if (mcs_inst->busy) {
@@ -1831,7 +1832,7 @@ int bt_mcc_read_icon_obj_id(struct bt_conn *conn)
18311832

18321833
mcs_inst = lookup_inst_by_conn(conn);
18331834
if (mcs_inst == NULL) {
1834-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
1835+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
18351836

18361837
return -EINVAL;
18371838
} else if (mcs_inst->busy) {
@@ -1870,7 +1871,7 @@ int bt_mcc_read_icon_url(struct bt_conn *conn)
18701871

18711872
mcs_inst = lookup_inst_by_conn(conn);
18721873
if (mcs_inst == NULL) {
1873-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
1874+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
18741875

18751876
return -EINVAL;
18761877
} else if (mcs_inst->busy) {
@@ -1908,7 +1909,7 @@ int bt_mcc_read_track_title(struct bt_conn *conn)
19081909

19091910
mcs_inst = lookup_inst_by_conn(conn);
19101911
if (mcs_inst == NULL) {
1911-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
1912+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
19121913

19131914
return -EINVAL;
19141915
} else if (mcs_inst->busy) {
@@ -1946,7 +1947,7 @@ int bt_mcc_read_track_duration(struct bt_conn *conn)
19461947

19471948
mcs_inst = lookup_inst_by_conn(conn);
19481949
if (mcs_inst == NULL) {
1949-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
1950+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
19501951

19511952
return -EINVAL;
19521953
} else if (mcs_inst->busy) {
@@ -1984,7 +1985,7 @@ int bt_mcc_read_track_position(struct bt_conn *conn)
19841985

19851986
mcs_inst = lookup_inst_by_conn(conn);
19861987
if (mcs_inst == NULL) {
1987-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
1988+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
19881989

19891990
return -EINVAL;
19901991
} else if (mcs_inst->busy) {
@@ -2022,7 +2023,7 @@ int bt_mcc_set_track_position(struct bt_conn *conn, int32_t pos)
20222023

20232024
mcs_inst = lookup_inst_by_conn(conn);
20242025
if (mcs_inst == NULL) {
2025-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2026+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
20262027

20272028
return -EINVAL;
20282029
} else if (mcs_inst->busy) {
@@ -2065,7 +2066,7 @@ int bt_mcc_read_playback_speed(struct bt_conn *conn)
20652066

20662067
mcs_inst = lookup_inst_by_conn(conn);
20672068
if (mcs_inst == NULL) {
2068-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2069+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
20692070

20702071
return -EINVAL;
20712072
} else if (mcs_inst->busy) {
@@ -2103,7 +2104,7 @@ int bt_mcc_set_playback_speed(struct bt_conn *conn, int8_t speed)
21032104

21042105
mcs_inst = lookup_inst_by_conn(conn);
21052106
if (mcs_inst == NULL) {
2106-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2107+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
21072108

21082109
return -EINVAL;
21092110
} else if (mcs_inst->busy) {
@@ -2146,7 +2147,7 @@ int bt_mcc_read_seeking_speed(struct bt_conn *conn)
21462147

21472148
mcs_inst = lookup_inst_by_conn(conn);
21482149
if (mcs_inst == NULL) {
2149-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2150+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
21502151

21512152
return -EINVAL;
21522153
} else if (mcs_inst->busy) {
@@ -2185,7 +2186,7 @@ int bt_mcc_read_segments_obj_id(struct bt_conn *conn)
21852186

21862187
mcs_inst = lookup_inst_by_conn(conn);
21872188
if (mcs_inst == NULL) {
2188-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2189+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
21892190

21902191
return -EINVAL;
21912192
} else if (mcs_inst->busy) {
@@ -2223,7 +2224,7 @@ int bt_mcc_read_current_track_obj_id(struct bt_conn *conn)
22232224

22242225
mcs_inst = lookup_inst_by_conn(conn);
22252226
if (mcs_inst == NULL) {
2226-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2227+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
22272228

22282229
return -EINVAL;
22292230
} else if (mcs_inst->busy) {
@@ -2266,7 +2267,7 @@ int bt_mcc_set_current_track_obj_id(struct bt_conn *conn, uint64_t obj_id)
22662267

22672268
mcs_inst = lookup_inst_by_conn(conn);
22682269
if (mcs_inst == NULL) {
2269-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2270+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
22702271

22712272
return -EINVAL;
22722273
} else if (mcs_inst->busy) {
@@ -2308,7 +2309,7 @@ int bt_mcc_read_next_track_obj_id(struct bt_conn *conn)
23082309

23092310
mcs_inst = lookup_inst_by_conn(conn);
23102311
if (mcs_inst == NULL) {
2311-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2312+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
23122313

23132314
return -EINVAL;
23142315
} else if (mcs_inst->busy) {
@@ -2351,7 +2352,7 @@ int bt_mcc_set_next_track_obj_id(struct bt_conn *conn, uint64_t obj_id)
23512352

23522353
mcs_inst = lookup_inst_by_conn(conn);
23532354
if (mcs_inst == NULL) {
2354-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2355+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
23552356

23562357
return -EINVAL;
23572358
} else if (mcs_inst->busy) {
@@ -2393,7 +2394,7 @@ int bt_mcc_read_parent_group_obj_id(struct bt_conn *conn)
23932394

23942395
mcs_inst = lookup_inst_by_conn(conn);
23952396
if (mcs_inst == NULL) {
2396-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2397+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
23972398

23982399
return -EINVAL;
23992400
} else if (mcs_inst->busy) {
@@ -2431,7 +2432,7 @@ int bt_mcc_read_current_group_obj_id(struct bt_conn *conn)
24312432

24322433
mcs_inst = lookup_inst_by_conn(conn);
24332434
if (mcs_inst == NULL) {
2434-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2435+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
24352436

24362437
return -EINVAL;
24372438
} else if (mcs_inst->busy) {
@@ -2474,7 +2475,7 @@ int bt_mcc_set_current_group_obj_id(struct bt_conn *conn, uint64_t obj_id)
24742475

24752476
mcs_inst = lookup_inst_by_conn(conn);
24762477
if (mcs_inst == NULL) {
2477-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2478+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
24782479

24792480
return -EINVAL;
24802481
} else if (mcs_inst->busy) {
@@ -2517,7 +2518,7 @@ int bt_mcc_read_playing_order(struct bt_conn *conn)
25172518

25182519
mcs_inst = lookup_inst_by_conn(conn);
25192520
if (mcs_inst == NULL) {
2520-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2521+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
25212522

25222523
return -EINVAL;
25232524
} else if (mcs_inst->busy) {
@@ -2555,7 +2556,7 @@ int bt_mcc_set_playing_order(struct bt_conn *conn, uint8_t order)
25552556

25562557
mcs_inst = lookup_inst_by_conn(conn);
25572558
if (mcs_inst == NULL) {
2558-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2559+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
25592560

25602561
return -EINVAL;
25612562
} else if (mcs_inst->busy) {
@@ -2598,7 +2599,7 @@ int bt_mcc_read_playing_orders_supported(struct bt_conn *conn)
25982599

25992600
mcs_inst = lookup_inst_by_conn(conn);
26002601
if (mcs_inst == NULL) {
2601-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2602+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
26022603

26032604
return -EINVAL;
26042605
} else if (mcs_inst->busy) {
@@ -2636,7 +2637,7 @@ int bt_mcc_read_media_state(struct bt_conn *conn)
26362637

26372638
mcs_inst = lookup_inst_by_conn(conn);
26382639
if (mcs_inst == NULL) {
2639-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2640+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
26402641

26412642
return -EINVAL;
26422643
} else if (mcs_inst->busy) {
@@ -2675,7 +2676,7 @@ int bt_mcc_send_cmd(struct bt_conn *conn, const struct mpl_cmd *cmd)
26752676

26762677
mcs_inst = lookup_inst_by_conn(conn);
26772678
if (mcs_inst == NULL) {
2678-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2679+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
26792680

26802681
return -EINVAL;
26812682
} else if (mcs_inst->busy) {
@@ -2724,7 +2725,7 @@ int bt_mcc_read_opcodes_supported(struct bt_conn *conn)
27242725

27252726
mcs_inst = lookup_inst_by_conn(conn);
27262727
if (mcs_inst == NULL) {
2727-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2728+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
27282729

27292730
return -EINVAL;
27302731
} else if (mcs_inst->busy) {
@@ -2763,7 +2764,7 @@ int bt_mcc_send_search(struct bt_conn *conn, const struct mpl_search *search)
27632764

27642765
mcs_inst = lookup_inst_by_conn(conn);
27652766
if (mcs_inst == NULL) {
2766-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2767+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
27672768

27682769
return -EINVAL;
27692770
} else if (mcs_inst->busy) {
@@ -2806,7 +2807,7 @@ int bt_mcc_read_search_results_obj_id(struct bt_conn *conn)
28062807

28072808
mcs_inst = lookup_inst_by_conn(conn);
28082809
if (mcs_inst == NULL) {
2809-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2810+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
28102811

28112812
return -EINVAL;
28122813
} else if (mcs_inst->busy) {
@@ -2845,7 +2846,7 @@ int bt_mcc_read_content_control_id(struct bt_conn *conn)
28452846

28462847
mcs_inst = lookup_inst_by_conn(conn);
28472848
if (mcs_inst == NULL) {
2848-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
2849+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
28492850

28502851
return -EINVAL;
28512852
} else if (mcs_inst->busy) {
@@ -3234,7 +3235,7 @@ int bt_mcc_otc_read_object_metadata(struct bt_conn *conn)
32343235

32353236
mcs_inst = lookup_inst_by_conn(conn);
32363237
if (mcs_inst == NULL) {
3237-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
3238+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
32383239

32393240
return -EINVAL;
32403241
} else if (mcs_inst->busy) {
@@ -3266,7 +3267,7 @@ int bt_mcc_otc_read_icon_object(struct bt_conn *conn)
32663267

32673268
mcs_inst = lookup_inst_by_conn(conn);
32683269
if (mcs_inst == NULL) {
3269-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
3270+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
32703271

32713272
return -EINVAL;
32723273
} else if (mcs_inst->busy) {
@@ -3298,7 +3299,7 @@ int bt_mcc_otc_read_track_segments_object(struct bt_conn *conn)
32983299

32993300
mcs_inst = lookup_inst_by_conn(conn);
33003301
if (mcs_inst == NULL) {
3301-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
3302+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
33023303

33033304
return -EINVAL;
33043305
} else if (mcs_inst->busy) {
@@ -3331,7 +3332,7 @@ int bt_mcc_otc_read_current_track_object(struct bt_conn *conn)
33313332

33323333
mcs_inst = lookup_inst_by_conn(conn);
33333334
if (mcs_inst == NULL) {
3334-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
3335+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
33353336

33363337
return -EINVAL;
33373338
} else if (mcs_inst->busy) {
@@ -3364,7 +3365,7 @@ int bt_mcc_otc_read_next_track_object(struct bt_conn *conn)
33643365

33653366
mcs_inst = lookup_inst_by_conn(conn);
33663367
if (mcs_inst == NULL) {
3367-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
3368+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
33683369

33693370
return -EINVAL;
33703371
} else if (mcs_inst->busy) {
@@ -3397,7 +3398,7 @@ int bt_mcc_otc_read_parent_group_object(struct bt_conn *conn)
33973398

33983399
mcs_inst = lookup_inst_by_conn(conn);
33993400
if (mcs_inst == NULL) {
3400-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
3401+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
34013402

34023403
return -EINVAL;
34033404
} else if (mcs_inst->busy) {
@@ -3432,7 +3433,7 @@ int bt_mcc_otc_read_current_group_object(struct bt_conn *conn)
34323433

34333434
mcs_inst = lookup_inst_by_conn(conn);
34343435
if (mcs_inst == NULL) {
3435-
BT_DBG("Could not lookup mcs_inst from conn %p", conn);
3436+
BT_DBG("Could not lookup mcs_inst from conn %p", (void *)conn);
34363437

34373438
return -EINVAL;
34383439
} else if (mcs_inst->busy) {

0 commit comments

Comments
 (0)