Skip to content

Commit 224429b

Browse files
rghaddabcarlescufi
authored andcommitted
[nrf fromlist] settings: zms: code style clean up
Clean some parts of the code and refactor it to avoid multiple nested conditions. Upstream PR #: 87792 Signed-off-by: Riadh Ghaddab <[email protected]> (cherry picked from commit 1699785ff3fd7d7e260133898729afff634eea73) (cherry picked from commit 749f6b5)
1 parent 61d6ca4 commit 224429b

File tree

3 files changed

+148
-138
lines changed

3 files changed

+148
-138
lines changed

subsys/settings/include/settings/settings_zms.h

+3
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ extern "C" {
6868
((x & ~ZMS_COLLISIONS_MASK) | ((y << 1) & ZMS_COLLISIONS_MASK))
6969
#define ZMS_COLLISION_NUM(x) ((x & ZMS_COLLISIONS_MASK) >> 1)
7070
#define ZMS_NAME_ID_FROM_HASH(x) ((x & ZMS_HASH_TOTAL_MASK) | BIT(31))
71+
#define ZMS_DATA_ID_FROM_HASH(x) (ZMS_NAME_ID_FROM_HASH(x) + ZMS_DATA_ID_OFFSET)
72+
#define ZMS_DATA_ID_FROM_NAME(x) (x + ZMS_DATA_ID_OFFSET)
73+
#define ZMS_DATA_ID_FROM_LL_NODE(x) (ZMS_NAME_ID_FROM_LL_NODE(x) + ZMS_DATA_ID_OFFSET)
7174

7275
struct settings_hash_linked_list {
7376
uint32_t previous_hash;

0 commit comments

Comments
 (0)