espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-04 22:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

host/mesh: Only do label lookup when there are labels

Browse Source 
Include virtual label's pending_store function in the LABEL_COUNT > 0
compile guard to avoid including dead iteration code in the compilation.

This is port of 7039675df13c74e74fb76d4f41cfc7e949c209ad
This commit is contained in:
Krzysztof Kopyściński
2021-11-10 06:24:00 +01:00
committed by Krzysztof Kopyściński
parent ea75a5e683
commit 9a7d9f4a7f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/mesh/src/transport.c
+7 -3
View File
@@ -1749,6 +1749,7 @@ uint8_t *bt_mesh_va_label_get(uint16_t addr)
return NULL;
}
#if CONFIG_BT_MESH_LABEL_COUNT > 0
static struct virtual_addr *bt_mesh_va_get(uint16_t index)
{
if (index >= ARRAY_SIZE(virtual_addrs)) {
@@ -1758,7 +1759,6 @@ static struct virtual_addr *bt_mesh_va_get(uint16_t index)
return &virtual_addrs[index];
}
#if CONFIG_BT_MESH_LABEL_COUNT > 0
static int va_set(int argc, char **argv, char *val)
{
struct va_val va;
@@ -1809,7 +1809,6 @@ static int va_set(int argc, char **argv, char *val)
return 0;
}
#endif
#define IS_VA_DEL(_label) ((_label)->ref == 0)
void bt_mesh_va_pending_store(void)
@@ -1857,8 +1856,13 @@ void bt_mesh_va_pending_store(void)
}
}
}
#else
void bt_mesh_va_pending_store(void)
{
/* Do nothing. */
}
#endif /* CONFIG_BT_MESH_LABEL_COUNT > 0 */
#if CONFIG_BT_MESH_LABEL_COUNT > 0
static struct conf_handler bt_mesh_va_conf_handler = {
.ch_name = "bt_mesh",
.ch_get = NULL,