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
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 8d28c2d..aa3f07d 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -61,7 +61,7 @@
INCLUDES := -I./include
INCLUDES += -I$(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include
-CFLAGS := -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES)
+CFLAGS := -Wall -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES)
libpayload.a: $(TARGETS-y)
$(AR) rc $@ $(TARGETS-y)
diff --git a/payloads/libpayload/curses/colors.c b/payloads/libpayload/curses/colors.c
index 3409149..5065f5c 100644
--- a/payloads/libpayload/curses/colors.c
+++ b/payloads/libpayload/curses/colors.c
@@ -57,4 +57,6 @@
*bg = (color_pairs[index] >> 4) & 0xF;
*fg = color_pairs[index] & 0xF;
+
+ return 0;
}
diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c
index 3ec4d9d..2062ac2 100644
--- a/payloads/libpayload/curses/keyboard.c
+++ b/payloads/libpayload/curses/keyboard.c
@@ -268,6 +268,7 @@
int nodelay(WINDOW *win, NCURSES_BOOL flag)
{
win->_delay = flag ? 0 : -1;
+ return 0;
}
#ifdef CONFIG_VGA_CONSOLE
diff --git a/payloads/libpayload/curses/tinycurses.c b/payloads/libpayload/curses/tinycurses.c
index 946cdeb..f9c0798 100644
--- a/payloads/libpayload/curses/tinycurses.c
+++ b/payloads/libpayload/curses/tinycurses.c
@@ -145,7 +145,7 @@
}
WINDOW *derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
{
- WINDOW *win;
+ WINDOW *win = NULL;
int i;
int flags = _SUBWIN;
@@ -167,6 +167,7 @@
if (orig->_flags & _ISPAD)
flags |= _ISPAD;
+ // FIXME
//// if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy,
//// orig->_begx + begx, flags)) == 0)
//// return NULL;
@@ -308,8 +309,8 @@
win->_line = &ldat_list[ldat_count++];
- /* FIXME: Is this right? Should the window attributes be normal? */
- win->_color - PAIR_NUMBER(0);
+ /* FIXME: Is this right? Should the window attributes be normal? */
+ win->_color = PAIR_NUMBER(0);
win->_attrs = A_NORMAL;
for (i = 0; i < num_lines; i++)
diff --git a/payloads/libpayload/drivers/vga.c b/payloads/libpayload/drivers/vga.c
index fd1dd35..1c13159 100644
--- a/payloads/libpayload/drivers/vga.c
+++ b/payloads/libpayload/drivers/vga.c
@@ -184,7 +184,7 @@
vga_fixup_cursor();
}
-int vga_move_cursor(int x, int y)
+void vga_move_cursor(int x, int y)
{
cursorx = x;
cursory = y;
diff --git a/payloads/libpayload/i386/coreboot.c b/payloads/libpayload/i386/coreboot.c
index 0eb76dc..8e4a19a 100644
--- a/payloads/libpayload/i386/coreboot.c
+++ b/payloads/libpayload/i386/coreboot.c
@@ -83,7 +83,7 @@
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 ed5c1b9..c880937 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 a787646..e11973f 100644
--- a/payloads/libpayload/i386/timer.c
+++ b/payloads/libpayload/i386/timer.c
@@ -62,6 +62,8 @@
* 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)
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 4815008..d1ca842 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -59,7 +59,7 @@
void vga_clear(void);
void vga_putc(uint8_t row, uint8_t col, unsigned int c);
void vga_putchar(unsigned int ch);
-int vga_move_cursor(int x, int y);
+void vga_move_cursor(int x, int y);
void vga_init(void);
/* libc/console.c */
diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile
index 9ab3249..1daea5f 100644
--- a/payloads/libpayload/sample/Makefile
+++ b/payloads/libpayload/sample/Makefile
@@ -37,7 +37,7 @@
LIBPAYLOAD = ../libpayload.a
LIBGCC := $(shell $(CC) $(CROSS_CFLAGS) -print-libgcc-file-name)
-CFLAGS := -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES)
+CFLAGS := -Wall -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES)
all: hello.elf