commit 472d4c7fed02c905b4afa92c036393ef64424c0d
author Dominik Ermel <dominik.ermel@nordicsemi.no> Fri Feb 10 13:29:58 2023 +0000
committer David Brown <davidb@davidb.org> Tue Feb 28 08:06:10 2023 -0700
tree 97b97b8af95c9915ca201f4aaab6dd1303b574b1
parent 9e8eddcecba931f99297765779f8b130d808a9a3

bootutil: Pass flash_area to boot_read_swap_size

Modifies boot_read_swap_size and boot_read_enc_key to use
flash_area object pointer instead of image index.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>

boot/bootutil/src/swap_move.c

diff --git a/boot/bootutil/src/swap_move.c b/boot/bootutil/src/swap_move.c
index a063a0c..d7b5108 100644
--- a/boot/bootutil/src/swap_move.c
+++ b/boot/bootutil/src/swap_move.c
@@ -86,11 +86,12 @@
 
     off = 0;
     if (bs && !boot_status_is_reset(bs)) {
-        rc = boot_read_swap_size(BOOT_CURR_IMG(state), &swap_size);
-        if (rc) {
+	boot_find_status(BOOT_CURR_IMG(state), &fap);
+        if (fap == NULL || boot_read_swap_size(fap, &swap_size)) {
             rc = BOOT_EFLASH;
             goto done;
         }
+        flash_area_close(fap);
 
         last_idx = find_last_idx(state, swap_size);
         sz = boot_img_sector_size(state, BOOT_PRIMARY_SLOT, 0);