2005-08-08 Hollis Blanchard <hollis@penguinppc.org>

	* term/ieee1275/ofconsole.c: Include <grub/mm.h>.
	(grub_ofconsole_getwh): Cast -1 to type grub_ieee1275_ihandle_t.
	Pass 0 as `end' parameter to grub_strtoul().

diff --git a/ChangeLog b/ChangeLog
index 60607874c4cd82b71166b42537cbb47068f13cb0..6a0b3aea328984ceab1f92a621a8a3e183066b46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-08  Hollis Blanchard  <hollis@penguinppc.org>
+
+       * term/ieee1275/ofconsole.c: Include <grub/mm.h>.
+       (grub_ofconsole_getwh): Cast -1 to type grub_ieee1275_ihandle_t.
+       Pass 0 as `end' parameter to grub_strtoul().
+
 2005-08-08  Hollis Blanchard  <hollis@penguinppc.org>
 
        * include/grub/powerpc/ieee1275/console.h: Do not include

diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 117c6313786bd626f45cf16c26de6e88e3b54649..a74fde16b164ad20dc427d10c9eccc689e12a0b8 100644 (file)
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -21,6 +21,7 @@
 #include <grub/term.h>
 #include <grub/types.h>
 #include <grub/misc.h>
+#include <grub/mm.h>
 #include <grub/machine/console.h>
 #include <grub/ieee1275/ieee1275.h>
 
@@ -219,7 +220,7 @@ grub_ofconsole_getwh (void)
   if (!w || !h)
     {
       if (! grub_ieee1275_finddevice ("/options", &options)
-         && options != -1)
+         && options != (grub_ieee1275_ihandle_t) -1)
         {
           if (! grub_ieee1275_get_property_length (options, "screen-#columns",
                                                    &lval) && lval != -1)
@@ -229,7 +230,7 @@ grub_ofconsole_getwh (void)
                 {
                   if (! grub_ieee1275_get_property (options, "screen-#columns",
                                                     val, lval, 0))
-                    w = (grub_uint8_t) grub_strtoul (val, val + lval, 10);
+                    w = (grub_uint8_t) grub_strtoul (val, 0, 10);
 
                   grub_free (val);
                 }
@@ -242,7 +243,7 @@ grub_ofconsole_getwh (void)
                 {
                   if (! grub_ieee1275_get_property (options, "screen-#rows",
                                                     val, lval, 0))
-                    h = (grub_uint8_t) grub_strtoul (val, val + lval, 10);
+                    h = (grub_uint8_t) grub_strtoul (val, 0, 10);
 
                   grub_free (val);
                 }