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

2008-03-05 Bean <bean123ch@gmail.com>

Browse source 
* loader/i386/pc/multiboot.c (grub_multiboot_get_bootdev): New function.
	(grub_multiboot): Set boot device.

	* boot/i386/pc/lnxboot.S (real_code_2): Set %dh to 0xFF.
This commit is contained in:
bean 2008-03-05 05:09:35 +00:00
parent 2b89344ec4
commit 38ad2cf5a5
3 changed files with 59 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-03-05 Bean <bean123ch@gmail.com>
* loader/i386/pc/multiboot.c (grub_multiboot_get_bootdev): New function.
(grub_multiboot): Set boot device.
* boot/i386/pc/lnxboot.S (real_code_2): Set %dh to 0xFF.
2008-03-02 Bean <bean123ch@gmail.com> 2008-03-02 Bean <bean123ch@gmail.com>
* fs/reiserfs.c (grub_reiserfs_read_symlink): Add 0 at the end of * fs/reiserfs.c (grub_reiserfs_read_symlink): Add 0 at the end of

4
boot/i386/pc/lnxboot.S
View file

@ -115,7 +115,7 @@ gdt_dst2:
.long 0, 0, 0, 0 /* More space for the BIOS. */ .long 0, 0, 0, 0 /* More space for the BIOS. */
reg_edx: reg_edx:
.byte 0x80, 0xFF, 0xFF, 0xFF .byte 0x80, 0, 0xFF, 0xFF
data_leng: data_leng:
.long 0 .long 0
@ -207,6 +207,8 @@ real_code_2:
movsbl (reg_edx + 2 - start), %eax movsbl (reg_edx + 2 - start), %eax
movl %eax, %ss:(DATA_ADDR + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART) movl %eax, %ss:(DATA_ADDR + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART)
movb $0xFF, %dh
ljmp $(DATA_ADDR >> 4), $0 ljmp $(DATA_ADDR >> 4), $0
/* /*

49
loader/i386/pc/multiboot.c
View file

@ -44,6 +44,7 @@
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/misc.h> #include <grub/misc.h>
#include <grub/gzio.h> #include <grub/gzio.h>
#include <grub/env.h>
extern grub_dl_t my_mod; extern grub_dl_t my_mod;
static struct grub_multiboot_info *mbi; static struct grub_multiboot_info *mbi;
@ -261,6 +262,51 @@ grub_multiboot_load_elf (grub_file_t file, void *buffer)
return grub_error (GRUB_ERR_UNKNOWN_OS, "unknown ELF class"); return grub_error (GRUB_ERR_UNKNOWN_OS, "unknown ELF class");
} }
static int
grub_multiboot_get_bootdev (grub_uint32_t *bootdev)
{
char *p;
p = grub_env_get ("root");
if ((p) && ((p[0] == 'h') || (p[0] == 'f')) && (p[1] == 'd') &&
(p[2] >= '0') && (p[2] <= '9'))
{
grub_uint32_t bd;
bd = (p[0] == 'h') ? 0x80 : 0;
bd += grub_strtoul (p + 2, &p, 0);
bd <<= 24;
if ((p) && (p[0] == ','))
{
if ((p[1] >= '0') && (p[1] <= '9'))
{
bd += ((grub_strtoul (p + 1, &p, 0) - 1) & 0xFF) << 16;
if ((p) && (p[0] == ','))
p++;
}
else
bd += 0xFF0000;
if ((p[0] >= 'a') && (p[0] <= 'z'))
bd += (p[0] - 'a') << 8;
else
bd += 0xFF00;
}
else
bd += 0xFFFF00;
bd += 0xFF;
*bootdev = bd;
return 1;
}
return 0;
}
void void
grub_multiboot (int argc, char *argv[]) grub_multiboot (int argc, char *argv[])
{ {
@ -368,6 +414,9 @@ grub_multiboot (int argc, char *argv[])
mbi->flags |= MULTIBOOT_INFO_BOOT_LOADER_NAME; mbi->flags |= MULTIBOOT_INFO_BOOT_LOADER_NAME;
mbi->boot_loader_name = (grub_uint32_t) grub_strdup (PACKAGE_STRING); mbi->boot_loader_name = (grub_uint32_t) grub_strdup (PACKAGE_STRING);
if (grub_multiboot_get_bootdev (&mbi->boot_device))
mbi->flags |= MULTIBOOT_INFO_BOOTDEV;
grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 1); grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 1);
fail: fail: