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

* loader/sparc64/ieee1275/linux.c: Include grub/command.h

Browse source 
(grub_rescue_cmd_linux): Rename to...
	(grub_cmd_linux): and fix prototype.
	(grub_rescue_cmd_initrd): Rename to...
	(grub_cmd_initrd): and fix prototype.
	(cmd_linux, cmd_initrd): New.
	(GRUB_MOD_INIT(linux)): Use grub_register_command().
	(GRUB_MOD_FINI(linux): Use grub_unregister_command().
This commit is contained in:
davem 2009-04-19 08:51:04 +00:00
parent 07c5039fda
commit 0552ff9f81
2 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2009-04-19 David S. Miller <davem@davemloft.net>
* loader/sparc64/ieee1275/linux.c: Include grub/command.h
(grub_rescue_cmd_linux): Rename to...
(grub_cmd_linux): and fix prototype.
(grub_rescue_cmd_initrd): Rename to...
(grub_cmd_initrd): and fix prototype.
(cmd_linux, cmd_initrd): New.
(GRUB_MOD_INIT(linux)): Use grub_register_command().
(GRUB_MOD_FINI(linux): Use grub_unregister_command().
2009-04-17 Pavel Roskin <proski@gnu.org> 2009-04-17 Pavel Roskin <proski@gnu.org>
* bus/usb/ohci.c (grub_ohci_transaction): Fix incorrect printf * bus/usb/ohci.c (grub_ohci_transaction): Fix incorrect printf

29
loader/sparc64/ieee1275/linux.c
View file

@ -27,6 +27,7 @@
#include <grub/ieee1275/ieee1275.h> #include <grub/ieee1275/ieee1275.h>
#include <grub/machine/loader.h> #include <grub/machine/loader.h>
#include <grub/gzio.h> #include <grub/gzio.h>
#include <grub/command.h>
static grub_dl_t my_mod; static grub_dl_t my_mod;
@ -281,8 +282,9 @@ grub_linux_load64 (grub_elf_t elf)
return grub_elf64_load (elf, offset_phdr, 0, 0); return grub_elf64_load (elf, offset_phdr, 0, 0);
} }
void static grub_err_t
grub_rescue_cmd_linux (int argc, char *argv[]) grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[])
{ {
grub_file_t file = 0; grub_file_t file = 0;
grub_elf_t elf = 0; grub_elf_t elf = 0;
@ -360,10 +362,13 @@ out:
initrd_addr = 0; initrd_addr = 0;
loaded = 1; loaded = 1;
} }
return grub_errno;
} }
void static grub_err_t
grub_rescue_cmd_initrd (int argc, char *argv[]) grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[])
{ {
grub_file_t file = 0; grub_file_t file = 0;
grub_ssize_t size; grub_ssize_t size;
@ -421,6 +426,8 @@ grub_rescue_cmd_initrd (int argc, char *argv[])
fail: fail:
if (file) if (file)
grub_file_close (file); grub_file_close (file);
return grub_errno;
} }
static void static void
@ -495,20 +502,22 @@ fetch_translations (void)
} }
static grub_command_t cmd_linux, cmd_initrd;
GRUB_MOD_INIT(linux) GRUB_MOD_INIT(linux)
{ {
determine_phys_base (); determine_phys_base ();
fetch_translations (); fetch_translations ();
grub_rescue_register_command ("linux", grub_rescue_cmd_linux, cmd_linux = grub_register_command ("linux", grub_cmd_linux,
"load a linux kernel"); 0, "load a linux kernel");
grub_rescue_register_command ("initrd", grub_rescue_cmd_initrd, cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
"load an initrd"); 0, "load an initrd");
my_mod = mod; my_mod = mod;
} }
GRUB_MOD_FINI(linux) GRUB_MOD_FINI(linux)
{ {
grub_rescue_unregister_command ("linux"); grub_unregister_command (cmd_linux);
grub_rescue_unregister_command ("initrd"); grub_unregister_command (cmd_initrd);
} }