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

2008-01-16 Robert Millan <rmh@aybabtu.com>

Browse source 
* include/grub/i386/linuxbios/memory.h
        (GRUB_MEMORY_MACHINE_LINUXBIOS_TABLE_ADDR): Remove macro.
        * kern/i386/linuxbios/table.c (grub_linuxbios_table_iterate): Do not
        receive `table_header' as argument.  Instead, probe for it in the
        known memory ranges where it can be present.
        (grub_available_iterate): Do not pass a fixed `table_header' address
        to grub_linuxbios_table_iterate().
This commit is contained in:
robertmh 2008-01-16 21:03:07 +00:00
parent 58ec9deb2a
commit 1210e168fe
3 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-01-16 Robert Millan <rmh@aybabtu.com>
* include/grub/i386/linuxbios/memory.h
(GRUB_MEMORY_MACHINE_LINUXBIOS_TABLE_ADDR): Remove macro.
* kern/i386/linuxbios/table.c (grub_linuxbios_table_iterate): Do not
receive `table_header' as argument. Instead, probe for it in the
known memory ranges where it can be present.
(grub_available_iterate): Do not pass a fixed `table_header' address
to grub_linuxbios_table_iterate().
2008-01-15 Robert Millan <rmh@aybabtu.com> 2008-01-15 Robert Millan <rmh@aybabtu.com>
* configure.ac: Add `i386-ieee1275' to the list of supported targets. * configure.ac: Add `i386-ieee1275' to the list of supported targets.

2
include/grub/i386/linuxbios/memory.h
View file

@ -28,8 +28,6 @@
#include <grub/err.h> #include <grub/err.h>
#endif #endif
#define GRUB_MEMORY_MACHINE_LINUXBIOS_TABLE_ADDR 0x500
#define GRUB_MEMORY_MACHINE_LOWER_USABLE 0x9fc00 /* 640 kiB - 1 kiB */ #define GRUB_MEMORY_MACHINE_LOWER_USABLE 0x9fc00 /* 640 kiB - 1 kiB */
#define GRUB_MEMORY_MACHINE_LOWER_SIZE 0xf0000 /* 960 kiB */ #define GRUB_MEMORY_MACHINE_LOWER_SIZE 0xf0000 /* 960 kiB */

33
kern/i386/linuxbios/table.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2007 Free Software Foundation, Inc. * Copyright (C) 2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -21,13 +21,33 @@
#include <grub/err.h> #include <grub/err.h>
static grub_err_t static grub_err_t
grub_linuxbios_table_iterate (grub_linuxbios_table_header_t table_header, grub_linuxbios_table_iterate (int (*hook) (grub_linuxbios_table_item_t))
int (*hook) (grub_linuxbios_table_item_t))
{ {
grub_linuxbios_table_header_t table_header;
grub_linuxbios_table_item_t table_item; grub_linuxbios_table_item_t table_item;
if (grub_memcmp (table_header->signature, "LBIO", 4)) auto int check_signature (grub_linuxbios_table_header_t);
grub_fatal ("Could not find LinuxBIOS table\n"); int check_signature (grub_linuxbios_table_header_t table_header)
{
if (! grub_memcmp (table_header->signature, "LBIO", 4))
return 1;
return 0;
}
/* Assuming table_header is aligned to its size (8 bytes). */
for (table_header = 0x500; table_header < 0x1000; table_header++)
if (check_signature (table_header))
goto signature_found;
for (table_header = 0xf0000; table_header < 0x100000; table_header++)
if (check_signature (table_header))
goto signature_found;
grub_fatal ("Could not find coreboot table\n");
signature_found:
table_item = table_item =
(grub_linuxbios_table_item_t) ((long) table_header + (grub_linuxbios_table_item_t) ((long) table_header +
@ -62,8 +82,7 @@ grub_available_iterate (int (*hook) (mem_region_t))
return 0; return 0;
} }
grub_linuxbios_table_iterate (GRUB_MEMORY_MACHINE_LINUXBIOS_TABLE_ADDR, grub_linuxbios_table_iterate (iterate_linuxbios_table);
iterate_linuxbios_table);
return 0; return 0;
} }