commit 0ab87b617a99340526fc955d991db0f04d9cfdb1
author Dominik Ermel <dominik.ermel@nordicsemi.no> Tue May 25 11:50:04 2021 +0000
committer Fabio Utzig <utzig@utzig.org> Sun May 30 08:14:04 2021 -0300
tree 07e253892ae5c5a301aecb58df9daac287f4a371
parent 8115998cb5d65cdd96d1eb3287247e51304d6d45

bootutil: Remove area ID parameter from fixup_revert

The fixup_revert has been switched to use boot_read_swap_state,
from boot_read_swap_state_by_id, and no longer needs the ID
parameter.  It can now get swap state information by flash_area
object pointer, which is provided as 3rd parameter.

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 f2883f6..f98ef71 100644
--- a/boot/bootutil/src/swap_move.c
+++ b/boot/bootutil/src/swap_move.c
@@ -399,7 +399,7 @@
  */
 void
 fixup_revert(const struct boot_loader_state *state, struct boot_status *bs,
-        const struct flash_area *fap_sec, uint8_t sec_id)
+        const struct flash_area *fap_sec)
 {
     struct boot_swap_state swap_state;
     int rc;
@@ -415,7 +415,7 @@
         return;
     }
 
-    rc = boot_read_swap_state_by_id(sec_id, &swap_state);
+    rc = boot_read_swap_state(fap_sec, &swap_state);
     assert(rc == 0);
 
     BOOT_LOG_SWAP_STATE("Secondary image", &swap_state);
@@ -493,7 +493,7 @@
     rc = flash_area_open(FLASH_AREA_IMAGE_SECONDARY(image_index), &fap_sec);
     assert (rc == 0);
 
-    fixup_revert(state, bs, fap_sec, FLASH_AREA_IMAGE_SECONDARY(image_index));
+    fixup_revert(state, bs, fap_sec);
 
     if (bs->op == BOOT_STATUS_OP_MOVE) {
         idx = g_last_idx;