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

libpayload: enforce const correctness for CMOS getter/setter 

Input only arguments to {get,set}_option*() should be const to catch
programming errors early.

Change-Id: I560001a8e9226dfd156a4e529fcad20549236ebd
Signed-off-by: Mathias Krause <mathias.krause@secunet.com>
Reviewed-on: http://review.coreboot.org/652
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Mathias Krause 2012-02-17 12:02:47 +01:00 committed by Stefan Reinauer
parent 334328a51f
commit d6a6eefebe
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
payloads/libpayload/drivers/options.c
View File

@ -97,7 +97,7 @@ void fix_options_checksum(void)
static int get_cmos_value(const struct nvram_accessor *nvram, u32 bitnum, u32 len, void *valptr) static int get_cmos_value(const struct nvram_accessor *nvram, u32 bitnum, u32 len, void *valptr)
{ {
u8 *value = (u8 *)valptr; u8 *value = valptr;
int offs = 0; int offs = 0;
u32 addr, bit; u32 addr, bit;
u8 reg8; u8 reg8;
@ -123,9 +123,9 @@ static int get_cmos_value(const struct nvram_accessor *nvram, u32 bitnum, u32 le
return 0; return 0;
} }
static int set_cmos_value(const struct nvram_accessor *nvram, u32 bitnum, u32 len, void *valptr) static int set_cmos_value(const struct nvram_accessor *nvram, u32 bitnum, u32 len, const void *valptr)
{ {
u8 *value = (u8 *)valptr; const u8 *value = valptr;
int offs = 0; int offs = 0;
u32 addr, bit; u32 addr, bit;
u8 reg8; u8 reg8;
@ -152,7 +152,7 @@ static int set_cmos_value(const struct nvram_accessor *nvram, u32 bitnum, u32 le
return 0; return 0;
} }
static struct cb_cmos_entries *lookup_cmos_entry(struct cb_cmos_option_table *option_table, char *name) static struct cb_cmos_entries *lookup_cmos_entry(struct cb_cmos_option_table *option_table, const char *name)
{ {
struct cb_cmos_entries *cmos_entry; struct cb_cmos_entries *cmos_entry;
int len = name ? strnlen(name, CMOS_MAX_NAME_LENGTH) : 0; int len = name ? strnlen(name, CMOS_MAX_NAME_LENGTH) : 0;
@ -186,7 +186,7 @@ struct cb_cmos_entries *next_cmos_entry(struct cb_cmos_entries *cmos_entry)
} }
/* Either value or text must be NULL. Returns the field that matches "the other" for a given config_id */ /* 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) 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)
{ {
struct cb_cmos_entries *cmos_entry; struct cb_cmos_entries *cmos_entry;
int len = strnlen(text, CMOS_MAX_TEXT_LENGTH); int len = strnlen(text, CMOS_MAX_TEXT_LENGTH);
@ -211,17 +211,17 @@ static struct cb_cmos_enums *lookup_cmos_enum_core(struct cb_cmos_option_table *
return NULL; return NULL;
} }
static struct cb_cmos_enums *lookup_cmos_enum_by_value(struct cb_cmos_option_table *option_table, int config_id, u8 *value) static struct cb_cmos_enums *lookup_cmos_enum_by_value(struct cb_cmos_option_table *option_table, int config_id, const u8 *value)
{ {
return lookup_cmos_enum_core(option_table, config_id, value, NULL); return lookup_cmos_enum_core(option_table, config_id, value, NULL);
} }
static struct cb_cmos_enums *lookup_cmos_enum_by_label(struct cb_cmos_option_table *option_table, int config_id, char *label) static struct cb_cmos_enums *lookup_cmos_enum_by_label(struct cb_cmos_option_table *option_table, int config_id, const char *label)
{ {
return lookup_cmos_enum_core(option_table, config_id, NULL, label); return lookup_cmos_enum_core(option_table, config_id, NULL, label);
} }
int get_option_with(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, void *dest, char *name) int get_option_with(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, void *dest, const char *name)
{ {
struct cb_cmos_entries *cmos_entry = lookup_cmos_entry(option_table, name); struct cb_cmos_entries *cmos_entry = lookup_cmos_entry(option_table, name);
if (cmos_entry) { if (cmos_entry) {
@ -236,17 +236,17 @@ int get_option_with(const struct nvram_accessor *nvram, struct cb_cmos_option_ta
return 1; return 1;
} }
int get_option_from(struct cb_cmos_option_table *option_table, void *dest, char *name) int get_option_from(struct cb_cmos_option_table *option_table, void *dest, const char *name)
{ {
return get_option_with(use_nvram, option_table, dest, name); return get_option_with(use_nvram, option_table, dest, name);
} }
int get_option(void *dest, char *name) int get_option(void *dest, const char *name)
{ {
return get_option_from(get_system_option_table(), dest, name); return get_option_from(get_system_option_table(), dest, name);
} }
int set_option_with(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, void *value, char *name) int set_option_with(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, const void *value, const char *name)
{ {
struct cb_cmos_entries *cmos_entry = lookup_cmos_entry(option_table, name); struct cb_cmos_entries *cmos_entry = lookup_cmos_entry(option_table, name);
if (cmos_entry) { if (cmos_entry) {
@ -257,12 +257,12 @@ int set_option_with(const struct nvram_accessor *nvram, struct cb_cmos_option_ta
return 1; return 1;
} }
int set_option(void *value, char *name) int set_option(const void *value, const char *name)
{ {
return set_option_with(use_nvram, get_system_option_table(), value, name); return set_option_with(use_nvram, get_system_option_table(), value, name);
} }
int get_option_as_string(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, char **dest, char *name) int get_option_as_string(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, char **dest, const char *name)
{ {
void *raw; void *raw;
struct cb_cmos_entries *cmos_entry = lookup_cmos_entry(option_table, name); struct cb_cmos_entries *cmos_entry = lookup_cmos_entry(option_table, name);
@ -298,7 +298,7 @@ int get_option_as_string(const struct nvram_accessor *nvram, struct cb_cmos_opti
return ret; return ret;
} }
int set_option_from_string(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, char *value, char *name) int set_option_from_string(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, const char *value, const char *name)
{ {
void *raw; void *raw;
struct cb_cmos_entries *cmos_entry = lookup_cmos_entry(option_table, name); struct cb_cmos_entries *cmos_entry = lookup_cmos_entry(option_table, name);

14
payloads/libpayload/include/libpayload.h
View File

@ -208,13 +208,13 @@ void fix_options_checksum_with(const struct nvram_accessor *nvram);
void fix_options_checksum(void); void fix_options_checksum(void);
struct cb_cmos_entries *first_cmos_entry(struct cb_cmos_option_table *option_table); struct cb_cmos_entries *first_cmos_entry(struct cb_cmos_option_table *option_table);
struct cb_cmos_entries *next_cmos_entry(struct cb_cmos_entries *cur); struct cb_cmos_entries *next_cmos_entry(struct cb_cmos_entries *cur);
int get_option_with(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, void *dest, char *name); int get_option_with(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, void *dest, const char *name);
int get_option_from(struct cb_cmos_option_table *option_table, void *dest, char *name); int get_option_from(struct cb_cmos_option_table *option_table, void *dest, const char *name);
int get_option(void *dest, char *name); int get_option(void *dest, const char *name);
int set_option_with(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, void *value, char *name); int set_option_with(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, const void *value, const char *name);
int set_option(void *value, char *name); int set_option(const void *value, const char *name);
int get_option_as_string(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, char **dest, char *name); int get_option_as_string(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, char **dest, const char *name);
int set_option_from_string(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, char *value, char *name); int set_option_from_string(const struct nvram_accessor *nvram, struct cb_cmos_option_table *option_table, const char *value, const char *name);
/** /**
* @defgroup console Console functions * @defgroup console Console functions