michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: mesh: gatt: Move generic GATT related defines to gatt.h

Browse source 
This moves GATT releated defines that are used by both Mesh Proxy
Service and Mesh Provisioning Service implementations to a common
header file.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
This commit is contained in:
Pavel Vasilyev 2024-11-27 11:14:35 +01:00 • committed by Anas Nashif
commit 684c94e469
4 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
subsys/bluetooth/mesh/gatt.h Normal file
View file

@ -0,0 +1,19 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
#define ADV_SLOW_INT \
.interval_min = BT_GAP_ADV_SLOW_INT_MIN, \
.interval_max = BT_GAP_ADV_SLOW_INT_MAX
#define ADV_FAST_INT \
.interval_min = BT_GAP_ADV_FAST_INT_MIN_2, \
.interval_max = BT_GAP_ADV_FAST_INT_MAX_2
#define BT_DEVICE_NAME (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? \
(const uint8_t *)bt_get_name() : \
(const uint8_t *)CONFIG_BT_DEVICE_NAME)
#define BT_DEVICE_NAME_LEN (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? strlen(bt_get_name()) : \
(sizeof(CONFIG_BT_DEVICE_NAME) - 1))

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

@ -26,6 +26,7 @@
#include "foundation.h" #include "foundation.h"
#include "access.h" #include "access.h"
#include "proxy.h" #include "proxy.h"
#include "gatt.h"
#include "proxy_msg.h" #include "proxy_msg.h"
#include "pb_gatt_srv.h" #include "pb_gatt_srv.h"

14
subsys/bluetooth/mesh/proxy.h
View file

@ -10,20 +10,6 @@
#define ADV_OPT_USE_IDENTITY 0 #define ADV_OPT_USE_IDENTITY 0
#endif #endif
#define ADV_SLOW_INT \
.interval_min = BT_GAP_ADV_SLOW_INT_MIN, \
.interval_max = BT_GAP_ADV_SLOW_INT_MAX
#define ADV_FAST_INT \
.interval_min = BT_GAP_ADV_FAST_INT_MIN_2, \
.interval_max = BT_GAP_ADV_FAST_INT_MAX_2
#define BT_DEVICE_NAME (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? \
(const uint8_t *)bt_get_name() : \
(const uint8_t *)CONFIG_BT_DEVICE_NAME)
#define BT_DEVICE_NAME_LEN (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? strlen(bt_get_name()) : \
(sizeof(CONFIG_BT_DEVICE_NAME) - 1))
#define BT_MESH_ID_TYPE_NET 0x00 #define BT_MESH_ID_TYPE_NET 0x00
#define BT_MESH_ID_TYPE_NODE 0x01 #define BT_MESH_ID_TYPE_NODE 0x01
#define BT_MESH_ID_TYPE_PRIV_NET 0x02 #define BT_MESH_ID_TYPE_PRIV_NET 0x02

1
subsys/bluetooth/mesh/proxy_srv.c
View file

@ -28,6 +28,7 @@
#include "foundation.h" #include "foundation.h"
#include "access.h" #include "access.h"
#include "proxy.h" #include "proxy.h"
#include "gatt.h"
#include "proxy_msg.h" #include "proxy_msg.h"
#include "crypto.h" #include "crypto.h"