michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mgmt/MCUmgr/grp/img: Reduce logic in img_mgmt_slot_to_image

Browse source 
Makes img_mgmt_slot_to_image image number independent and moves
it to header file as static inline.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2023-08-18 16:36:32 +00:00 • committed by Carles Cufí
commit 1c7b069853
2 changed files with 9 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
View file

@ -93,7 +93,13 @@ int img_mgmt_swap_type(int slot);
*
* @return 0 based image number.
*/
int img_mgmt_slot_to_image(int slot);
static inline int img_mgmt_slot_to_image(int slot)
{
__ASSERT(slot >= 0 && slot < (CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER << 1),
"Impossible slot number");
return (slot >> 1);
}
/**
* @brief Get slot number of alternate (inactive) image pair

44
subsys/mgmt/mcumgr/grp/img_mgmt/src/zephyr_img_mgmt.c
View file

@ -32,46 +32,6 @@ BUILD_ASSERT(CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER == 1 ||
FIXED_PARTITION_EXISTS(SLOT3_PARTITION)),
"Missing partitions?");
#if defined(CONFIG_MCUMGR_GRP_IMG_DIRECT_UPLOAD) && \
!(CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1)
/* In case when direct upload is enabled, slot2 and slot3 are optional
* as long as there is support for one application image only.
*/
#define ADD_SLOT_2_CONDITION FIXED_PARTITION_EXISTS(SLOT2_PARTITION)
#define ADD_SLOT_3_CONDITION FIXED_PARTITION_EXISTS(SLOT3_PARTITION)
#elif (CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1)
/* For more than one application image slot2 and slot3 are required. */
#define ADD_SLOT_2_CONDITION 1
#define ADD_SLOT_3_CONDITION 1
#else
/* If neither in direct upload mode nor more than one application image
* is supported, then slot2 and slot3 support is useless.
*/
#define ADD_SLOT_2_CONDITION 0
#define ADD_SLOT_3_CONDITION 0
#endif
int
img_mgmt_slot_to_image(int slot)
{
switch (slot) {
case 0:
case 1:
return 0;
#if ADD_SLOT_2_CONDITION
case 2:
return 1;
#endif
#if ADD_SLOT_3_CONDITION
case 3:
return 1;
#endif
default:
assert(0);
}
return 0;
}
/**
* Determines if the specified area of flash is completely unwritten.
*
@ -165,13 +125,13 @@ img_mgmt_flash_area_id(int slot)
fa_id = FIXED_PARTITION_ID(SLOT1_PARTITION);
break;
#if ADD_SLOT_2_CONDITION
#if FIXED_PARTITION_EXISTS(SLOT2_PARTITION)
case 2:
fa_id = FIXED_PARTITION_ID(SLOT2_PARTITION);
break;
#endif
#if ADD_SLOT_3_CONDITION
#if FIXED_PARTITION_EXISTS(SLOT3_PARTITION)
case 3:
fa_id = FIXED_PARTITION_ID(SLOT3_PARTITION);
break;