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

2005-05-08 Hollis Blanchard <hollis@penguinppc.org>

Browse source 
* boot/powerpc/ieee1275/cmain.c	(module_info): Remove definition.
	(grub_ieee1275_chosen): New variable.
	(cmain): Initialize and use `grub_ieee1275_chosen' instead of
	`chosen'.
	* boot/powerpc/ieee1275/crt0.S (init_stack): Remove stack space.
	* boot/powerpc/ieee1275/ieee1275.c (grub_ieee1275_get_property):
	Rename first argument to `phandle' for consistency.
	(grub_ieee1275_get_property_length): Likewise.
	(grub_ieee1275_next_property): Likewise.  Change type of first argument
	to grub_ieee1275_phandle_t.
	* include/grub/powerpc/ieee1275/ieee1275.h (grub_ieee1275_entry_fn):
	Move export next to declaration.
	(grub_ieee1275_chosen): New variable.
	* include/grub/powerpc/ieee1275/kernel.h (GRUB_IEEE1275_MODULE_BASE):
	Correct cosmetic typo.
	* kern/powerpc/ieee1275/init.c (grub_set_prefix): Use
	`grub_ieee1275_chosen'.
	* kern/powerpc/ieee1275/openfw.c (grub_map): Likewise.
	* loader/powerpc/ieee1275/linux.c (grub_linux_boot): Likewise.
	(grub_rescue_cmd_linux): Set `initrd_addr' to 0.
	* term/powerpc/ieee1275/ofconsole.c (grub_ofconsole_refresh): Use
	`grub_ieee1275_chosen'.
This commit is contained in:
hollisb 2005-06-21 02:33:52 +00:00
parent ca5baa3fc2
commit 168d6e5810
10 changed files with 47 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

12
term/powerpc/ieee1275/ofconsole.c
View file

@ -241,23 +241,19 @@ grub_ofconsole_refresh (void)
static grub_err_t
grub_ofconsole_init (void)
{
grub_ieee1275_phandle_t chosen;
char data[4];
grub_size_t actual;
int col;
if (grub_ieee1275_finddevice ("/chosen", &chosen))
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Cannot find /chosen");
if (grub_ieee1275_get_property (chosen, "stdout", data, sizeof data,
&actual)
if (grub_ieee1275_get_property (grub_ieee1275_chosen, "stdout", data,
sizeof data, &actual)
|| actual != sizeof data)
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Cannot find stdout");
stdout_ihandle = grub_ieee1275_decode_int_4 (data);
if (grub_ieee1275_get_property (chosen, "stdin", data, sizeof data,
&actual)
if (grub_ieee1275_get_property (grub_ieee1275_chosen, "stdin", data,
sizeof data, &actual)
|| actual != sizeof data)
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Cannot find stdin");