From 77500b2bf007cf8e512579c3537a75004eed0831 Mon Sep 17 00:00:00 2001 From: hollisb Date: Fri, 4 Nov 2005 04:50:14 +0000 Subject: [PATCH] 2005-11-03 Hollis Blanchard * kern/powerpc/ieee1275/init.c (grub_get_rtc): Initialize `msecs' to 0. * term/ieee1275/ofconsole.c (grub_ofconsole_checkkey): Return -1 if there are no pending characters. --- ChangeLog | 7 +++++++ kern/powerpc/ieee1275/init.c | 5 ++--- term/ieee1275/ofconsole.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1df87459e..52eadd6d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-11-03 Hollis Blanchard + + * kern/powerpc/ieee1275/init.c (grub_get_rtc): Initialize `msecs' + to 0. + * term/ieee1275/ofconsole.c (grub_ofconsole_checkkey): Return -1 if + there are no pending characters. + 2005-11-03 Hollis Blanchard * kern/powerpc/ieee1275/openfw.c (grub_ieee1275_get_devname): Use diff --git a/kern/powerpc/ieee1275/init.c b/kern/powerpc/ieee1275/init.c index a7ca066ec..fcd6aba0e 100644 --- a/kern/powerpc/ieee1275/init.c +++ b/kern/powerpc/ieee1275/init.c @@ -186,10 +186,9 @@ grub_stop (void) grub_uint32_t grub_get_rtc (void) { - grub_uint32_t msecs; + grub_uint32_t msecs = 0; - if (grub_ieee1275_milliseconds (&msecs)) - return 0; + grub_ieee1275_milliseconds (&msecs); return msecs; } diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c index fc484503d..ceeaf3e69 100644 --- a/term/ieee1275/ofconsole.c +++ b/term/ieee1275/ofconsole.c @@ -189,7 +189,7 @@ grub_ofconsole_checkkey (void) return 1; } - return 0; + return -1; } static int