From fe8e8d69e1f531bbbc489a73dc60407fc64a123b Mon Sep 17 00:00:00 2001 From: robertmh Date: Wed, 12 Nov 2008 20:53:48 +0000 Subject: [PATCH] 2008-11-12 Robert Millan Make loader/i386/linux.c buildable on i386-pc (although disabled). * include/grub/i386/pc/init.h: Include `'. (struct grub_machine_mmap_entry, grub_machine_mmap_iterate): Move from here ... * include/grub/i386/pc/memory.h: ... to here. --- ChangeLog | 9 +++++++++ include/grub/i386/pc/init.h | 14 +------------- include/grub/i386/pc/memory.h | 13 +++++++++++++ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f92fa62f..ddba3f052 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-11-12 Robert Millan + + Make loader/i386/linux.c buildable on i386-pc (although disabled). + + * include/grub/i386/pc/init.h: Include `'. + (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 Fix build problems on i386-ieee1275 and *-efi (introduced by vga_text diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h index 1a031db1e..f18a0dae4 100644 --- a/include/grub/i386/pc/init.h +++ b/include/grub/i386/pc/init.h @@ -21,6 +21,7 @@ #include #include +#include /* Get the memory size in KB. If EXTENDED is zero, return conventional 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. */ 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 the end. */ grub_uint32_t EXPORT_FUNC(grub_get_mmap_entry) (struct grub_machine_mmap_entry *entry, 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. */ void grub_gate_a20 (int on); diff --git a/include/grub/i386/pc/memory.h b/include/grub/i386/pc/memory.h index a3e3ed793..6a4830788 100644 --- a/include/grub/i386/pc/memory.h +++ b/include/grub/i386/pc/memory.h @@ -84,6 +84,19 @@ extern grub_size_t EXPORT_VAR(grub_lower_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 /* ! GRUB_MEMORY_MACHINE_HEADER */