Skip to content

Commit d90ac58

Browse files
chengkai15hyson710
authored andcommitted
bluetooth: fix SMP build warning
bug: v/76636 Signed-off-by: Kai Cheng <chengkai@xiaomi.com>
1 parent 080b681 commit d90ac58

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

service/stacks/zephyr/include/sal_zblue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "bt_addr.h"
2020
#include "bt_status.h"
2121

22+
#include <zephyr/bluetooth/addr.h>
2223
#include <zephyr/bluetooth/conn.h>
2324

2425
#define AVDTP_RTP_HEADER_LEN 12
@@ -27,4 +28,3 @@
2728
bt_status_t bt_sal_get_remote_address(struct bt_conn* conn, bt_address_t* addr);
2829

2930
#endif
30-

service/stacks/zephyr/sal_adapter_interface.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,15 +1370,18 @@ bt_status_t bt_sal_create_bond(bt_controller_id_t id, bt_address_t* addr, bt_tra
13701370
#endif
13711371
}
13721372

1373+
#ifdef CONFIG_BLUETOOTH_BREDR_SUPPORT
13731374
static void STACK_CALL(set_security_level)(void* args)
13741375
{
13751376
sal_adapter_req_t* req = args;
13761377

13771378
g_security_level = req->adpt.security_level;
13781379
}
1380+
#endif
13791381

13801382
bt_status_t bt_sal_set_security_level(bt_controller_id_t id, uint8_t level)
13811383
{
1384+
#ifdef CONFIG_BLUETOOTH_BREDR_SUPPORT
13821385
sal_adapter_req_t* req;
13831386

13841387
req = sal_adapter_req(id, NULL, STACK_CALL(set_security_level));
@@ -1390,6 +1393,9 @@ bt_status_t bt_sal_set_security_level(bt_controller_id_t id, uint8_t level)
13901393
req->adpt.security_level = level;
13911394

13921395
return sal_send_req(req);
1396+
#else
1397+
return BT_STATUS_NOT_SUPPORTED;
1398+
#endif
13931399
}
13941400

13951401
#ifdef CONFIG_BLUETOOTH_BREDR_SUPPORT

service/stacks/zephyr/sal_adapter_le_interface.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,10 @@ extern void z_sys_init(void);
7474

7575
static void zblue_on_connected(struct bt_conn* conn, uint8_t err);
7676
static void zblue_on_disconnected(struct bt_conn* conn, uint8_t reason);
77+
#ifdef CONFIG_BT_SMP
7778
static void zblue_on_security_changed(struct bt_conn* conn, bt_security_t level, enum bt_security_err err);
7879
static void zblue_on_pairing_complete_ctkd(struct bt_conn* conn, bool is_link_key);
80+
#endif
7981
static void zblue_on_pairing_complete(struct bt_conn* conn, bool bonded);
8082
static void zblue_on_pairing_failed(struct bt_conn* conn, enum bt_security_err reason);
8183
static void zblue_on_bond_deleted(uint8_t id, const bt_addr_le_t* peer);
@@ -314,6 +316,7 @@ static void zblue_on_disconnected(struct bt_conn* conn, uint8_t reason)
314316
#endif
315317
}
316318

319+
#ifdef CONFIG_BT_SMP
317320
static void zblue_on_security_changed(struct bt_conn* conn, bt_security_t level,
318321
enum bt_security_err err)
319322
{
@@ -354,6 +357,7 @@ static void zblue_on_security_changed(struct bt_conn* conn, bt_security_t level,
354357

355358
adapter_on_encryption_state_changed(&addr, encrypted, BT_TRANSPORT_BLE);
356359
}
360+
#endif
357361

358362
static void zblue_on_param_updated(struct bt_conn* conn, uint16_t interval, uint16_t latency, uint16_t timeout)
359363
{
@@ -460,6 +464,7 @@ static void zblue_on_phy_updated(struct bt_conn* conn, struct bt_conn_le_phy_inf
460464

461465
static void zblue_on_pairing_complete_ctkd(struct bt_conn* conn, bool is_link_key)
462466
{
467+
#ifdef CONFIG_BLUETOOTH_BREDR_SUPPORT
463468
bt_address_t addr;
464469
const bt_addr_t* dst;
465470

@@ -477,6 +482,7 @@ static void zblue_on_pairing_complete_ctkd(struct bt_conn* conn, bool is_link_ke
477482
memcpy(addr.addr, dst->val, sizeof(addr.addr));
478483

479484
adapter_on_bond_state_changed(&addr, BOND_STATE_BONDED, BT_TRANSPORT_BLE, BT_STATUS_SUCCESS, true);
485+
#endif
480486
}
481487

482488
static void zblue_on_pairing_complete(struct bt_conn* conn, bool bonded)
@@ -1178,15 +1184,18 @@ bt_status_t bt_sal_le_create_bond(bt_controller_id_t id, bt_address_t* addr, ble
11781184
#endif
11791185
}
11801186

1187+
#ifdef CONFIG_BT_SMP
11811188
static void STACK_CALL(set_security_level)(void* args)
11821189
{
11831190
sal_adapter_req_t* req = args;
11841191

11851192
g_security_level = req->adpt.security_level;
11861193
}
1194+
#endif
11871195

11881196
bt_status_t bt_sal_le_set_security_level(bt_controller_id_t id, uint8_t level)
11891197
{
1198+
#ifdef CONFIG_BT_SMP
11901199
sal_adapter_req_t* req;
11911200

11921201
req = sal_adapter_req(id, NULL, STACK_CALL(set_security_level));
@@ -1198,15 +1207,18 @@ bt_status_t bt_sal_le_set_security_level(bt_controller_id_t id, uint8_t level)
11981207
req->adpt.security_level = level;
11991208

12001209
return sal_send_req(req);
1210+
#else
1211+
return BT_STATUS_NOT_SUPPORTED;
1212+
#endif
12011213
}
12021214

1215+
#ifdef CONFIG_BT_SMP
12031216
static void zblue_convert_le_addr(bt_address_t* addr, ble_addr_type_t type, bt_addr_le_t* le_addr)
12041217
{
12051218
le_addr->type = zblue_convert_addr_type(type);
12061219
memcpy(le_addr->a.val, addr, sizeof(addr->addr));
12071220
}
12081221

1209-
#ifdef CONFIG_BT_SMP
12101222
static void STACK_CALL(remove_bond)(void* args)
12111223
{
12121224
sal_adapter_req_t* req = args;

0 commit comments

Comments
 (0)