[1913] 2008-11-12 Robert Millan <address@hidden>

[Robert Millan]

Revision: 1913
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1913
Author:   robertmh
Date:     2008-11-12 20:53:48 +0000 (Wed, 12 Nov 2008)

Log Message:
-----------
2008-11-12  Robert Millan  <address@hidden>

        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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/include/grub/i386/pc/init.h
    trunk/grub2/include/grub/i386/pc/memory.h

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-11-12 17:43:39 UTC (rev 1912)
+++ trunk/grub2/ChangeLog       2008-11-12 20:53:48 UTC (rev 1913)
@@ -1,5 +1,14 @@
 2008-11-12  Robert Millan  <address@hidden>
 
+       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  <address@hidden>
+
        Fix build problems on i386-ieee1275 and *-efi (introduced by vga_text
        split).
 

Modified: trunk/grub2/include/grub/i386/pc/init.h
===================================================================
--- trunk/grub2/include/grub/i386/pc/init.h     2008-11-12 17:43:39 UTC (rev 
1912)
+++ trunk/grub2/include/grub/i386/pc/init.h     2008-11-12 20:53:48 UTC (rev 
1913)
@@ -21,6 +21,7 @@
 
 #include <grub/types.h>
 #include <grub/symbol.h>
+#include <grub/machine/memory.h>
 
 /* Get the memory size in KB. If EXTENDED is zero, return conventional
    memory, otherwise return extended memory.  */
@@ -30,24 +31,11 @@
    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);
 

Modified: trunk/grub2/include/grub/i386/pc/memory.h
===================================================================
--- trunk/grub2/include/grub/i386/pc/memory.h   2008-11-12 17:43:39 UTC (rev 
1912)
+++ trunk/grub2/include/grub/i386/pc/memory.h   2008-11-12 20:53:48 UTC (rev 
1913)
@@ -84,6 +84,19 @@
 
 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 */