Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 19:34:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

common: eeprom_layout: Split field finding code from the field update function

Browse source 
Split the eeprom layout field finding code from the
eeprom_layout_update_field() function in order to make it usable in
alternative implementations of update method.

Signed-off-by: Marek Behún <kabel@kernel.org>
This commit is contained in:
Marek Behún 2024-05-21 09:13:26 +02:00 • committed by Tom Rini
parent a804c8dc5f
commit 15378a3fe1
2 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
common/eeprom/eeprom_layout.c
View file

@ -56,6 +56,28 @@ static void eeprom_layout_print(const struct eeprom_layout *layout)
fields[i].print(&fields[i]); fields[i].print(&fields[i]);
} }
/*
* eeprom_layout_find_field() - finds a layout field by name
* @layout: A pointer to an existing struct layout.
* @field_name: The name of the field to update.
* @warn: Whether to print a warning if the field is not found.
*
* Returns: a pointer to the found field or NULL on failure.
*/
struct eeprom_field *eeprom_layout_find_field(struct eeprom_layout *layout,
char *field_name, bool warn)
{
for (int i = 0; i < layout->num_of_fields; i++)
if (layout->fields[i].name != RESERVED_FIELDS &&
!strcmp(layout->fields[i].name, field_name))
return &layout->fields[i];
if (warn)
printf("No such field '%s'\n", field_name);
return NULL;
}
/* /*
* eeprom_layout_update_field() - update a single field in the layout data. * eeprom_layout_update_field() - update a single field in the layout data.
* @layout: A pointer to an existing struct layout. * @layout: A pointer to an existing struct layout.
@ -67,8 +89,8 @@ static void eeprom_layout_print(const struct eeprom_layout *layout)
static int eeprom_layout_update_field(struct eeprom_layout *layout, static int eeprom_layout_update_field(struct eeprom_layout *layout,
char *field_name, char *new_data) char *field_name, char *new_data)
{ {
int i, err; struct eeprom_field *field;
struct eeprom_field *fields = layout->fields; int err;
if (new_data == NULL) if (new_data == NULL)
return 0; return 0;
@ -76,23 +98,17 @@ static int eeprom_layout_update_field(struct eeprom_layout *layout,
if (field_name == NULL) if (field_name == NULL)
return -1; return -1;
for (i = 0; i < layout->num_of_fields; i++) { field = eeprom_layout_find_field(layout, field_name, true);
if (fields[i].name == RESERVED_FIELDS || if (field == NULL)
strcmp(fields[i].name, field_name)) return -1;
continue;
err = fields[i].update(&fields[i], new_data); err = field->update(field, new_data);
if (err) if (err)
printf("Invalid data for field %s\n", field_name); printf("Invalid data for field %s\n", field_name);
return err; return err;
} }
printf("No such field '%s'\n", field_name);
return -1;
}
/* /*
* eeprom_layout_setup() - setup layout struct with the layout data and * eeprom_layout_setup() - setup layout struct with the layout data and
* metadata as dictated by layout_version * metadata as dictated by layout_version

4
include/eeprom_layout.h
View file

@ -9,6 +9,8 @@
#ifndef _LAYOUT_ #ifndef _LAYOUT_
#define _LAYOUT_ #define _LAYOUT_
#include <eeprom_field.h>
#define RESERVED_FIELDS NULL #define RESERVED_FIELDS NULL
#define LAYOUT_VERSION_UNRECOGNIZED -1 #define LAYOUT_VERSION_UNRECOGNIZED -1
#define LAYOUT_VERSION_AUTODETECT -2 #define LAYOUT_VERSION_AUTODETECT -2
@ -24,6 +26,8 @@ struct eeprom_layout {
char *new_data); char *new_data);
}; };
struct eeprom_field *eeprom_layout_find_field(struct eeprom_layout *layout,
char *field_name, bool warn);
void eeprom_layout_setup(struct eeprom_layout *layout, unsigned char *buf, void eeprom_layout_setup(struct eeprom_layout *layout, unsigned char *buf,
unsigned int buf_size, int layout_version); unsigned int buf_size, int layout_version);
__weak void __eeprom_layout_assign(struct eeprom_layout *layout, __weak void __eeprom_layout_assign(struct eeprom_layout *layout,