sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce warnings/errors in libpayload when using picky compiler options

Browse Source 
The new build system uses quite a few more -W flags for the compiler by
default than the old one. And that's for the better.

Change-Id: Ia8e3d28fb35c56760c2bd0983046c7067e8c5dd6
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/72
Tested-by: build bot (Jenkins)
Reviewed-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Patrick Georgi
2011-04-21 18:57:16 +02:00
committed by Uwe Hermann
parent b3db79e996
commit 7f96583f0f
20 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
payloads/libpayload/drivers/keyboard.c
View File

@@ -37,8 +37,8 @@
#define I8042_MODE_XLATE 0x40
struct layout_maps {
char *country;
unsigned short map[4][0x57];
const char *country;
const unsigned short map[4][0x57];
};
static struct layout_maps *map;
@@ -261,22 +261,22 @@ int keyboard_getchar(void)
static int keyboard_wait_read(void)
{
int timeout = 10000;
int retries = 10000;
while(timeout-- && !(inb(0x64) & 0x01))
while(retries-- && !(inb(0x64) & 0x01))
udelay(50);
return (timeout <= 0) ? -1 : 0;
return (retries <= 0) ? -1 : 0;
}
static int keyboard_wait_write(void)
{
int timeout = 10000;
int retries = 10000;
while(timeout-- && (inb(0x64) & 0x02))
while(retries-- && (inb(0x64) & 0x02))
udelay(50);
return (timeout <= 0) ? -1 : 0;
return (retries <= 0) ? -1 : 0;
}
static unsigned char keyboard_get_mode(void)

2
payloads/libpayload/drivers/serial.c
View File

@@ -195,7 +195,7 @@ int serial_getchar(void)
/* A vt100 doesn't do color, setaf/setab below are from xterm-color. */
#define VT100_SET_COLOR "\e[3%d;4%dm"
static void serial_putcmd(char *str)
static void serial_putcmd(const char *str)
{
while(*str)
serial_putchar(*(str++));

2
payloads/libpayload/drivers/usb/uhci.c
View File

@@ -65,7 +65,7 @@ static void
td_dump (td_t *td)
{
char td_value[3];
char *td_type;
const char *td_type;
switch (td->pid) {
case UHCI_SETUP:
td_type="SETUP";

12
payloads/libpayload/drivers/usb/usbhid.c
View File

@@ -62,7 +62,7 @@ static int keycount;
#define KEYBOARD_BUFFER_SIZE 16
static short keybuffer[KEYBOARD_BUFFER_SIZE];
char *countries[36][2] = {
const char *countries[36][2] = {
{ "not supported", "us" },
{ "Arabic", "ae" },
{ "Belgian", "be" },
@@ -105,13 +105,13 @@ char *countries[36][2] = {
struct layout_maps {
char *country;
short map[4][0x80];
const char *country;
const short map[4][0x80];
};
static struct layout_maps *map;
static const struct layout_maps *map;
static struct layout_maps keyboard_layouts[] = {
static const struct layout_maps keyboard_layouts[] = {
// #ifdef CONFIG_PC_KEYBOARD_LAYOUT_US
{ .country = "us", .map = {
{ /* No modifier */
@@ -378,7 +378,7 @@ static struct console_input_driver cons = {
};
int usb_hid_set_layout (char *country)
static int usb_hid_set_layout (const char *country)
{
/* FIXME should be per keyboard */
int i;