GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/sconfig: Refactor and fix add_register() 

add_register() contained a duplicate check but only compared the new
key to the first (smallest in order) list member. Fix that and factor
the list handling out so it can be used by other functions.

Change-Id: I5a8346f36fa024351e1282c9681868ecf451b283
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41743
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nico Huber 2020-05-26 22:13:09 +02:00 committed by Patrick Georgi
parent 9b110bf97a
commit d09459fe30
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
util/sconfig/main.c
View File

@ -528,33 +528,34 @@ void add_resource(struct bus *bus, int type, int index, int base)
new_resource(bus->dev, type, index, base); new_resource(bus->dev, type, index, base);
} }
void add_register(struct chip_instance *chip_instance, char *name, char *val) static void add_reg(struct reg **const head, char *const name, char *const val)
{ {
struct reg *r = S_ALLOC(sizeof(struct reg)); struct reg *const r = S_ALLOC(sizeof(struct reg));
struct reg *prev = NULL;
struct reg *cur;
r->key = name; r->key = name;
r->value = val; r->value = val;
if (chip_instance->reg) {
struct reg *head = chip_instance->reg; for (cur = *head; cur != NULL; prev = cur, cur = cur->next) {
// sorting to be equal to sconfig's behaviour const int sort = strcmp(r->key, cur->key);
int sort = strcmp(r->key, head->key);
if (sort == 0) { if (sort == 0) {
printf("ERROR: duplicate 'register' key.\n"); printf("ERROR: duplicate 'register' key.\n");
exit(1); exit(1);
} }
if (sort < 0) { if (sort < 0)
r->next = head; break;
chip_instance->reg = r;
} else {
while ((head->next)
&& (strcmp(head->next->key, r->key) < 0))
head = head->next;
r->next = head->next;
head->next = r;
} }
} else { r->next = cur;
chip_instance->reg = r; if (prev)
prev->next = r;
else
*head = r;
} }
void add_register(struct chip_instance *chip_instance, char *name, char *val)
{
add_reg(&chip_instance->reg, name, val);
} }
void add_slot_desc(struct bus *bus, char *type, char *length, char *designation, void add_slot_desc(struct bus *bus, char *type, char *length, char *designation,