Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-29 18:49:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

* doc/multiboot.h: Stylistic improvements. Add APM declarations.

Browse Source
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-09-21 01:47:22 +02:00
1 parent fce58cb280
commit d0577852a8
2 files changed
+29 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+4
View File
@@ -1,3 +1,7 @@
2010-09-20 Vladimir Serbinenko <phcoder@gmail.com>
* doc/multiboot.h: Stylistic improvements. Add APM declarations.
2010-09-20 Vladimir Serbinenko <phcoder@gmail.com> 2010-09-20 Vladimir Serbinenko <phcoder@gmail.com>
* doc/multiboot.texi: Add new memory type for badram. * doc/multiboot.texi: Add new memory type for badram.
doc/multiboot.h
+25 -6
View File
@@ -24,6 +24,7 @@
/* How many bytes from the start of the file we search for the header. */ /* How many bytes from the start of the file we search for the header. */
#define MULTIBOOT_SEARCH 8192 #define MULTIBOOT_SEARCH 8192
#define MULTIBOOT_HEADER_ALIGN 4
/* The magic field should contain this. */ /* The magic field should contain this. */
#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 #define MULTIBOOT_HEADER_MAGIC 0x1BADB002
@@ -202,20 +203,17 @@ struct multiboot_info
multiboot_uint32_t framebuffer_width; multiboot_uint32_t framebuffer_width;
multiboot_uint32_t framebuffer_height; multiboot_uint32_t framebuffer_height;
multiboot_uint8_t framebuffer_bpp; multiboot_uint8_t framebuffer_bpp;
#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 #define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 #define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1
#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 #define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2
multiboot_uint8_t framebuffer_type; multiboot_uint8_t framebuffer_type;
union union
{ {
/* Indexed color. */
struct struct
{ {
struct multiboot_color *framebuffer_palette_addr; multiboot_uint32_t framebuffer_palette_addr;
multiboot_uint16_t framebuffer_palette_num_colors; multiboot_uint16_t framebuffer_palette_num_colors;
}; };
/* Direct RGB color. */
struct struct
{ {
multiboot_uint8_t framebuffer_red_field_position; multiboot_uint8_t framebuffer_red_field_position;
@@ -229,6 +227,13 @@ struct multiboot_info
}; };
typedef struct multiboot_info multiboot_info_t; typedef struct multiboot_info multiboot_info_t;
struct multiboot_color
{
multiboot_uint8_t red;
multiboot_uint8_t green;
multiboot_uint8_t blue;
};
struct multiboot_mmap_entry struct multiboot_mmap_entry
{ {
multiboot_uint32_t size; multiboot_uint32_t size;
@@ -257,6 +262,20 @@ struct multiboot_mod_list
}; };
typedef struct multiboot_mod_list multiboot_module_t; typedef struct multiboot_mod_list multiboot_module_t;
/* APM BIOS info. */
struct multiboot_apm_info
{
grub_uint16_t version;
grub_uint16_t cseg;
grub_uint32_t offset;
grub_uint16_t cseg_16;
grub_uint16_t dseg;
grub_uint16_t flags;
grub_uint16_t cseg_len;
grub_uint16_t cseg_16_len;
grub_uint16_t dseg_len;
};
#endif /* ! ASM_FILE */ #endif /* ! ASM_FILE */
#endif /* ! MULTIBOOT_HEADER */ #endif /* ! MULTIBOOT_HEADER */