libpayload: code cosmetics

[coreboot.git] / payloads / libpayload / drivers / options.c

diff --git a/payloads/libpayload/drivers/options.c b/payloads/libpayload/drivers/options.c
index 1b98cda7218baed968a4936db7bcc2e31ff645ea..7c762516f52e341045c753b3a65353be83c13784 100644 (file)
--- a/payloads/libpayload/drivers/options.c
+++ b/payloads/libpayload/drivers/options.c
@@ -171,6 +171,20 @@ static struct cb_cmos_entries *lookup_cmos_entry(struct cb_cmos_option_table *op
        return NULL;
 }
 
+struct cb_cmos_entries *first_cmos_entry(struct cb_cmos_option_table *option_table)
+{
+       return lookup_cmos_entry(option_table, "");
+}
+
+struct cb_cmos_entries *next_cmos_entry(struct cb_cmos_entries *cmos_entry)
+{
+       struct cb_cmos_entries *next = (struct cb_cmos_entries*)((unsigned char *)cmos_entry + cmos_entry->size);
+       if (next->tag == CB_TAG_OPTION)
+               return next;
+       else
+               return NULL;
+}
+
 /* Either value or text must be NULL. Returns the field that matches "the other" for a given config_id */
 static struct cb_cmos_enums *lookup_cmos_enum_core(struct cb_cmos_option_table *option_table, int config_id, u8 *value, char *text)
 {
@@ -278,7 +292,7 @@ int get_option_as_string(const struct nvram_accessor *nvram, struct cb_cmos_opti
                        *dest = strdup((const char*)cmos_enum->text);
                        break;
                default: /* fail */
-                       return 1;
+                       ret = 1;
        }
        free(raw);
        return ret;
@@ -295,7 +309,7 @@ int set_option_from_string(const struct nvram_accessor *nvram, struct cb_cmos_op
        switch (cmos_entry->config) {
                case 'h':
                        /* only works on little endian */
-                       raw = malloc(8);
+                       raw = malloc(sizeof(u64));
                        *(u64*)raw = strtoull(value, NULL, 0);
                        break;
                case 's':