From d94512edee3fa0ebf426cd6f3b526d9fe1f078ad Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 1 Oct 2012 18:05:50 -0700 Subject: libpayload: Add CB_ prefixes to some constants in coreboot_tables.h. This makes their names more consistent with other constants in this header, avoids name collisions, and makes it more obvious where the names came from. Change-Id: I7b8bd4ada0fbaf049f35759a907281265f5bb2e6 Signed-off-by: Gabe Black Reviewed-on: http://review.coreboot.org/1729 Tested-by: build bot (Jenkins) Reviewed-by: Anton Kochkov --- payloads/libpayload/drivers/options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'payloads/libpayload/drivers/options.c') diff --git a/payloads/libpayload/drivers/options.c b/payloads/libpayload/drivers/options.c index d3ec137a6f..a01f977620 100644 --- a/payloads/libpayload/drivers/options.c +++ b/payloads/libpayload/drivers/options.c @@ -155,7 +155,7 @@ static int set_cmos_value(const struct nvram_accessor *nvram, u32 bitnum, u32 le static struct cb_cmos_entries *lookup_cmos_entry(struct cb_cmos_option_table *option_table, const char *name) { struct cb_cmos_entries *cmos_entry; - int len = name ? strnlen(name, CMOS_MAX_NAME_LENGTH) : 0; + int len = name ? strnlen(name, CB_CMOS_MAX_NAME_LENGTH) : 0; /* cmos entries are located right after the option table */ cmos_entry = first_cmos_entry(option_table); @@ -235,7 +235,7 @@ struct cb_cmos_enums *first_cmos_enum_of_id(struct cb_cmos_option_table *option_ /* 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, const u8 *value, const char *text) { - int len = strnlen(text, CMOS_MAX_TEXT_LENGTH); + int len = strnlen(text, CB_CMOS_MAX_TEXT_LENGTH); /* cmos enums are located after cmos entries. */ struct cb_cmos_enums *cmos_enum; -- cgit v1.2.3