tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed broken multiboot struct

Browse Source 
Change-Id: Ib59fb04a45c4417588bf204a5a6e6306f5097e22
This commit is contained in:
rlfnb 2017-07-04 09:08:53 +02:00 committed by Lionel Sambuc
parent d4dd6511b9
commit b67d2ae9e2
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/arch/i386/include/multiboot.h
View File

@ -96,6 +96,7 @@ extern struct multiboot_header *Multiboot_Header;
#define MULTIBOOT_INFO_HAS_LOADER_NAME 0x00000200 #define MULTIBOOT_INFO_HAS_LOADER_NAME 0x00000200
#define MULTIBOOT_INFO_HAS_APM_TABLE 0x00000400 #define MULTIBOOT_INFO_HAS_APM_TABLE 0x00000400
#define MULTIBOOT_INFO_HAS_VBE 0x00000800 #define MULTIBOOT_INFO_HAS_VBE 0x00000800
#define MULTIBOOT_INFO_HAS_FRAMEBUFFER 0x00001000
#if defined(__minix) && !defined(__ASSEMBLY__) && (defined(_MINIX_SYSTEM) || defined(_STANDALONE)) #if defined(__minix) && !defined(__ASSEMBLY__) && (defined(_MINIX_SYSTEM) || defined(_STANDALONE))
@ -144,11 +145,40 @@ struct multiboot_info {
void * unused_mi_apm_table; void * unused_mi_apm_table;
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_VBE. */ /* Valid if mi_flags sets MULTIBOOT_INFO_HAS_VBE. */
void * unused_mi_vbe_control_info; uint32_t vbe_control_info;
void * unused_mi_vbe_mode_info; uint32_t vbe_mode_info;
paddr_t unused_mi_vbe_interface_seg; uint16_t vbe_mode;
paddr_t unused_mi_vbe_interface_off; uint16_t vbe_interface_seg;
uint32_t unused_mi_vbe_interface_len; uint16_t vbe_interface_off;
uint16_t vbe_interface_len;
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_FRAMEBUFFER. */
uint64_t framebuffer_addr;
uint32_t framebuffer_pitch;
uint32_t framebuffer_width;
uint32_t framebuffer_height;
uint8_t framebuffer_bpp;
#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1
#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2
uint8_t framebuffer_type;
union
{
struct
{
uint32_t framebuffer_palette_addr;
uint16_t framebuffer_palette_num_colors;
};
struct
{
uint8_t framebuffer_red_field_position;
uint8_t framebuffer_red_mask_size;
uint8_t framebuffer_green_field_position;
uint8_t framebuffer_green_mask_size;
uint8_t framebuffer_blue_field_position;
uint8_t framebuffer_blue_mask_size;
};
};
}; };
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */