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

2007-10-22 Robert Millan <rmh@aybabtu.com>

Browse source 
* conf/i386-pc.rmk (kernel_img_SOURCES): Remove `disk/i386/pc/biosdisk.c'.
	(pkgdata_MODULES): Add `biosdisk.mod'.
	(biosdisk_mod_SOURCES, biosdisk_mod_CFLAGS, biosdisk_mod_LDFLAGS): New
	variables.

	* disk/i386/pc/biosdisk.c: Include `<grub/dl.h>'.
	(grub_biosdisk_init): Replace with ...
	(GRUB_MOD_INIT(biosdisk)): ... this.
	(grub_biosdisk_fini): Replace with ...
	(GRUB_MOD_FINI(biosdisk)): ... this.

	* kern/i386/pc/init.c: Remove `<grub/machine/biosdisk.h>'.
	(grub_machine_init): Remove call to grub_biosdisk_init().
	(grub_machine_fini): Remove call to grub_machine_fini().

	* util/i386/pc/grub-install.in (modules): Add `biosdisk'.
This commit is contained in:
robertmh 2007-10-22 20:05:27 +00:00
parent 46e5e5cb89
commit 73fcb0f38d
6 changed files with 87 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kern/i386/pc/init.c
View file

@ -21,7 +21,6 @@
#include <grub/machine/init.h>
#include <grub/machine/memory.h>
#include <grub/machine/console.h>
#include <grub/machine/biosdisk.h>
#include <grub/machine/kernel.h>
#include <grub/types.h>
#include <grub/err.h>
@ -233,9 +232,6 @@ grub_machine_init (void)
if (! grub_os_area_addr)
grub_fatal ("no upper memory");
/* The memory system was initialized, thus register built-in devices. */
grub_biosdisk_init ();
}
void
@ -248,7 +244,6 @@ grub_machine_set_prefix (void)
void
grub_machine_fini (void)
{
grub_biosdisk_fini ();
grub_console_fini ();
}