Remove warnings from compilation of the s2892 with and without CBFS.

I didn't try to remove "defined but not used" warnings because there are too
many ifdefs to be sure I wouldn't break something.

For shadowed variable declarations I renamed the inner-most variable.  

The one in src/pc80/keyboard.c might need help.  I didn't change the
functionality but it looks like a bug.

I boot tested it on s2892 and abuild tested it.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4240 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Myles Watson
2009-04-30 22:45:41 +00:00
parent d233f363c1
commit fa12b67771
27 changed files with 83 additions and 89 deletions

View File

@@ -112,11 +112,11 @@ static void pc_keyboard_init(struct pc_keyboard *keyboard)
outb(0x60, 0x64);
if (!kbc_input_buffer_empty()) return;
outb(0x20, 0x60); /* send cmd: enable keyboard and IRQ 1 */
u8 resend = 10;
u8 broken_resend = 10;
if ((inb(0x64) & 0x01)) {
regval = inb(0x60);
}
--resend;
--broken_resend;
} while (regval == 0xFE && resend > 0);
/* clean up any junk that might have been in the keyboard */