commit 2a29f5dc56182f2e7b075d9bd245a7c5268070b5
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Fri Jul 30 16:22:22 2021 +0200
committer David Brown <davidb@davidb.org> Thu Aug 26 16:22:04 2021 -0600
tree 7344cdabc80041b89771fe2caefeea7c56cfee9e
parent 4f9c7304d05c4c5dd9d02018a8e03647e28b8cd7

zephyr/boot_serial_extension: added hooks to custom image list MGMT

Introduced boot_img_install_stat_hook() hook fuinction for fetch
the image's slot installation status.

The image's slot installation status is custom property.
It's detailed definition depends on user implementation. It is only
defined that the status will be set to 0 if this hook not provides
another value.

Inserted available hook for read image header as well.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

boot/zephyr/boot_serial_extensions.c

diff --git a/boot/zephyr/boot_serial_extensions.c b/boot/zephyr/boot_serial_extensions.c
index d3dafee..49bb4ea 100644
--- a/boot/zephyr/boot_serial_extensions.c
+++ b/boot/zephyr/boot_serial_extensions.c
@@ -16,6 +16,8 @@
 #include "../boot_serial/src/cbor_encode.h"
 
 #include "bootutil/image.h"
+#include "bootutil/bootutil_public.h"
+#include "bootutil/boot_hooks.h"
 
 MCUBOOT_LOG_MODULE_DECLARE(mcuboot);
 
@@ -60,33 +62,44 @@
     struct flash_area const *fap;
     struct image_header hdr;
     int rc;
-    int img_install_stat = 0;
+    int img_install_stat;
 
-    area_id = flash_area_id_from_multi_image_slot(image_index, slot);
-
-    rc = flash_area_open(area_id, &fap);
-    if (rc) {
-        return rc;
+    rc = BOOT_HOOK_CALL(boot_img_install_stat_hook, BOOT_HOOK_REGULAR,
+                        image_index, slot, &img_install_stat);
+    if (rc == BOOT_HOOK_REGULAR)
+    {
+        img_install_stat = 0;
     }
 
-    rc = flash_area_read(fap, 0, &hdr, sizeof(hdr));
-    if (rc) {
-        goto func_end;
+    rc = BOOT_HOOK_CALL(boot_read_image_header_hook, BOOT_HOOK_REGULAR,
+                        image_index, slot, &hdr);
+    if (rc == BOOT_HOOK_REGULAR)
+    {
+        area_id = flash_area_id_from_multi_image_slot(image_index, slot);
+
+        rc = flash_area_open(area_id, &fap);
+        if (rc) {
+            return rc;
+        }
+
+        rc = flash_area_read(fap, 0, &hdr, sizeof(hdr));
+
+        flash_area_close(fap);
     }
 
-    if (hdr.ih_magic == IMAGE_MAGIC) {
-        snprintf(buffer, len, "ver=%d.%d.%d.%d,install_stat=%d",
-                 hdr.ih_ver.iv_major,
-                 hdr.ih_ver.iv_minor,
-                 hdr.ih_ver.iv_revision,
-                 hdr.ih_ver.iv_build_num,
-                 img_install_stat);
-    } else {
-        rc = 1;
+    if (rc == 0) {
+        if (hdr.ih_magic == IMAGE_MAGIC) {
+            snprintf(buffer, len, "ver=%d.%d.%d.%d,install_stat=%d",
+                    hdr.ih_ver.iv_major,
+                    hdr.ih_ver.iv_minor,
+                    hdr.ih_ver.iv_revision,
+                    hdr.ih_ver.iv_build_num,
+                    img_install_stat);
+        } else {
+            rc = 1;
+        }
     }
 
-func_end:
-    flash_area_close(fap);
     return rc;
 }