diff options
author | Luc Verhaegen <libv@skynet.be> | 2009-06-03 14:19:33 +0000 |
---|---|---|
committer | Luc Verhaegen <libv@skynet.be> | 2009-06-03 14:19:33 +0000 |
commit | a9c5ea08d07d343d32d4c083a232107bd84d8064 (patch) | |
tree | fbe58f136039f1c35ab5fea76fcd7970b63a3a3e /src/include | |
parent | 9efecc5408cb72d5e547736cba90c1814539a10c (diff) | |
download | coreboot-staging-a9c5ea08d07d343d32d4c083a232107bd84d8064.zip coreboot-staging-a9c5ea08d07d343d32d4c083a232107bd84d8064.tar.gz |
Revert "CMOS: Add set_option and rework get_option."
This reverts commit eb7bb49eb5b48c39baf7a256b7c74e23e3da5660.
Stepan pointed out that "s" means string, which makes the following statement
in this commit message invalid: "Since we either have reserved space (which
we shouldn't do anything with in these two functions), an enum or a
hexadecimal value, unsigned int seemed like the way to go."
Signed-off-by: Luc Verhaegen <libv@skynet.be>
Acked-by: Luc Verhaegen <libv@skynet.be>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4335 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/console/console.h | 2 | ||||
-rw-r--r-- | src/include/pc80/mc146818rtc.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/include/console/console.h b/src/include/console/console.h index e10b113..ae2810c 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -26,7 +26,7 @@ struct console_driver { extern struct console_driver console_drivers[]; extern struct console_driver econsole_drivers[]; -extern unsigned int console_loglevel; +extern int console_loglevel; int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); #define printk_emerg(fmt, arg...) do_printk(BIOS_EMERG ,fmt, ##arg) diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index 9edb550..e7e13c8 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -94,9 +94,11 @@ #if !defined(ASSEMBLY) void rtc_init(int invalid); - -int get_option(char *name, unsigned int *value); -int set_option(char *name, unsigned int value); +#if USE_OPTION_TABLE == 1 +int get_option(void *dest, char *name); +#else +static inline int get_option(void *dest, char *name) { return -2; } +#endif #endif #endif /* PC80_MC146818RTC_H */ |