michaelh/zephyr
1
0
Fork 0
Code Releases Activity

everywhere: replace #if IS_ENABLED() as per docs

Browse source 
Replace `#if IS_ENABLED()` with `#if defined()` as recommended by the
documentation of `IS_ENABLED`.

Signed-off-by: Jordan Yates <jordan@embeint.com>
This commit is contained in:
Jordan Yates 2024-06-24 20:59:51 +10:00 • committed by Anas Nashif
commit 91f8c1aea9
53 changed files with 215 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/mesh/access.c
View file

@ -111,10 +111,10 @@ static const struct {
uint8_t page;
} comp_data_pages[] = {
{ "bt/mesh/cmp/0", 0, },
#if IS_ENABLED(CONFIG_BT_MESH_COMP_PAGE_1)
#if defined(CONFIG_BT_MESH_COMP_PAGE_1)
{ "bt/mesh/cmp/1", 1, },
#endif
#if IS_ENABLED(CONFIG_BT_MESH_COMP_PAGE_2)
#if defined(CONFIG_BT_MESH_COMP_PAGE_2)
{ "bt/mesh/cmp/2", 2, },
#endif
};
@ -2617,7 +2617,7 @@ void bt_mesh_comp_data_clear(void)
int bt_mesh_models_metadata_change_prepare(void)
{
#if IS_ENABLED(CONFIG_BT_MESH_LARGE_COMP_DATA_SRV)
#if defined(CONFIG_BT_MESH_LARGE_COMP_DATA_SRV)
return bt_mesh_models_metadata_store();
#else
return -ENOTSUP;

4
subsys/bluetooth/mesh/cfg.c
View file

@ -137,7 +137,7 @@ uint8_t bt_mesh_priv_beacon_update_interval_get(void)
int bt_mesh_od_priv_proxy_get(void)
{
#if IS_ENABLED(CONFIG_BT_MESH_OD_PRIV_PROXY_SRV)
#if defined(CONFIG_BT_MESH_OD_PRIV_PROXY_SRV)
return bt_mesh.on_demand_state;
#else
return -ENOTSUP;
@ -146,7 +146,7 @@ int bt_mesh_od_priv_proxy_get(void)
int bt_mesh_od_priv_proxy_set(uint8_t on_demand_proxy)
{
#if !IS_ENABLED(CONFIG_BT_MESH_OD_PRIV_PROXY_SRV)
#if !defined(CONFIG_BT_MESH_OD_PRIV_PROXY_SRV)
return -ENOTSUP;
#else

2
subsys/bluetooth/mesh/prov.h
View file

@ -78,7 +78,7 @@
NET_BUF_SIMPLE_DEFINE(name, PROV_BEARER_BUF_HEADROOM + PDU_OP_LEN + len + \
PROV_BEARER_BUF_TAILROOM)
#if IS_ENABLED(CONFIG_BT_MESH_ECDH_P256_HMAC_SHA256_AES_CCM)
#if defined(CONFIG_BT_MESH_ECDH_P256_HMAC_SHA256_AES_CCM)
#define PROV_AUTH_MAX_LEN 32
#else
#define PROV_AUTH_MAX_LEN 16