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

* grub-core/loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap):

Browse source 
Add BADRAM.
	* grub-core/loader/multiboot_mbi2.c (grub_fill_multiboot_mmap):
	Likewise.
	* include/multiboot.h: Resynced with specification.
	* include/multiboot2.h: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-21 02:06:14 +02:00
parent 269004c158
commit 77a94e9810
5 changed files with 72 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2010-09-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap):
Add BADRAM.
* grub-core/loader/multiboot_mbi2.c (grub_fill_multiboot_mmap):
Likewise.
* include/multiboot.h: Resynced with specification.
* include/multiboot2.h: Likewise.
2010-09-21 Colin Watson <cjwatson@ubuntu.com> 2010-09-21 Colin Watson <cjwatson@ubuntu.com>
Fix po directory handling. Fix po directory handling.

4
grub-core/loader/i386/multiboot_mbi.c
View file

@ -230,6 +230,10 @@ grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry)
mmap_entry->type = MULTIBOOT_MEMORY_NVS; mmap_entry->type = MULTIBOOT_MEMORY_NVS;
break; break;
case GRUB_MEMORY_BADRAM:
mmap_entry->type = MULTIBOOT_MEMORY_BADRAM;
break;
default: default:
mmap_entry->type = MULTIBOOT_MEMORY_RESERVED; mmap_entry->type = MULTIBOOT_MEMORY_RESERVED;
break; break;

4
grub-core/loader/multiboot_mbi2.c
View file

@ -314,6 +314,10 @@ grub_fill_multiboot_mmap (struct multiboot_tag_mmap *tag)
mmap_entry->type = MULTIBOOT_MEMORY_NVS; mmap_entry->type = MULTIBOOT_MEMORY_NVS;
break; break;
case GRUB_MEMORY_BADRAM:
mmap_entry->type = MULTIBOOT_MEMORY_BADRAM;
break;
default: default:
mmap_entry->type = MULTIBOOT_MEMORY_RESERVED; mmap_entry->type = MULTIBOOT_MEMORY_RESERVED;
break; break;

3
include/multiboot.h
View file

@ -1,5 +1,5 @@
/* multiboot.h - Multiboot header file. */ /* multiboot.h - Multiboot header file. */
/* Copyright (C) 1999,2003,2007,2008,2009 Free Software Foundation, Inc. /* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to * of this software and associated documentation files (the "Software"), to
@ -236,6 +236,7 @@ struct multiboot_mmap_entry
#define MULTIBOOT_MEMORY_RESERVED 2 #define MULTIBOOT_MEMORY_RESERVED 2
#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3 #define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3
#define MULTIBOOT_MEMORY_NVS 4 #define MULTIBOOT_MEMORY_NVS 4
#define MULTIBOOT_MEMORY_BADRAM 5
multiboot_uint32_t type; multiboot_uint32_t type;
} __attribute__((packed)); } __attribute__((packed));
typedef struct multiboot_mmap_entry multiboot_memory_map_t; typedef struct multiboot_mmap_entry multiboot_memory_map_t;

52
include/multiboot2.h
View file

@ -52,6 +52,12 @@
#define MULTIBOOT_TAG_TYPE_FRAMEBUFFER 8 #define MULTIBOOT_TAG_TYPE_FRAMEBUFFER 8
#define MULTIBOOT_TAG_TYPE_ELF_SECTIONS 9 #define MULTIBOOT_TAG_TYPE_ELF_SECTIONS 9
#define MULTIBOOT_TAG_TYPE_APM 10 #define MULTIBOOT_TAG_TYPE_APM 10
#define MULTIBOOT_TAG_TYPE_EFI32 11
#define MULTIBOOT_TAG_TYPE_EFI64 12
#define MULTIBOOT_TAG_TYPE_SMBIOS 13
#define MULTIBOOT_TAG_TYPE_ACPI_OLD 14
#define MULTIBOOT_TAG_TYPE_ACPI_NEW 15
#define MULTIBOOT_TAG_TYPE_NETWORK 16
#define MULTIBOOT_HEADER_TAG_END 0 #define MULTIBOOT_HEADER_TAG_END 0
#define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1 #define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1
@ -167,6 +173,7 @@ struct multiboot_mmap_entry
#define MULTIBOOT_MEMORY_RESERVED 2 #define MULTIBOOT_MEMORY_RESERVED 2
#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3 #define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3
#define MULTIBOOT_MEMORY_NVS 4 #define MULTIBOOT_MEMORY_NVS 4
#define MULTIBOOT_MEMORY_BADRAM 5
multiboot_uint32_t type; multiboot_uint32_t type;
multiboot_uint32_t zero; multiboot_uint32_t zero;
} __attribute__((packed)); } __attribute__((packed));
@ -309,6 +316,51 @@ struct multiboot_tag_apm
multiboot_uint16_t dseg_len; multiboot_uint16_t dseg_len;
}; };
struct multiboot_tag_efi32
{
multiboot_uint32_t type;
multiboot_uint32_t size;
multiboot_uint32_t pointer;
};
struct multiboot_tag_efi64
{
multiboot_uint32_t type;
multiboot_uint32_t size;
multiboot_uint64_t pointer;
};
struct multiboot_tag_smbios
{
multiboot_uint32_t type;
multiboot_uint32_t size;
multiboot_uint8_t major;
multiboot_uint8_t minor;
multiboot_uint8_t reserved[6];
multiboot_uint8_t tables[0];
};
struct multiboot_tag_old_acpi
{
multiboot_uint32_t type;
multiboot_uint32_t size;
multiboot_uint8_t rsdp[0];
};
struct multiboot_tag_new_acpi
{
multiboot_uint32_t type;
multiboot_uint32_t size;
multiboot_uint8_t rsdp[0];
};
struct multiboot_tag_network
{
multiboot_uint32_t type;
multiboot_uint32_t size;
multiboot_uint8_t dhcpack[0];
};
#endif /* ! ASM_FILE */ #endif /* ! ASM_FILE */
#endif /* ! MULTIBOOT_HEADER */ #endif /* ! MULTIBOOT_HEADER */