2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>

	* include/multiboot.h: Resynced with spec.
	* include/multiboot2.h: Likewise.
	* loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap): Handle
	GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE and GRUB_MACHINE_MEMORY_NVS.

diff --git a/ChangeLog b/ChangeLog
index 40984c187a7b70ae23cdc1e345fe8e9185334546..9097153e2ef6853b8eaa0db992d03a76928336fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/multiboot.h: Resynced with spec.
+       * include/multiboot2.h: Likewise.
+       * loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap): Handle
+       GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE and GRUB_MACHINE_MEMORY_NVS.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
        * include/grub/term.h (grub_term_register_input,

diff --git a/include/multiboot.h b/include/multiboot.h
index 57c154c98f86507b19b62f714a5842c1f4eab061..c529c5c5f04131392f4fce2fdeb41cdd0a0ed2de 100644 (file)
--- a/include/multiboot.h
+++ b/include/multiboot.h
@@ -233,6 +233,8 @@ struct multiboot_mmap_entry
   multiboot_uint64_t len;
 #define MULTIBOOT_MEMORY_AVAILABLE             1
 #define MULTIBOOT_MEMORY_RESERVED              2
+#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
+#define MULTIBOOT_MEMORY_NVS                    4
   multiboot_uint32_t type;
 } __attribute__((packed));
 typedef struct multiboot_mmap_entry multiboot_memory_map_t;

diff --git a/include/multiboot2.h b/include/multiboot2.h
index a241a70ad2311ad41beaf641fd073a7d1d3e6ad1..1b649d5144f321eb8d756a50b4d31e8ecbd44de3 100644 (file)
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -233,6 +233,8 @@ struct multiboot_mmap_entry
   multiboot_uint64_t len;
 #define MULTIBOOT_MEMORY_AVAILABLE             1
 #define MULTIBOOT_MEMORY_RESERVED              2
+#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
+#define MULTIBOOT_MEMORY_NVS                    4
   multiboot_uint32_t type;
 } __attribute__((packed));
 typedef struct multiboot_mmap_entry multiboot_memory_map_t;

diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 58bb68323a554db3fd5c685171db2c992028d8d4..5154a64dfecaaa972a6ea680309be471dc8d9f15 100644 (file)
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -110,6 +110,18 @@ grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry)
        case GRUB_MACHINE_MEMORY_AVAILABLE:
          mmap_entry->type = MULTIBOOT_MEMORY_AVAILABLE;
          break;
+
+#ifdef GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE
+       case GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE:
+         mmap_entry->type = MULTIBOOT_MEMORY_ACPI_RECLAIMABLE;
+         break;
+#endif
+
+#ifdef GRUB_MACHINE_MEMORY_NVS
+       case GRUB_MACHINE_MEMORY_NVS:
+         mmap_entry->type = MULTIBOOT_MEMORY_NVS;
+         break;
+#endif   
          
        default:
          mmap_entry->type = MULTIBOOT_MEMORY_RESERVED;