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

Resynced with multiboot2 spec

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-27 21:50:57 +01:00
parent c3a8dfc8b7
commit 46960ff9ec
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
include/multiboot2.h
View file

@ -103,24 +103,24 @@ struct multiboot_header
struct multiboot_header_tag struct multiboot_header_tag
{ {
multiboot_uint32_t type; multiboot_uint16_t type;
multiboot_uint16_t flags;
multiboot_uint32_t size; multiboot_uint32_t size;
multiboot_uint32_t flags;
}; };
struct multiboot_header_tag_information_request struct multiboot_header_tag_information_request
{ {
multiboot_uint32_t type; multiboot_uint16_t type;
multiboot_uint16_t flags;
multiboot_uint32_t size; multiboot_uint32_t size;
multiboot_uint32_t flags;
multiboot_uint32_t requests[0]; multiboot_uint32_t requests[0];
}; };
struct multiboot_header_tag_address struct multiboot_header_tag_address
{ {
multiboot_uint32_t type; multiboot_uint16_t type;
multiboot_uint16_t flags;
multiboot_uint32_t size; multiboot_uint32_t size;
multiboot_uint32_t flags;
multiboot_uint32_t header_addr; multiboot_uint32_t header_addr;
multiboot_uint32_t load_addr; multiboot_uint32_t load_addr;
multiboot_uint32_t load_end_addr; multiboot_uint32_t load_end_addr;
@ -129,25 +129,25 @@ struct multiboot_header_tag_address
struct multiboot_header_tag_entry_address struct multiboot_header_tag_entry_address
{ {
multiboot_uint32_t type; multiboot_uint16_t type;
multiboot_uint16_t flags;
multiboot_uint32_t size; multiboot_uint32_t size;
multiboot_uint32_t flags;
multiboot_uint32_t entry_addr; multiboot_uint32_t entry_addr;
}; };
struct multiboot_header_tag_console_flags struct multiboot_header_tag_console_flags
{ {
multiboot_uint32_t type; multiboot_uint16_t type;
multiboot_uint16_t flags;
multiboot_uint32_t size; multiboot_uint32_t size;
multiboot_uint32_t flags;
multiboot_uint32_t console_flags; multiboot_uint32_t console_flags;
}; };
struct multiboot_header_tag_framebuffer struct multiboot_header_tag_framebuffer
{ {
multiboot_uint32_t type; multiboot_uint16_t type;
multiboot_uint16_t flags;
multiboot_uint32_t size; multiboot_uint32_t size;
multiboot_uint32_t flags;
multiboot_uint32_t width; multiboot_uint32_t width;
multiboot_uint32_t height; multiboot_uint32_t height;
multiboot_uint32_t depth; multiboot_uint32_t depth;
@ -155,9 +155,9 @@ struct multiboot_header_tag_framebuffer
struct multiboot_header_tag_module_align struct multiboot_header_tag_module_align
{ {
multiboot_uint32_t type; multiboot_uint16_t type;
multiboot_uint16_t flags;
multiboot_uint32_t size; multiboot_uint32_t size;
multiboot_uint32_t flags;
multiboot_uint32_t width; multiboot_uint32_t width;
multiboot_uint32_t height; multiboot_uint32_t height;
multiboot_uint32_t depth; multiboot_uint32_t depth;
@ -193,8 +193,6 @@ struct multiboot_tag_string
{ {
multiboot_uint32_t type; multiboot_uint32_t type;
multiboot_uint32_t size; multiboot_uint32_t size;
multiboot_uint32_t entry_size;
multiboot_uint32_t entry_version;
char string[0]; char string[0];
}; };