patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Bluetooth: Mesh: Add _srv suffix for pb_gatt_srv

Browse source 
Add `_srv` suffix for pb_gatt_srv.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
This commit is contained in:
Lingao Meng 2022-02-08 16:44:31 +08:00 committed by Marti Bolivar
parent 2ead5725b1
commit 3e4cf9b693
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/mesh/adv.c
View file

@ -221,7 +221,7 @@ int bt_mesh_adv_gatt_send(void)
}
} else if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) {
BT_DBG("PB-GATT Advertising");
return bt_mesh_pb_gatt_adv_start();
return bt_mesh_pb_gatt_srv_adv_start();
}
return -ENOTSUP;

2
subsys/bluetooth/mesh/main.c
View file

@ -382,7 +382,7 @@ int bt_mesh_start(void)
if (!IS_ENABLED(CONFIG_BT_MESH_PROV) || !bt_mesh_prov_active() ||
bt_mesh_prov_link.bearer->type == BT_MESH_PROV_ADV) {
if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) {
(void)bt_mesh_pb_gatt_disable();
(void)bt_mesh_pb_gatt_srv_disable();
}
if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) {

2
subsys/bluetooth/mesh/pb_gatt.c
View file

@ -188,7 +188,7 @@ static int link_accept(const struct prov_bearer_cb *cb, void *cb_data)
return err;
}
(void)bt_mesh_pb_gatt_enable();
(void)bt_mesh_pb_gatt_srv_enable();
bt_mesh_adv_gatt_update();
link.cb = cb;

8
subsys/bluetooth/mesh/pb_gatt_srv.c
View file

@ -124,7 +124,7 @@ static void gatt_disconnected(struct bt_conn *conn, uint8_t reason)
bt_mesh_pb_gatt_close(conn);
if (bt_mesh_is_provisioned()) {
(void)bt_mesh_pb_gatt_disable();
(void)bt_mesh_pb_gatt_srv_disable();
}
}
@ -174,7 +174,7 @@ static struct bt_gatt_attr prov_attrs[] = {
static struct bt_gatt_service prov_svc = BT_GATT_SERVICE(prov_attrs);
int bt_mesh_pb_gatt_enable(void)
int bt_mesh_pb_gatt_srv_enable(void)
{
BT_DBG("");
@ -193,7 +193,7 @@ int bt_mesh_pb_gatt_enable(void)
return 0;
}
int bt_mesh_pb_gatt_disable(void)
int bt_mesh_pb_gatt_srv_disable(void)
{
BT_DBG("");
@ -263,7 +263,7 @@ static int gatt_send(struct bt_conn *conn,
return bt_gatt_notify_cb(conn, &params);
}
int bt_mesh_pb_gatt_adv_start(void)
int bt_mesh_pb_gatt_srv_adv_start(void)
{
BT_DBG("");

6
subsys/bluetooth/mesh/pb_gatt_srv.h
View file

@ -10,9 +10,9 @@
#include <bluetooth/gatt.h>
int bt_mesh_pb_gatt_enable(void);
int bt_mesh_pb_gatt_disable(void);
int bt_mesh_pb_gatt_srv_enable(void);
int bt_mesh_pb_gatt_srv_disable(void);
int bt_mesh_pb_gatt_adv_start(void);
int bt_mesh_pb_gatt_srv_adv_start(void);
#endif /* ZEPHYR_SUBSYS_BLUETOOTH_MESH_PB_GATT_SRV_H_ */

2
subsys/bluetooth/mesh/prov_device.c
View file

@ -650,7 +650,7 @@ int bt_mesh_prov_disable(bt_mesh_prov_bearer_t bearers)
if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) &&
(bearers & BT_MESH_PROV_GATT)) {
(void)bt_mesh_pb_gatt_disable();
(void)bt_mesh_pb_gatt_srv_disable();
}
return 0;

2
subsys/bluetooth/mesh/settings.c
View file

@ -73,7 +73,7 @@ static int mesh_commit(void)
}
if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) {
(void)bt_mesh_pb_gatt_disable();
(void)bt_mesh_pb_gatt_srv_disable();
}
bt_mesh_net_settings_commit();