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

2005-04-30 Hollis Blanchard <hollis@penguinppc.org>

Browse source 
* boot/powerpc/ieee1275/cmain.c: Don't include grub/machine/init.h.
	(roundup): Remove macro.
	(grub_ieee1275_flags): Make static.
	(grub_ieee1275_realmode): Remove.
	(grub_ieee1275_test_flag): New function.
	(grub_ieee1275_set_flag): Likewise.
	(find_options): Rename to `grub_ieee1275_find_options'; update
	callers. Set GRUB_IEEE1275_FLAG_REAL_MODE and
	GRUB_IEEE1275_FLAG_0_BASED_PARTITIONS.
	(cmain): New prototype.
	(cmain): Use `grub_ieee1275_set_flag' instead of accessing
	`grub_ieee1275_flags' directly.
	* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Remove
	machine/biosdisk.h.
	* disk/powerpc/ieee1275/ofdisk.c: Include grub/machine/ofdisk.h.
	Don't include grub/machine/init.h.
	(grub_ofdisk_open): Call `grub_ieee1275_test_flag'.
	* include/grub/powerpc/ieee1275/ieee1275.h (grub_ieee1275_flags):
	Remove prototype.
	(grub_ieee1275_realmode): Likewise.
	(grub_ieee1275_flag): New enum.
	(grub_ieee1275_test_flag): New prototype.
	(grub_ieee1275_set_flag): New prototype.
	* include/grub/powerpc/ieee1275/init.h: Remove file.
	* include/grub/powerpc/ieee1275/ofdisk.h: New file.
	* kern/powerpc/ieee1275/init.c: Don't include grub/machine/init.h.
	Include grub/machine/console.h.  Include grub/machine/ofdisk.h.
	(grub_machine_fini): Don't call `grub_ieee1275_release'.  Remove
	comment.
	* kern/powerpc/ieee1275/openfw.c (grub_claimmap): Call
	`grub_ieee1275_test_flag'.
	(grub_ieee1275_encode_devname): Likewise.
This commit is contained in:
hollisb 2005-05-01 03:45:36 +00:00
parent ed16607e13
commit f4c5e67ca4
9 changed files with 105 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
disk/powerpc/ieee1275/ofdisk.c
View file

@ -22,7 +22,7 @@
#include <grub/disk.h>
#include <grub/mm.h>
#include <grub/machine/ieee1275.h>
#include <grub/machine/init.h>
#include <grub/machine/ofdisk.h>
static int
grub_ofdisk_iterate (int (*hook) (const char *name))
@ -60,7 +60,7 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
return grub_errno;
/* To access the complete disk add `:0'. */
if (! (grub_ieee1275_flags & GRUB_IEEE1275_NO_PARTITION_0))
if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
grub_strcat (devpath, ":0");
grub_ieee1275_open (devpath, &dev_ihandle);