Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-28 10:10:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* include/grub/powerpc/ieee1275/ieee1275.h: Move ...
	* include/grub/ieee1275/ieee1275.h: ... to here.  All users updated.
	Move `abort', `grub_reboot', and `grub_halt' prototypes ...
	* include/grub/powerpc/ieee1275/kernel.h: ... to here.
	* commands/ieee1275/halt.c: Include <grub/machine/kernel.h> instead
	of <grub/machine/ieee1275.h>.
	* commands/ieee1275/reboot.c: Likewise.
	* boot/powerpc/ieee1275/ieee1275.c: Move ...
	* kern/ieee1275.c: ... to here.  All users updated.  Change all
	parameter structs to use new type `grub_ieee1275_cell_t'.
	* term/powerpc/ieee1275/ofconsole.c: Move ...
	* term/ieee1275/ofconsole.c: ... to here.  All users updated.
	* disk/powerpc/ieee1275/ofdisk.c: Move ...
	* disk/ieee1275/ofdisk.c: ... to here.  All users updated.
	* boot/powerpc/ieee1275/cmain.c: Change `grub_ieee1275_entry_fn' type
	to return int.
	* include/grub/i386/pc/console.h: Move to include/grub/console.h.
	Remove unused prototypes.  All users updated.
	* include/grub/powerpc/ieee1275/console.h: Removed.
	* include/grub/powerpc/ieee1275/ieee1275.h: Define
	`grub_ieee1275_cell_t'.
	* kern/powerpc/ieee1275/openfw.c: Include <grub/machine/kernel.h>.
	Cast comparisons with -1 to the correct type.
	* loader/powerpc/ieee1275/linux.c (kernel_entry_t): Change parameter
	type to match `grub_ieee1275_entry_fn'.
This commit is contained in:
hollisb committed 2005-08-03 22:53:51 +00:00
1 parent 8b5f393852
commit 3be7266d92
21 files changed
+339 -355
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

boot/powerpc/ieee1275/cmain.c
+5 -5
View File
@@ -20,12 +20,12 @@
#include <alloca.h>
#include <stdint.h>
#include <grub/machine/ieee1275.h>
#include <grub/kernel.h>
#include <grub/machine/kernel.h>
#include <grub/ieee1275/ieee1275.h>
/* OpenFirmware entry point passed to us from the real bootloader. */
intptr_t (*grub_ieee1275_entry_fn) (void *);
int (*grub_ieee1275_entry_fn) (void *);
grub_ieee1275_phandle_t grub_ieee1275_chosen;
@@ -76,7 +76,7 @@ cmain (uint32_t r3, uint32_t r4 __attribute__((unused)), uint32_t r5)
extern char _start;
extern char _end;
grub_ieee1275_entry_fn = (intptr_t (*)(void *)) r3;
grub_ieee1275_entry_fn = (int (*)(void *)) r3;
grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0);
@@ -91,7 +91,7 @@ cmain (uint32_t r3, uint32_t r4 __attribute__((unused)), uint32_t r5)
else
{
/* Assume we were entered from Open Firmware. */
grub_ieee1275_entry_fn = (intptr_t (*)(void *)) r5;
grub_ieee1275_entry_fn = (int (*)(void *)) r5;
}
grub_ieee1275_finddevice ("/chosen", &grub_ieee1275_chosen);