You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2018/03/15 21:27:05 UTC
[mynewt-nimble] 10/14: mesh: Fix available LPN groups count
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit feb792c6e08aada3de0a3690391a8c24c28e7953
Author: Michał Narajowski <mi...@codecoup.pl>
AuthorDate: Tue Mar 6 16:07:30 2018 +0100
mesh: Fix available LPN groups count
X-Original-Commit: 22228bdc87d78141849ac0715c39ef50c32436fb
---
nimble/host/mesh/include/mesh/glue.h | 2 +-
nimble/host/mesh/src/lpn.c | 2 +-
nimble/host/mesh/src/net.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nimble/host/mesh/include/mesh/glue.h b/nimble/host/mesh/include/mesh/glue.h
index b1050d8..26ba98f 100644
--- a/nimble/host/mesh/include/mesh/glue.h
+++ b/nimble/host/mesh/include/mesh/glue.h
@@ -349,7 +349,7 @@ static inline unsigned int find_msb_set(u32_t op)
/* Above flags are used with IS_ENABLED macro */
#define IS_ENABLED(config) MYNEWT_VAL(config)
-#define CONFIG_BLUETOOTH_MESH_LPN_GROUPS MYNEWT_VAL(BLE_MESH_LPN_GROUPS)
+#define CONFIG_BT_MESH_LPN_GROUPS MYNEWT_VAL(BLE_MESH_LPN_GROUPS)
#define CONFIG_BT_MESH_ADV_BUF_COUNT MYNEWT_VAL(BLE_MESH_ADV_BUF_COUNT)
#define CONFIG_BT_MESH_FRIEND_QUEUE_SIZE MYNEWT_VAL(BLE_MESH_FRIEND_QUEUE_SIZE)
#define CONFIG_BT_MESH_FRIEND_RECV_WIN MYNEWT_VAL(BLE_MESH_FRIEND_RECV_WIN)
diff --git a/nimble/host/mesh/src/lpn.c b/nimble/host/mesh/src/lpn.c
index 165bc23..0cc4622 100644
--- a/nimble/host/mesh/src/lpn.c
+++ b/nimble/host/mesh/src/lpn.c
@@ -613,7 +613,7 @@ static void lpn_group_del(u16_t group)
static inline int group_popcount(atomic_t *target)
{
-#if CONFIG_BLUETOOTH_MESH_LPN_GROUPS > 32
+#if CONFIG_BT_MESH_LPN_GROUPS > 32
int i, count = 0;
for (i = 0; i < ARRAY_SIZE(bt_mesh.lpn.added); i++) {
diff --git a/nimble/host/mesh/src/net.h b/nimble/host/mesh/src/net.h
index 24940a6..5e11aa2 100644
--- a/nimble/host/mesh/src/net.h
+++ b/nimble/host/mesh/src/net.h
@@ -121,7 +121,7 @@ struct bt_mesh_friend {
};
#if (MYNEWT_VAL(BLE_MESH_LOW_POWER))
-#define LPN_GROUPS MYNEWT_VAL(BLE_MESH_LOW_POWER)
+#define LPN_GROUPS CONFIG_BT_MESH_LPN_GROUPS
#else
#define LPN_GROUPS 0
#endif
--
To stop receiving notification emails like this one, please contact
andk@apache.org.