openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 22:21:16 +02:00
Code Issues Releases Wiki Activity

layout: Introduce flashrom_layout_new()

Browse Source 
It initializes an empty layout. Currently the maximum number of entries
has to be specified, which will vanish once we use dynamic allocation
per entry.

We replace the two special cases `single_layout` and `ich_layout` with
dynamically allocated layouts. As a result, we have to take care to
release the `default_layout` in a flashctx once we are done with it.

Change-Id: I2ae7246493ff592e631cce924777925c7825e398
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/33543
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Nico Huber
2019-06-16 19:46:46 +02:00
parent f394fcec0d
commit c32c8dc8af
9 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
layout.c
View File

@ -38,7 +38,7 @@ const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const f
if (flashctx->layout && flashctx->layout->num_entries)
return flashctx->layout;
else
return &flashctx->fallback_layout.base;
return flashctx->default_layout;
}
static struct romentry *mutable_layout_next(
@ -383,6 +383,32 @@ const struct romentry *layout_next(
* @{
*/
/**
* @brief Create a new, empty layout.
*
* @param layout Pointer to returned layout reference.
* @param count Number of layout entries to allocate.
*
* @return 0 on success,
* 1 if out of memory.
*/
int flashrom_layout_new(struct flashrom_layout **const layout, const unsigned int count)
{
*layout = malloc(sizeof(**layout) + count * sizeof(struct romentry));
if (!*layout) {
msg_gerr("Error creating layout: %s\n", strerror(errno));
return 1;
}
const struct flashrom_layout tmp = {
.entries = (void *)((char *)*layout + sizeof(**layout)),
.capacity = count,
.num_entries = 0,
};
**layout = tmp;
return 0;
}
/**
* @brief Add another region to an existing layout.
*