flash_map_backend: Remove flash_area_id_to_multi_image_slot

de-nordic · de-nordic · commit aef9e80a29e8 · 2023-01-05T17:33:18.000Z
The function has not been in use and some ports have not been
implementing it anyway.

Signed-off-by: Dominik Ermel &lt;dominik.ermel@nordicsemi.no&gt;
diff --git a/boot/cypress/cy_flash_pal/cy_flash_map.c b/boot/cypress/cy_flash_pal/cy_flash_map.c
@@ -438,11 +438,6 @@ int flash_area_id_to_multi_image_slot(int image_index, int area_id)
     return -1;
 }
 
-int flash_area_id_to_image_slot(int area_id)
-{
-    return flash_area_id_to_multi_image_slot(0, area_id);
-}
-
 uint8_t flash_area_erased_val(const struct flash_area *fap)
 {
     int ret = 0;
diff --git a/boot/cypress/cy_flash_pal/include/flash_map_backend/flash_map_backend.h b/boot/cypress/cy_flash_pal/include/flash_map_backend/flash_map_backend.h
@@ -172,8 +172,6 @@ uint32_t flash_area_align(const struct flash_area *);
 int flash_area_to_sectors(int idx, int *cnt, struct flash_area *ret);
 /*< Returns the `fa_id` for slot, where slot is 0 (primary) or 1 (secondary) */
 int flash_area_id_from_image_slot(int slot);
-/*< Returns the slot, for the `fa_id` supplied */
-int flash_area_id_to_image_slot(int area_id);
 
 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);
diff --git a/boot/mbed/include/flash_map_backend/flash_map_backend.h b/boot/mbed/include/flash_map_backend/flash_map_backend.h
@@ -161,7 +161,6 @@ int flash_area_id_from_image_slot(int slot);
 int flash_area_id_from_multi_image_slot(int image_index, int slot);
 
 
-int flash_area_id_to_image_slot(int area_id);
 /**
  * Converts the specified flash area ID and image index (in multi-image setup)
  * to an image slot index.
diff --git a/boot/mbed/src/flash_map_backend.cpp b/boot/mbed/src/flash_map_backend.cpp
@@ -231,10 +231,6 @@ int flash_area_id_from_image_slot(int slot) {
     return slot;
 }
 
-int flash_area_id_to_image_slot(int area_id) {
-    return area_id;
-}
-
 /**
  * Multi images support not implemented yet
  */
diff --git a/boot/zephyr/flash_map_extended.c b/boot/zephyr/flash_map_extended.c
@@ -83,11 +83,6 @@ int flash_area_id_to_multi_image_slot(int image_index, int area_id)
     return -1;
 }
 
-int flash_area_id_to_image_slot(int area_id)
-{
-    return flash_area_id_to_multi_image_slot(0, area_id);
-}
-
 #if defined(CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD)
 int flash_area_id_from_direct_image(int image_id)
 {
diff --git a/boot/zephyr/include/flash_map_backend/flash_map_backend.h b/boot/zephyr/include/flash_map_backend/flash_map_backend.h
@@ -47,14 +47,6 @@ int flash_device_base(uint8_t fd_id, uintptr_t *ret);
 int flash_area_id_from_image_slot(int slot);
 int flash_area_id_from_multi_image_slot(int image_index, int slot);
 
-/**
- * Converts the specified flash area ID to an image slot index.
- *
- * Returns image slot index (0 or 1), or -1 if ID doesn't correspond to an image
- * slot.
- */
-int flash_area_id_to_image_slot(int area_id);
-
 /**
  * Converts the specified flash area ID and image index (in multi-image setup)
  * to an image slot index.
diff --git a/sim/mcuboot-sys/csupport/storage/flash_map.h b/sim/mcuboot-sys/csupport/storage/flash_map.h
@@ -152,7 +152,6 @@ int flash_area_to_sectors(int idx, int *cnt, struct flash_area *ret);
 
 int flash_area_id_from_image_slot(int slot);
 int flash_area_id_from_multi_image_slot(int image_index, int slot);
-int flash_area_id_to_image_slot(int area_id);
 int flash_area_id_to_multi_image_slot(int image_index, int area_id);
 
 #ifdef __cplusplus

Original file line number	Diff line number	Diff line change
`@@ -438,11 +438,6 @@ int flash_area_id_to_multi_image_slot(int image_index, int area_id)`
`438`	`438`	`return -1;`
`439`	`439`	`}`
`440`	`440`
`441`		`-int flash_area_id_to_image_slot(int area_id)`
`442`		`-{`
`443`		`- return flash_area_id_to_multi_image_slot(0, area_id);`
`444`		`-}`
`445`		`-`
`446`	`441`	`uint8_t flash_area_erased_val(const struct flash_area *fap)`
`447`	`442`	`{`
`448`	`443`	`int ret = 0;`
Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,6 @@ int flash_area_id_to_multi_image_slot(int image_index, int area_id)`
`83`	`83`	`return -1;`
`84`	`84`	`}`
`85`	`85`
`86`		`-int flash_area_id_to_image_slot(int area_id)`
`87`		`-{`
`88`		`- return flash_area_id_to_multi_image_slot(0, area_id);`
`89`		`-}`
`90`		`-`
`91`	`86`	`#if defined(CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD)`
`92`	`87`	`int flash_area_id_from_direct_image(int image_id)`
`93`	`88`	`{`