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

2008-11-12 Robert Millan <rmh@aybabtu.com>

Browse source 
Make loader/i386/linux.c buildable on i386-pc (although disabled).

        * include/grub/i386/pc/init.h: Include `<grub/machine/memory.h>'.
        (struct grub_machine_mmap_entry, grub_machine_mmap_iterate): Move
        from here ...
        * include/grub/i386/pc/memory.h: ... to here.
This commit is contained in:
robertmh 2008-11-12 20:53:48 +00:00
parent 976b07d044
commit fe8e8d69e1
3 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-11-12 Robert Millan <rmh@aybabtu.com>
Make loader/i386/linux.c buildable on i386-pc (although disabled).
* include/grub/i386/pc/init.h: Include `<grub/machine/memory.h>'.
(struct grub_machine_mmap_entry, grub_machine_mmap_iterate): Move
from here ...
* include/grub/i386/pc/memory.h: ... to here.
2008-11-12 Robert Millan <rmh@aybabtu.com> 2008-11-12 Robert Millan <rmh@aybabtu.com>
Fix build problems on i386-ieee1275 and *-efi (introduced by vga_text Fix build problems on i386-ieee1275 and *-efi (introduced by vga_text

14
include/grub/i386/pc/init.h
View file

@ -21,6 +21,7 @@
#include <grub/types.h> #include <grub/types.h>
#include <grub/symbol.h> #include <grub/symbol.h>
#include <grub/machine/memory.h>
/* Get the memory size in KB. If EXTENDED is zero, return conventional /* Get the memory size in KB. If EXTENDED is zero, return conventional
memory, otherwise return extended memory. */ memory, otherwise return extended memory. */
@ -30,24 +31,11 @@ grub_uint16_t grub_get_memsize (int extended);
in 1KB parts, and upper 16 bits are above 16MB in 64KB parts. */ in 1KB parts, and upper 16 bits are above 16MB in 64KB parts. */
grub_uint32_t grub_get_eisa_mmap (void); grub_uint32_t grub_get_eisa_mmap (void);
struct grub_machine_mmap_entry
{
grub_uint32_t size;
grub_uint64_t addr;
grub_uint64_t len;
#define GRUB_MACHINE_MEMORY_AVAILABLE 1
#define GRUB_MACHINE_MEMORY_RESERVED 2
grub_uint32_t type;
} __attribute__((packed));
/* Get a memory map entry. Return next continuation value. Zero means /* Get a memory map entry. Return next continuation value. Zero means
the end. */ the end. */
grub_uint32_t EXPORT_FUNC(grub_get_mmap_entry) (struct grub_machine_mmap_entry *entry, grub_uint32_t EXPORT_FUNC(grub_get_mmap_entry) (struct grub_machine_mmap_entry *entry,
grub_uint32_t cont); grub_uint32_t cont);
void EXPORT_FUNC(grub_machine_mmap_iterate)
(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
/* Turn on/off Gate A20. */ /* Turn on/off Gate A20. */
void grub_gate_a20 (int on); void grub_gate_a20 (int on);

13
include/grub/i386/pc/memory.h
View file

@ -84,6 +84,19 @@ extern grub_size_t EXPORT_VAR(grub_lower_mem);
extern grub_size_t EXPORT_VAR(grub_upper_mem); extern grub_size_t EXPORT_VAR(grub_upper_mem);
struct grub_machine_mmap_entry
{
grub_uint32_t size;
grub_uint64_t addr;
grub_uint64_t len;
#define GRUB_MACHINE_MEMORY_AVAILABLE 1
#define GRUB_MACHINE_MEMORY_RESERVED 2
grub_uint32_t type;
} __attribute__((packed));
void EXPORT_FUNC(grub_machine_mmap_iterate)
(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
#endif #endif
#endif /* ! GRUB_MEMORY_MACHINE_HEADER */ #endif /* ! GRUB_MEMORY_MACHINE_HEADER */