cypress: Add implementation of flash_area_get_sectors_fa

Variant of flash_area_get_sectors that takes flash_area object
pointer instead of flash area identifier.

Signed-off-by: Dominik Ermel <[email protected]>

Author: de-nordic

boot/cypress/cy_flash_pal/cy_flash_map.c

@@ -481,67 +481,73 @@ int flash_area_read_is_empty(const struct flash_area *fa, uint32_t off,
 }
 
 #ifdef MCUBOOT_USE_FLASH_AREA_GET_SECTORS
-int flash_area_get_sectors(int idx, uint32_t *cnt, struct flash_sector *ret)
+int flash_area_get_sectors_fa(const struct flash_area *fa, uint32_t *cnt, struct flash_sector *ret)
 {
     int rc = 0;
     uint32_t i = 0;
     struct flash_area *fa = NULL;
 
-    while(NULL != boot_area_descs[i])
+    size_t sector_size = 0;
+
+    if(fa->fa_device_id == FLASH_DEVICE_INTERNAL_FLASH)
     {
-        if(idx == boot_area_descs[i]->fa_id)
-        {
-            fa = boot_area_descs[i];
-            break;
-        }
-        i++;
+        sector_size = CY_FLASH_SIZEOF_ROW;
+    }
+#ifdef CY_BOOT_USE_EXTERNAL_FLASH
+    else if((fa->fa_device_id & FLASH_DEVICE_EXTERNAL_FLAG) == FLASH_DEVICE_EXTERNAL_FLAG)
+    {
+        /* implement for SMIF */
+        /* lets assume they are equal */
+        sector_size = CY_FLASH_SIZEOF_ROW;
+    }
+#endif
+    else
+    {
+        rc = -1;
     }
 
-    if(NULL != boot_area_descs[i])
+    if(0 == rc)
     {
-        size_t sector_size = 0;
+        uint32_t addr = 0;
+        size_t sectors_n = 0;
 
-        if(fa->fa_device_id == FLASH_DEVICE_INTERNAL_FLASH)
-        {
-            sector_size = CY_FLASH_SIZEOF_ROW;
-        }
-#ifdef CY_BOOT_USE_EXTERNAL_FLASH
-        else if((fa->fa_device_id & FLASH_DEVICE_EXTERNAL_FLAG) == FLASH_DEVICE_EXTERNAL_FLAG)
-        {
-            /* implement for SMIF */
-            /* lets assume they are equal */
-            sector_size = CY_FLASH_SIZEOF_ROW;
-        }
-#endif
-        else
-        {
-            rc = -1;
-        }
+        sectors_n = (fa->fa_size + (sector_size - 1)) / sector_size;
+        assert(sectors_n <= *cnt);
 
-        if(0 == rc)
+        addr = fa->fa_off;
+        for(i = 0; i < sectors_n; i++)
         {
-            uint32_t addr = 0;
-            size_t sectors_n = 0;
+            ret[i].fs_size = sector_size ;
+            ret[i].fs_off = addr ;
+            addr += sector_size ;
+        }
 
-            sectors_n = (fa->fa_size + (sector_size - 1)) / sector_size;
-            assert(sectors_n <= *cnt);
+        *cnt = sectors_n;
+    }
+    return rc;
+}
 
-            addr = fa->fa_off;
-            for(i = 0; i < sectors_n; i++)
-            {
-                ret[i].fs_size = sector_size ;
-                ret[i].fs_off = addr ;
-                addr += sector_size ;
-            }
+int flash_area_get_sectors(int idx, uint32_t *cnt, struct flash_sector *ret)
+{
+    int rc = -1;
+    uint32_t i = 0;
+    struct flash_area *fa = NULL;
 
-            *cnt = sectors_n;
+    while(NULL != boot_area_descs[i])
+    {
+        if(idx == boot_area_descs[i]->fa_id)
+        {
+            fa = boot_area_descs[i];
+            break;
         }
+        i++;
     }
-    else
+
+    if(NULL != fa)
     {
-        rc = -1;
+        flash_area_get_sectors_fa(fa, cnt, ret);
     }
-
     return rc;
 }
+
 #endif

boot/cypress/cy_flash_pal/include/flash_map_backend/flash_map_backend.h

@@ -177,6 +177,8 @@ int flash_area_id_from_multi_image_slot(int image_index, int slot);
 int flash_area_id_to_multi_image_slot(int image_index, int area_id);
 #ifdef MCUBOOT_USE_FLASH_AREA_GET_SECTORS
 int flash_area_get_sectors(int idx, uint32_t *cnt, struct flash_sector *ret);
+int flash_area_get_sectors_fa(const struct flash_area *fa, uint32_t *cnt,
+                              struct flash_sector *ret);
 #endif
 /*
  * Returns the value expected to be read when accesing any erased