Skip to content

Commit 2e92b15

Browse files
committed
lib: peer_manager: rename PM_PEER_RANKS_ENABLED
Renames `PM_PEER_RANKS_ENABLED` to align with Zephyr's coding style. Updates accordingly description and references. Signed-off-by: Mirko Covizzi <[email protected]>
1 parent f78ed46 commit 2e92b15

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

include/bluetooth/peer_manager/peer_manager.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -772,8 +772,8 @@ uint32_t pm_peers_delete(void);
772772
* @retval NRF_ERROR_NOT_FOUND If no peer with stored peer rank was found.
773773
* @retval NRF_ERROR_INVALID_STATE If the Peer Manager is not initialized.
774774
* @retval NRF_ERROR_INTERNAL If an internal error occurred.
775-
* @retval NRF_ERROR_NOT_SUPPORTED If peer rank functionality has been disabled via the @ref
776-
* PM_PEER_RANKS_ENABLED configuration option.
775+
* @retval NRF_ERROR_NOT_SUPPORTED If peer rank functionality has been disabled via the
776+
* @c CONFIG_PM_PEER_RANKS Kconfig option.
777777
*/
778778
uint32_t pm_peer_ranks_get(pm_peer_id_t *p_highest_ranked_peer, uint32_t *p_highest_rank,
779779
pm_peer_id_t *p_lowest_ranked_peer, uint32_t *p_lowest_rank);
@@ -807,8 +807,8 @@ uint32_t pm_peer_ranks_get(pm_peer_id_t *p_highest_ranked_peer, uint32_t *p_high
807807
* around to 0. To fix this, manually update all ranks to smaller
808808
* values, while still keeping their order.
809809
* @retval NRF_ERROR_INTERNAL If an internal error occurred.
810-
* @retval NRF_ERROR_NOT_SUPPORTED If peer rank functionality has been disabled via the @ref
811-
* PM_PEER_RANKS_ENABLED configuration option.
810+
* @retval NRF_ERROR_NOT_SUPPORTED If peer rank functionality has been disabled via the
811+
* @c CONFIG_PM_PEER_RANKS Kconfig option.
812812
*/
813813
uint32_t pm_peer_rank_highest(pm_peer_id_t peer_id);
814814

lib/peer_manager/Kconfig

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,11 @@ config PM_SERVICE_CHANGED
4848
If not using a GATT server, or using a server without a service changed characteristic,
4949
disable this to save code space.
5050

51-
config PM_PEER_RANKS_ENABLED
52-
bool "Enable/disable the peer rank management in Peer Manager."
51+
config PM_PEER_RANKS
52+
bool "Peer rank management in Peer Manager."
5353
default y
5454
help
55-
Enable/disable the peer rank management in Peer Manager.
56-
Set this to false to save code space if not using the peer rank API.
55+
Disable to save code space if not using the peer rank API.
5756

5857
config PM_LESC_ENABLED
5958
bool "Enable/disable LESC support in Peer Manager."

lib/peer_manager/peer_manager.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static void evt_send(pm_evt_t const *p_pm_evt)
6363
}
6464
}
6565

66-
#if CONFIG_PM_PEER_RANKS_ENABLED == 1
66+
#if CONFIG_PM_PEER_RANKS == 1
6767
/** @brief Function for initializing peer rank static variables. */
6868
static void rank_vars_update(void)
6969
{
@@ -92,7 +92,7 @@ void pm_pdb_evt_handler(pm_evt_t *p_pdb_evt)
9292
p_pdb_evt->conn_handle = im_conn_handle_get(p_pdb_evt->peer_id);
9393

9494
switch (p_pdb_evt->evt_id) {
95-
#if CONFIG_PM_PEER_RANKS_ENABLED == 1
95+
#if CONFIG_PM_PEER_RANKS == 1
9696
case PM_EVT_PEER_DATA_UPDATE_SUCCEEDED:
9797
if (p_pdb_evt->params.peer_data_update_succeeded.action == PM_PEER_DATA_OP_UPDATE) {
9898
if ((m_peer_rank_token != PM_STORE_TOKEN_INVALID) &&
@@ -167,7 +167,7 @@ void pm_pdb_evt_handler(pm_evt_t *p_pdb_evt)
167167
evt_send(&pm_delete_all_evt);
168168
}
169169

170-
#if CONFIG_PM_PEER_RANKS_ENABLED == 1
170+
#if CONFIG_PM_PEER_RANKS == 1
171171
if (m_peer_rank_initialized && (p_pdb_evt->peer_id == m_highest_ranked_peer)) {
172172
/* Update peer rank variable if highest ranked peer has been deleted. */
173173
rank_vars_update();
@@ -373,7 +373,7 @@ uint32_t pm_init(void)
373373

374374
m_flag_conn_excluded = ble_conn_state_user_flag_acquire();
375375

376-
/* If CONFIG_PM_PEER_RANKS_ENABLED is 0, these variables are unused. */
376+
/* If CONFIG_PM_PEER_RANKS is 0, these variables are unused. */
377377
UNUSED_VARIABLE(m_peer_rank_initialized);
378378
UNUSED_VARIABLE(m_peer_rank_token);
379379
UNUSED_VARIABLE(m_current_highest_peer_rank);
@@ -918,7 +918,7 @@ uint32_t pm_peers_delete(void)
918918
uint32_t pm_peer_ranks_get(pm_peer_id_t *p_highest_ranked_peer, uint32_t *p_highest_rank,
919919
pm_peer_id_t *p_lowest_ranked_peer, uint32_t *p_lowest_rank)
920920
{
921-
#if CONFIG_PM_PEER_RANKS_ENABLED == 0
921+
#if CONFIG_PM_PEER_RANKS == 0
922922
return NRF_ERROR_NOT_SUPPORTED;
923923
#else
924924
VERIFY_MODULE_INITIALIZED();
@@ -983,7 +983,7 @@ uint32_t pm_peer_ranks_get(pm_peer_id_t *p_highest_ranked_peer, uint32_t *p_high
983983
#endif
984984
}
985985

986-
#if CONFIG_PM_PEER_RANKS_ENABLED == 1
986+
#if CONFIG_PM_PEER_RANKS == 1
987987
/** @brief Function for initializing peer rank functionality. */
988988
static void rank_init(void)
989989
{
@@ -993,7 +993,7 @@ static void rank_init(void)
993993

994994
uint32_t pm_peer_rank_highest(pm_peer_id_t peer_id)
995995
{
996-
#if CONFIG_PM_PEER_RANKS_ENABLED == 0
996+
#if CONFIG_PM_PEER_RANKS == 0
997997
return NRF_ERROR_NOT_SUPPORTED;
998998
#else
999999
VERIFY_MODULE_INITIALIZED();

0 commit comments

Comments
 (0)