|
17 | 17 | #include "babblekit/testcase.h" |
18 | 18 |
|
19 | 19 | #define NAME_LEN 30 |
20 | | -#define BT_AD_DATA_NAME_SIZE (sizeof(CONFIG_BT_DEVICE_NAME) - 1U + 2U) |
21 | | -#define BT_AD_DATA_MFG_DATA_SIZE (254U + 2U) |
| 20 | +#define AD_DATA_NAME_SIZE (sizeof(CONFIG_BT_DEVICE_NAME) - 1U + 2U) |
| 21 | +#define AD_DATA_MFG_DATA_SIZE (254U + 2U) |
22 | 22 | /* |
23 | 23 | * for testing chaining the manufacturing data is duplicated, hence DATA_LEN needs to |
24 | 24 | * add twice the size for this element |
25 | 25 | */ |
26 | | -#define DATA_LEN MIN((BT_AD_DATA_NAME_SIZE + \ |
27 | | - BT_AD_DATA_MFG_DATA_SIZE + BT_AD_DATA_MFG_DATA_SIZE), \ |
| 26 | +#define DATA_LEN MIN((AD_DATA_NAME_SIZE + \ |
| 27 | + AD_DATA_MFG_DATA_SIZE + AD_DATA_MFG_DATA_SIZE), \ |
28 | 28 | CONFIG_BT_CTLR_ADV_DATA_LEN_MAX) |
29 | 29 |
|
30 | 30 | /* One less extended advertising set as first one is legacy advertising in the broadcaster_multiple |
31 | 31 | * sample. |
32 | 32 | */ |
33 | | -#define BT_EXT_ADV_MAX_ADV_SET (CONFIG_BT_EXT_ADV_MAX_ADV_SET - 1) |
| 33 | +#define MAX_EXT_ADV_SET (CONFIG_BT_EXT_ADV_MAX_ADV_SET - 1) |
34 | 34 |
|
35 | 35 | static K_SEM_DEFINE(sem_recv, 0, 1); |
36 | 36 |
|
@@ -81,7 +81,7 @@ static bool data_cb(struct bt_data *data, void *user_data) |
81 | 81 | static void scan_recv(const struct bt_le_scan_recv_info *info, |
82 | 82 | struct net_buf_simple *buf) |
83 | 83 | { |
84 | | - static uint8_t sid[BT_EXT_ADV_MAX_ADV_SET]; |
| 84 | + static uint8_t sid[MAX_EXT_ADV_SET]; |
85 | 85 | static uint8_t sid_count; |
86 | 86 | char name[NAME_LEN]; |
87 | 87 | uint8_t data_status; |
@@ -118,7 +118,7 @@ static void scan_recv(const struct bt_le_scan_recv_info *info, |
118 | 118 |
|
119 | 119 | printk("Received advertising sets: %d\n", sid_count); |
120 | 120 |
|
121 | | - if (sid_count < BT_EXT_ADV_MAX_ADV_SET) { |
| 121 | + if (sid_count < MAX_EXT_ADV_SET) { |
122 | 122 | return; |
123 | 123 | } |
124 | 124 |
|
|
0 commit comments