From 478fae332686ee3018019bab50417eaa70073730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kopy=C5=9Bci=C5=84ski?= Date: Tue, 15 Dec 2020 12:15:53 +0100 Subject: [PATCH] mesh: Make address defines public This commit makes BT_MESH_ADDR_IS_* macros public so that applications can use them. This is port of 12bcf652e650a90a4e97c698f00aba76d0601aec --- nimble/host/mesh/include/mesh/access.h | 5 +++++ nimble/host/mesh/src/mesh_priv.h | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nimble/host/mesh/include/mesh/access.h b/nimble/host/mesh/include/mesh/access.h index 48ab62b48..fd1f1134c 100644 --- a/nimble/host/mesh/include/mesh/access.h +++ b/nimble/host/mesh/include/mesh/access.h @@ -34,6 +34,11 @@ extern "C" { #define BT_MESH_KEY_DEV_REMOTE 0xfffd #define BT_MESH_KEY_DEV_ANY 0xfffc +#define BT_MESH_ADDR_IS_UNICAST(addr) ((addr) && (addr) < 0x8000) +#define BT_MESH_ADDR_IS_GROUP(addr) ((addr) >= 0xc000 && (addr) <= 0xff00) +#define BT_MESH_ADDR_IS_VIRTUAL(addr) ((addr) >= 0x8000 && (addr) < 0xc000) +#define BT_MESH_ADDR_IS_RFU(addr) ((addr) >= 0xff00 && (addr) <= 0xfffb) + #define BT_MESH_IS_DEV_KEY(key) (key == BT_MESH_KEY_DEV_LOCAL || \ key == BT_MESH_KEY_DEV_REMOTE) diff --git a/nimble/host/mesh/src/mesh_priv.h b/nimble/host/mesh/src/mesh_priv.h index 11efcac44..213f54377 100644 --- a/nimble/host/mesh/src/mesh_priv.h +++ b/nimble/host/mesh/src/mesh_priv.h @@ -14,11 +14,6 @@ #define BT_MESH_KEY_PRIMARY 0x0000 #define BT_MESH_KEY_ANY 0xffff -#define BT_MESH_ADDR_IS_UNICAST(addr) ((addr) && (addr) < 0x8000) -#define BT_MESH_ADDR_IS_GROUP(addr) ((addr) >= 0xc000 && (addr) <= 0xff00) -#define BT_MESH_ADDR_IS_VIRTUAL(addr) ((addr) >= 0x8000 && (addr) < 0xc000) -#define BT_MESH_ADDR_IS_RFU(addr) ((addr) >= 0xff00 && (addr) <= 0xfffb) - enum bt_mesh_key_evt { BT_MESH_KEY_ADDED, /* New key added */ BT_MESH_KEY_DELETED, /* Existing key deleted */