diff options
author | Patrick Georgi <patrick@georgi-clan.de> | 2011-04-21 18:57:16 +0200 |
---|---|---|
committer | Uwe Hermann <uwe@hermann-uwe.de> | 2011-06-30 20:41:23 +0200 |
commit | 7f96583f0f6b9829f73fb8afbb6f367323446030 (patch) | |
tree | 4c26b124a3c077cf1419f143bf29e89ea2d528e2 /payloads/libpayload/drivers/keyboard.c | |
parent | b3db79e9965cb290615a02b324648bc64f805660 (diff) |
Reduce warnings/errors in libpayload when using picky compiler options
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>
Diffstat (limited to 'payloads/libpayload/drivers/keyboard.c')
-rw-r--r-- | payloads/libpayload/drivers/keyboard.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c index 2b2ac2685d..0663f47bc6 100644 --- a/payloads/libpayload/drivers/keyboard.c +++ b/payloads/libpayload/drivers/keyboard.c @@ -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) |