2005-11-03 Hollis Blanchard <hollis@penguinppc.org>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index 1df87459e018f1f3d6e04402c0effab6cf7e0ba7..52eadd6d6c7cdc29bdc02e1f2d1d87f8da72417b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-03  Hollis Blanchard  <hollis@penguinppc.org>
+
+       * 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  <hollis@penguinppc.org>
 
        * 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 a7ca066ec61839e4336b632fd8837ded37877440..fcd6aba0e0f39104838cf06436b68432ef734b99 100644 (file)
--- 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 fc484503dd7f66d6a981fa0221a642a40a752628..ceeaf3e699d10d8b734551f1f01f97b0c32d18f2 100644 (file)
--- 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