2005-10-01 Hollis Blanchard <hollis@penguinppc.org>
* disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Cast `size' to long. * include/grub/ieee1275/ieee1275.h (grub_ieee1275_next_property): Remove `flags' argument. All callers changed. * kern/ieee1275/ieee1275.c (IEEE1275_PHANDLE_ROOT): Removed. (IEEE1275_IHANDLE_INVALID): New variable. (IEEE1275_CELL_INVALID): New variable. (grub_ieee1275_finddevice, grub_ieee1275_get_property, grub_ieee1275_get_property_length, grub_ieee1275_instance_to_package, grub_ieee1275_package_to_path, grub_ieee1275_instance_to_path, grub_ieee1275_peer, grub_ieee1275_child, grub_ieee1275_open, grub_ieee1275_claim, grub_ieee1275_set_property): Error-check return codes from Open Firmware. All callers updated. (grub_ieee1275_next_property): Directly return Open Firmware return code. * kern/powerpc/ieee1275/cmain.c (grub_ieee1275_find_options): Standardize error checking from `grub_ieee1275_get_property'. * kern/powerpc/ieee1275/openfw.c (grub_devalias_iterate): Rename `devalias' to `aliases'. Correct comments. Consolidate error paths.
This commit is contained in:
parent
cc6d3df39e
commit
fba51f4801
6 changed files with 84 additions and 67 deletions
|
@ -28,7 +28,7 @@ static int
|
|||
grub_ofdisk_iterate (int (*hook) (const char *name))
|
||||
{
|
||||
auto int dev_iterate (struct grub_ieee1275_devalias *alias);
|
||||
|
||||
|
||||
int dev_iterate (struct grub_ieee1275_devalias *alias)
|
||||
{
|
||||
if (! grub_strcmp (alias->type, "block"))
|
||||
|
@ -130,7 +130,7 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
|
|||
|
||||
grub_dprintf ("disk",
|
||||
"Reading handle %p: sector 0x%llx, size 0x%lx, buf %p.\n",
|
||||
(void *) disk->data, sector, size, buf);
|
||||
(void *) disk->data, sector, (long) size, buf);
|
||||
|
||||
pos = sector * 512UL;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue