projects
/
coreboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce warnings/errors in libpayload when using picky compiler options
[coreboot.git]
/
payloads
/
libpayload
/
drivers
/
keyboard.c
diff --git
a/payloads/libpayload/drivers/keyboard.c
b/payloads/libpayload/drivers/keyboard.c
index 2b2ac2685db259bd735ac9a5a2d3c23d659e92cb..0663f47bc636f2e1acd88f0ef2aafceb118555bb 100644
(file)
--- a/
payloads/libpayload/drivers/keyboard.c
+++ b/
payloads/libpayload/drivers/keyboard.c
@@
-37,8
+37,8
@@
#define I8042_MODE_XLATE 0x40
struct layout_maps {
#define I8042_MODE_XLATE 0x40
struct layout_maps {
- char *country;
- unsigned short map[4][0x57];
+ c
onst c
har *country;
+
const
unsigned short map[4][0x57];
};
static struct layout_maps *map;
};
static struct layout_maps *map;
@@
-261,22
+261,22
@@
int keyboard_getchar(void)
static int keyboard_wait_read(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);
udelay(50);
- return (
timeout
<= 0) ? -1 : 0;
+ return (
retries
<= 0) ? -1 : 0;
}
static int keyboard_wait_write(void)
{
}
static int keyboard_wait_write(void)
{
- int
timeout
= 10000;
+ int
retries
= 10000;
- while(
timeout
-- && (inb(0x64) & 0x02))
+ while(
retries
-- && (inb(0x64) & 0x02))
udelay(50);
udelay(50);
- return (
timeout
<= 0) ? -1 : 0;
+ return (
retries
<= 0) ? -1 : 0;
}
static unsigned char keyboard_get_mode(void)
}
static unsigned char keyboard_get_mode(void)