X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=payloads%2Flibpayload%2Fdrivers%2Fkeyboard.c;h=0663f47bc636f2e1acd88f0ef2aafceb118555bb;hb=7f96583f0f6b9829f73fb8afbb6f367323446030;hp=2b2ac2685db259bd735ac9a5a2d3c23d659e92cb;hpb=b3db79e9965cb290615a02b324648bc64f805660;p=coreboot.git

diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c
index 2b2ac2685..0663f47bc 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)