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.
This commit is contained in:
parent
0bf74728de
commit
3d7f54c94d
2 changed files with 20 additions and 3 deletions
|
@ -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>
|
2008-01-20 Robert Millan <rmh@aybabtu.com>
|
||||||
|
|
||||||
Fix detection of "real mode" when /options/real-mode? doesn't exist.
|
Fix detection of "real mode" when /options/real-mode? doesn't exist.
|
||||||
|
|
|
@ -103,6 +103,8 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
|
||||||
/* XXX: This should be large enough for any possible case. */
|
/* XXX: This should be large enough for any possible case. */
|
||||||
char devtype[64];
|
char devtype[64];
|
||||||
|
|
||||||
|
grub_dprintf ("devalias", "devalias name = %s\n", aliasname);
|
||||||
|
|
||||||
grub_ieee1275_get_property_length (aliases, aliasname, &pathlen);
|
grub_ieee1275_get_property_length (aliases, aliasname, &pathlen);
|
||||||
|
|
||||||
/* The property `name' is a special case we should skip. */
|
/* 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,
|
if (grub_ieee1275_get_property (aliases, aliasname, devpath, pathlen,
|
||||||
&actual))
|
&actual))
|
||||||
goto nextprop;
|
{
|
||||||
|
grub_dprintf ("devalias", "get_property (%s) failed\n", aliasname);
|
||||||
|
goto nextprop;
|
||||||
|
}
|
||||||
|
|
||||||
if (grub_ieee1275_finddevice (devpath, &dev))
|
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,
|
if (grub_ieee1275_get_property (dev, "device_type", devtype,
|
||||||
sizeof devtype, &actual))
|
sizeof devtype, &actual))
|
||||||
goto nextprop;
|
{
|
||||||
|
grub_dprintf ("devalias", "get device type failed\n");
|
||||||
|
goto nextprop;
|
||||||
|
}
|
||||||
|
|
||||||
alias.name = aliasname;
|
alias.name = aliasname;
|
||||||
alias.path = devpath;
|
alias.path = devpath;
|
||||||
|
|
Loading…
Add table
Reference in a new issue