diff options
author | Myles Watson <mylesgw@gmail.com> | 2009-04-30 22:45:41 +0000 |
---|---|---|
committer | Myles Watson <mylesgw@gmail.com> | 2009-04-30 22:45:41 +0000 |
commit | fa12b67771f73f0e7acf2308a13cf33b8c619884 (patch) | |
tree | 853c5b64915c1b13749561d30bbd34c8d46f1bc4 /src/pc80 | |
parent | d233f363c129dae2ba5fd7ac536cf92fb4c2dd6e (diff) | |
download | coreboot-staging-fa12b67771f73f0e7acf2308a13cf33b8c619884.zip coreboot-staging-fa12b67771f73f0e7acf2308a13cf33b8c619884.tar.gz |
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
Diffstat (limited to 'src/pc80')
-rw-r--r-- | src/pc80/keyboard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pc80/keyboard.c b/src/pc80/keyboard.c index 4009a45..325e2ea 100644 --- a/src/pc80/keyboard.c +++ b/src/pc80/keyboard.c @@ -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 */ |