commit 428cdbf7564db1eeb37376caaa96ca5eb25fab03
author Marti Bolivar <marti.bolivar@linaro.org> Mon May 01 22:32:42 2017 -0400
committer Marti Bolivar <marti.bolivar@linaro.org> Thu Jun 15 13:24:15 2017 -0400
tree 9f97112b6a95ea399608c0382c973fc3aace52d3
parent 88f48d91405cdf9bc53f002e5c16dc86eac27970

Rename br_flash_id to br_flash_dev_id.

Similarly, it's confusing whether br_flash_id is a flash device ID or
a flash area ID. Make this unambiguous.

Signed-off-by: Marti Bolivar <marti.bolivar@linaro.org>

boot/bootutil/include/bootutil/bootutil.h

diff --git a/boot/bootutil/include/bootutil/bootutil.h b/boot/bootutil/include/bootutil/bootutil.h
index 7f76877..c97fc4c 100644
--- a/boot/bootutil/include/bootutil/bootutil.h
+++ b/boot/bootutil/include/bootutil/bootutil.h
@@ -53,7 +53,7 @@
      * The flash offset of the image to execute.  Indicates the position of
      * the image header within its flash device.
      */
-    uint8_t br_flash_id;
+    uint8_t br_flash_dev_id;
     uint32_t br_image_off;
 };
 

boot/bootutil/src/loader.c

diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 74c297c..2b0002f 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -1287,7 +1287,7 @@
     }
 
     /* Always boot from the primary slot. */
-    rsp->br_flash_id = boot_img_fa_device_id(&boot_data, 0);
+    rsp->br_flash_dev_id = boot_img_fa_device_id(&boot_data, 0);
     rsp->br_image_off = boot_img_slot_off(&boot_data, 0);
     rsp->br_hdr = boot_img_hdr(&boot_data, slot);
 

boot/bootutil/test/src/boot_test_utils.c

diff --git a/boot/bootutil/test/src/boot_test_utils.c b/boot/bootutil/test/src/boot_test_utils.c
index 54fa338..422220b 100644
--- a/boot/bootutil/test/src/boot_test_utils.c
+++ b/boot/bootutil/test/src/boot_test_utils.c
@@ -504,7 +504,7 @@
         }
 
         TEST_ASSERT(memcmp(rsp.br_hdr, slot0hdr, sizeof *slot0hdr) == 0);
-        TEST_ASSERT(rsp.br_flash_id == boot_test_img_addrs[0].flash_id);
+        TEST_ASSERT(rsp.br_flash_dev_id == boot_test_img_addrs[0].flash_id);
         TEST_ASSERT(rsp.br_image_off == boot_test_img_addrs[0].address);
 
         boot_test_util_verify_flash(slot0hdr, orig_slot_0,