2008-01-19 Robert Millan <rmh@aybabtu.com>

        Get rid of confusing function (superceeded by
        `grub_ieee1275_get_integer_property')
        * include/grub/ieee1275/ieee1275.h (grub_ieee1275_decode_int_4): Remove
        prototype.
        * kern/ieee1275/ieee1275.c (grub_ieee1275_decode_int_4): Remove
        function.
        * term/ieee1275/ofconsole.c (grub_ofconsole_init): Avoid use of
        grub_ieee1275_decode_int_4(), by obtaining integer properties directly
        in native endianess from grub_ieee1275_get_integer_property().

diff --git a/ChangeLog b/ChangeLog
index dfec837cea9010f22e1805125815c612ca530040..4c9bc34bc37a6de9eaadd2bc5613bba0b9d136e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-19  Robert Millan  <rmh@aybabtu.com>
+
+       Get rid of confusing function (superceeded by
+       `grub_ieee1275_get_integer_property')
+       * include/grub/ieee1275/ieee1275.h (grub_ieee1275_decode_int_4): Remove
+       prototype.
+       * kern/ieee1275/ieee1275.c (grub_ieee1275_decode_int_4): Remove
+       function.
+       * term/ieee1275/ofconsole.c (grub_ofconsole_init): Avoid use of
+       grub_ieee1275_decode_int_4(), by obtaining integer properties directly
+       in native endianess from grub_ieee1275_get_integer_property().
+
 2008-01-19  Robert Millan  <rmh@aybabtu.com>
 
        * kern/powerpc/ieee1275/openfw.c (grub_halt): Issue "power-off"

diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index 57285d8012f7efc1a49d25fd6de485647988eef5..94e8151f8020ba7cd2d37284a2638291fc86e495 100644 (file)
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -90,7 +90,6 @@ extern void EXPORT_FUNC(grub_ieee1275_set_flag) (enum grub_ieee1275_flag flag);
 \f
 
 
-grub_uint32_t EXPORT_FUNC(grub_ieee1275_decode_int_4) (unsigned char *p);
 int EXPORT_FUNC(grub_ieee1275_finddevice) (char *name,
                                           grub_ieee1275_phandle_t *phandlep);
 int EXPORT_FUNC(grub_ieee1275_get_property) (grub_ieee1275_phandle_t phandle,

diff --git a/kern/ieee1275/ieee1275.c b/kern/ieee1275/ieee1275.c
index 69233ccd40eee6927376f8af3fa7953d64f97838..1769c0ab035e9388ba291b7787995cb58ee7d40f 100644 (file)
--- a/kern/ieee1275/ieee1275.c
+++ b/kern/ieee1275/ieee1275.c
@@ -26,16 +26,6 @@
 
 \f
 
-/* FIXME is this function needed? */
-grub_uint32_t
-grub_ieee1275_decode_int_4 (unsigned char *p)
-{
-  grub_uint32_t val = (*p++ << 8);
-  val = (val + *p++) << 8;
-  val = (val + *p++) << 8;
-  return (val + *p);
-}
-
 int
 grub_ieee1275_finddevice (char *name, grub_ieee1275_phandle_t *phandlep)
 {

diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 845f198fd42d02f9d789ecaadc50d3cfc1f50c8b..f11d476e38b77b9c5389c2a8a3e15ea582c9905b 100644 (file)
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -313,7 +313,6 @@ grub_ofconsole_refresh (void)
 static grub_err_t
 grub_ofconsole_init (void)
 {
-  unsigned char data[4];
   grub_ssize_t actual;
   int col;
 
@@ -323,20 +322,16 @@ grub_ofconsole_init (void)
   if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_BROKEN_OUTPUT))
     grub_ieee1275_interpret ("output-device output", 0);
 
-  if (grub_ieee1275_get_property (grub_ieee1275_chosen, "stdout", data,
-                                 sizeof data, &actual)
-      || actual != sizeof data)
+  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "stdout", &stdout_ihandle,
+                                         sizeof stdout_ihandle, &actual)
+      || actual != sizeof stdout_ihandle)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Cannot find stdout");
 
-  stdout_ihandle = grub_ieee1275_decode_int_4 (data);
-  
-  if (grub_ieee1275_get_property (grub_ieee1275_chosen, "stdin", data,
-                                 sizeof data, &actual)
-      || actual != sizeof data)
+  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "stdin", &stdin_ihandle,
+                                         sizeof stdin_ihandle, &actual)
+      || actual != sizeof stdin_ihandle)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Cannot find stdin");
 
-  stdin_ihandle = grub_ieee1275_decode_int_4 (data);
-
   /* Initialize colors.  */
   for (col = 0; col < 7; col++)
     grub_ieee1275_set_color (stdout_ihandle, col, colors[col].red,