vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2005-10-01 Hollis Blanchard <hollis@penguinppc.org>

Browse source 
* 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:
hollisb 2006-10-01 08:30:09 +00:00
parent cc6d3df39e
commit fba51f4801
6 changed files with 84 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kern/powerpc/ieee1275/cmain.c
View file

@ -51,19 +51,18 @@ grub_ieee1275_find_options (void)
{
grub_ieee1275_phandle_t options;
grub_ieee1275_phandle_t openprom;
int realmode;
int smartfw;
int rc;
int realmode = 0;
grub_ieee1275_finddevice ("/options", &options);
grub_ieee1275_get_property (options, "real-mode?", &realmode,
sizeof (realmode), 0);
if (realmode)
rc = grub_ieee1275_get_property (options, "real-mode?", &realmode,
sizeof realmode, 0);
if ((rc >= 0) && realmode)
grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_REAL_MODE);
grub_ieee1275_finddevice ("/openprom", &openprom);
smartfw = grub_ieee1275_get_property (openprom, "SmartFirmware-version",
0, 0, 0);
if (smartfw != -1)
rc = grub_ieee1275_get_property (openprom, "SmartFirmware-version", 0, 0, 0);
if (rc >= 0)
grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_0_BASED_PARTITIONS);
}