michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsys: storage: flash_map - Remove some code duplication

Browse source 
This patch cleans up flash_map code.

Signed-off-by: Christopher Collins <ccollins@apache.org>
This commit is contained in:
Christopher Collins 2018-01-25 18:27:24 -08:00 • committed by Anas Nashif
commit ffc90dd496
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
subsys/storage/flash_map/flash_map.c
View file

@ -44,24 +44,32 @@ const struct flash_area *flash_map;
extern const int flash_map_entries;
static struct device *flash_dev[ARRAY_SIZE(flash_drivers_map)];
static struct flash_area const *get_flash_area_from_id(int idx)
{
for (int i = 0; i < flash_map_entries; i++) {
if (flash_map[i].fa_id == idx) {
return &flash_map[i];
}
}
return NULL;
}
int flash_area_open(u8_t id, const struct flash_area **fap)
{
const struct flash_area *area;
int i;
if (flash_map == NULL) {
return -EACCES;
}
for (i = 0; i < flash_map_entries; i++) {
area = flash_map + i;
if (area->fa_id == id) {
*fap = area;
return 0;
}
area = get_flash_area_from_id(id);
if (area == NULL) {
return -ENOENT;
}
return -ENOENT;
*fap = area;
return 0;
}
void flash_area_close(const struct flash_area *fa)
@ -86,17 +94,6 @@ static inline bool is_in_flash_area_bounds(const struct flash_area *fa,
return (off <= fa->fa_size && off + len <= fa->fa_size);
}
struct flash_area const *get_flash_area_from_id(int idx)
{
for (int i = 0; i < flash_map_entries; i++) {
if (flash_map[i].fa_id == idx) {
return &flash_map[i];
}
}
return NULL;
}
#if defined(CONFIG_FLASH_PAGE_LAYOUT)
/*
* Check if a flash_page_foreach() callback should exit early, due to