diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2008-03-20 20:46:44 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2008-03-20 20:46:44 +0000 |
| commit | 14a3feb0686b9c97034de828844f52c75ccc42d1 (patch) | |
| tree | a3e4a54ab6796cc60b045a8f03bf23ff5a000d7e /payloads/libpayload/i386 | |
| parent | 35845a2acb869ea028c98c8c2b912ae3c61053e2 (diff) | |
| download | coreboot-14a3feb0686b9c97034de828844f52c75ccc42d1.tar.xz | |
Fix code to allow usage of -Wall in libpayload and the sample (trivial).
This even fixes two bugs:
- get_cpu_speed() didn't return a value.
- The line
win->_color - PAIR_NUMBER(0);
should actually be
win->_color = PAIR_NUMBER(0);
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3182 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'payloads/libpayload/i386')
| -rw-r--r-- | payloads/libpayload/i386/coreboot.c | 2 | ||||
| -rw-r--r-- | payloads/libpayload/i386/main.c | 2 | ||||
| -rw-r--r-- | payloads/libpayload/i386/timer.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/payloads/libpayload/i386/coreboot.c b/payloads/libpayload/i386/coreboot.c index 0eb76dcf4b..8e4a19a5ee 100644 --- a/payloads/libpayload/i386/coreboot.c +++ b/payloads/libpayload/i386/coreboot.c @@ -83,7 +83,7 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info) for (i = 0; i < len; i += 16, ptr += 16) { header = (struct cb_header *)ptr; - if (!strncmp(header->signature, "LBIO", 4)) + if (!strncmp((const char *)header->signature, "LBIO", 4)) break; } diff --git a/payloads/libpayload/i386/main.c b/payloads/libpayload/i386/main.c index ed5c1b9e9c..c880937e98 100644 --- a/payloads/libpayload/i386/main.c +++ b/payloads/libpayload/i386/main.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include <arch/types.h> +#include <libpayload.h> /* * This structure seeds the stack. We provide the return address of our main diff --git a/payloads/libpayload/i386/timer.c b/payloads/libpayload/i386/timer.c index a787646073..e11973f2fa 100644 --- a/payloads/libpayload/i386/timer.c +++ b/payloads/libpayload/i386/timer.c @@ -62,6 +62,8 @@ unsigned int get_cpu_speed(void) * Multiply that by the number of measured clocks to get the kHz value. */ cpu_khz = (unsigned int)((end - start) * 1193180U / (1000 * 0xffff)); + + return cpu_khz; } static inline void _delay(unsigned int delta) |