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

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

Browse source 
* kern/ieee1275/ieee1275.c (grub_ieee1275_instance_to_path): Rename
	`instance_to_package_args' to `instance_to_path_args'.

	* kern/powerpc/ieee1275/init.c (grub_machine_init): Use
	`grub_ieee1275_chosen'.

	* term/ieee1275/ofconsole.c (grub_ofconsole_init): Call
	`grub_ieee1275_interpret'.
This commit is contained in:
hollisb 2006-10-01 06:45:53 +00:00
parent 02bb8accd5
commit cc6d3df39e
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2005-10-01 Hollis Blanchard <hollis@penguinppc.org>
* kern/ieee1275/ieee1275.c (grub_ieee1275_instance_to_path): Rename
`instance_to_package_args' to `instance_to_path_args'.
* kern/powerpc/ieee1275/init.c (grub_machine_init): Use
`grub_ieee1275_chosen'.
* term/ieee1275/ofconsole.c (grub_ofconsole_init): Call
`grub_ieee1275_interpret'.
2005-09-25 Hollis Blanchard <hollis@penguinppc.org> 2005-09-25 Hollis Blanchard <hollis@penguinppc.org>
* util/powerpc/ieee1275/grub-mkimage.c: Include config.h. * util/powerpc/ieee1275/grub-mkimage.c: Include config.h.

2
kern/ieee1275/ieee1275.c
View file

@ -190,7 +190,7 @@ grub_ieee1275_instance_to_path (grub_ieee1275_ihandle_t ihandle,
char *path, grub_size_t len, char *path, grub_size_t len,
grub_ssize_t *actual) grub_ssize_t *actual)
{ {
struct instance_to_package_args struct instance_to_path_args
{ {
struct grub_ieee1275_common_hdr common; struct grub_ieee1275_common_hdr common;
grub_ieee1275_ihandle_t ihandle; grub_ieee1275_ihandle_t ihandle;

4
kern/powerpc/ieee1275/init.c
View file

@ -116,7 +116,6 @@ void
grub_machine_init (void) grub_machine_init (void)
{ {
char args[256]; char args[256];
grub_ieee1275_phandle_t chosen;
int actual; int actual;
extern char _start; extern char _start;
@ -137,8 +136,7 @@ grub_machine_init (void)
grub_ofdisk_init (); grub_ofdisk_init ();
/* Process commandline. */ /* Process commandline. */
grub_ieee1275_finddevice ("/chosen", &chosen); if (grub_ieee1275_get_property (grub_ieee1275_chosen, "bootargs", &args,
if (grub_ieee1275_get_property (chosen, "bootargs", &args,
sizeof args, &actual) == 0 sizeof args, &actual) == 0
&& actual > 1) && actual > 1)
{ {

4
term/ieee1275/ofconsole.c
View file

@ -311,6 +311,10 @@ grub_ofconsole_init (void)
grub_ssize_t actual; grub_ssize_t actual;
int col; int col;
/* The latest PowerMacs don't actually initialize the screen for us, so we
* use this trick to re-open the output device. */
grub_ieee1275_interpret ("output-device output", 0);
if (grub_ieee1275_get_property (grub_ieee1275_chosen, "stdout", data, if (grub_ieee1275_get_property (grub_ieee1275_chosen, "stdout", data,
sizeof data, &actual) sizeof data, &actual)
|| actual != sizeof data) || actual != sizeof data)