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

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

@ -29,9 +29,10 @@
#include <grub/setjmp.h>
#include <grub/env.h>
#include <grub/misc.h>
#include <grub/machine/init.h>
#include <grub/machine/time.h>
#include <grub/machine/kernel.h>
#include <grub/machine/console.h>
#include <grub/machine/ofdisk.h>
/* Apple OF 1.0.5 reserves 0x0 to 0x4000 for the exception handlers. */
static const grub_addr_t grub_heap_start = 0x4000;
@ -42,7 +43,7 @@ abort (void)
{
/* Trap to Open Firmware. */
asm ("trap");
for (;;);
}
@ -72,7 +73,7 @@ grub_set_prefix (void)
grub_ieee1275_finddevice ("/chosen", &chosen);
if (grub_ieee1275_get_property (chosen, "bootpath", &bootpath,
sizeof (bootpath), 0))
{
{
/* Should never happen. */
grub_printf ("/chosen/bootpath property missing!\n");
grub_env_set ("prefix", "");
@ -138,9 +139,6 @@ grub_machine_fini (void)
{
grub_ofdisk_fini ();
grub_console_fini ();
grub_ieee1275_release (grub_heap_start, grub_heap_len);
/* XXX Release memory claimed for Old World firmware. */
}
void

8
kern/powerpc/ieee1275/openfw.c
View file

@ -196,7 +196,8 @@ grub_claimmap (grub_addr_t addr, grub_size_t size)
if (grub_ieee1275_claim (addr, size, 0, 0))
return -1;
if ((! grub_ieee1275_realmode) && grub_map (addr, addr, size, 0x00))
if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_REAL_MODE)
&& grub_map (addr, addr, size, 0x00))
{
grub_printf ("map failed: address 0x%x, size 0x%x\n", addr, size);
grub_ieee1275_release (addr, size);
@ -338,7 +339,10 @@ grub_ieee1275_encode_devname (const char *path)
if (partition)
{
unsigned int partno = grub_strtoul (partition, 0, 0);
partno--; /* GRUB partition numbering is 0-based. */
/* GRUB partition numbering is 0-based. */
if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_0_BASED_PARTITIONS))
partno--;
/* Assume partno will require less than five bytes to encode. */
encoding = grub_malloc (grub_strlen (device) + 3 + 5);