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

        * kern/sparc64/ieee1275/openfw.c (grub_devalias_iterate): Copy debug
        grub_dprintf() calls from here ...
        * kern/powerpc/ieee1275/openfw.c (grub_devalias_iterate): ... to here.

diff --git a/ChangeLog b/ChangeLog
index a4b7d285455dae1a2ddaaa59bf9ba43f16ef7c05..03a4dc6d3efcb8645670a5469c0520dd0c8196d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-20  Robert Millan  <rmh@aybabtu.com>
+
+       * kern/sparc64/ieee1275/openfw.c (grub_devalias_iterate): Copy debug
+       grub_dprintf() calls from here ...
+       * kern/powerpc/ieee1275/openfw.c (grub_devalias_iterate): ... to here.
+
 2008-01-20  Robert Millan  <rmh@aybabtu.com>
 
        Fix detection of "real mode" when /options/real-mode? doesn't exist.

diff --git a/kern/powerpc/ieee1275/openfw.c b/kern/powerpc/ieee1275/openfw.c
index 146c2d800d5170adbb1c8945a8a8d0791b4acaab..737ec3e7b435f9fd65f6efedac64150a4d4fddd8 100644 (file)
--- a/kern/powerpc/ieee1275/openfw.c
+++ b/kern/powerpc/ieee1275/openfw.c
@@ -103,6 +103,8 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
       /* XXX: This should be large enough for any possible case.  */
       char devtype[64];
 
+      grub_dprintf ("devalias", "devalias name = %s\n", aliasname);
+
       grub_ieee1275_get_property_length (aliases, aliasname, &pathlen);
 
       /* The property `name' is a special case we should skip.  */
@@ -115,14 +117,23 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
 
       if (grub_ieee1275_get_property (aliases, aliasname, devpath, pathlen,
                                      &actual))
-       goto nextprop;
+       {
+         grub_dprintf ("devalias", "get_property (%s) failed\n", aliasname);
+         goto nextprop;
+       }
 
       if (grub_ieee1275_finddevice (devpath, &dev))
-       goto nextprop;
+       {
+         grub_dprintf ("devalias", "finddevice (%s) failed\n", devpath);
+         goto nextprop;
+       }
 
       if (grub_ieee1275_get_property (dev, "device_type", devtype,
                                      sizeof devtype, &actual))
-       goto nextprop;
+       {
+         grub_dprintf ("devalias", "get device type failed\n");
+         goto nextprop;
+       }
 
       alias.name = aliasname;
       alias.path = devpath;