TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-09 20:43:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prepare VESA Support

Browse Source
This commit is contained in:
Baptiste Wicht 2014-01-12 13:55:03 +01:00
parent e7b45e9490
commit f5ff78ea08
2 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
kernel/include/vesa.hpp
View File

@ -8,31 +8,35 @@
#ifndef VESA_H #ifndef VESA_H
#define VESA_H #define VESA_H
#ifndef CODE_16
#include "stl/types.hpp"
#endif
namespace vesa { namespace vesa {
struct vbe_info_block { struct vbe_info_block_t {
char[4] signature; //"VESA" char signature[4]; //"VESA"
uint16_t version; // == 0x0300 for VBE 3.0 uint16_t version; // == 0x0300 for VBE 3.0
uint16_t[2] oem_name_ptr; uint16_t oem_name_ptr[2];
uint8_t[4] capabilities; uint8_t capabilities[4];
uint16_t[2] video_modes_ptr; uint16_t video_modes_ptr[2];
uint16_t total_memory; // as # of 64KB blocks uint16_t total_memory; // as # of 64KB blocks
//VBE 2.0 //VBE 2.0
uint16_t oem_software_version; uint16_t oem_software_version;
uint16_t[2] vendor_name_ptr; uint16_t vendor_name_ptr[2];
uint16_t[2] product_name_ptr; uint16_t product_name_ptr[2];
uint16_t[2] product_revision_ptr; uint16_t product_revision_ptr[2];
uint16_t vbe_af_version; uint16_t vbe_af_version;
uint16_t[2] accelerator_video_modes_ptr; uint16_t accelerator_video_modes_ptr[2];
uint8_t[216] reserved; uint8_t reserved[216];
uint8_t[256] oem_scratchpad; uint8_t oem_scratchpad[256];
} __attribute__((packed)); } __attribute__((packed));
static_assert(sizeof(vbe_info_block) == 512, "The size of a VBE info block is 512 bytes"); static_assert(sizeof(vbe_info_block_t) == 512, "The size of a VBE info block is 512 bytes");
struct mode_info_block { struct mode_info_block_t {
uint16_t mode_attributes; uint16_t mode_attributes;
uint8_t window_a_attributes; uint8_t window_a_attributes;
uint8_t window_b_attributes; uint8_t window_b_attributes;
@ -40,7 +44,7 @@ struct mode_info_block {
uint16_t window_size; uint16_t window_size;
uint16_t segment_window_a; uint16_t segment_window_a;
uint16_t segment_window_b; uint16_t segment_window_b;
uint16_t[2] window_position_function; uint16_t window_position_function[2];
uint16_t pitch; //Bytes per scan line uint16_t pitch; //Bytes per scan line
//OEM modes //OEM modes
@ -71,8 +75,8 @@ struct mode_info_block {
//VBE 2.0+ //VBE 2.0+
uint16_t[2] linear_video_buffer; //LFB (Linear Framebuffer) address uint16_t linear_video_buffer[2]; //LFB (Linear Framebuffer) address
uint16_t[2] offscreen_memory; uint16_t offscreen_memory[2];
uint16_t offscreen_memory_size; uint16_t offscreen_memory_size;
uint16_t bytes_per_scan_line; uint16_t bytes_per_scan_line;
@ -86,11 +90,14 @@ struct mode_info_block {
uint8_t linear_blue_mask_position; uint8_t linear_blue_mask_position;
uint8_t linear_reserved_mask_size; uint8_t linear_reserved_mask_size;
uint8_t linear_reserved_mask_position; uint8_t linear_reserved_mask_position;
uint16_t[2] maximum_pixel_clock; uint16_t maximum_pixel_clock[2];
uint8_t[190] reserved; uint8_t reserved_2[190];
} __attribute__((packed)); } __attribute__((packed));
static_assert(sizeof(mode_info_block) == 256, "The size of a mode info block is 256 bytes"); static_assert(sizeof(mode_info_block_t) == 256, "The size of a mode info block is 256 bytes");
extern vbe_info_block_t vbe_info_block;
extern bool vesa_enabled;
} //end of vesa namespace } //end of vesa namespace

20
kernel/src/boot/boot_16.cpp
View File

@ -34,6 +34,11 @@ typedef uint64_t size_t;
e820::bios_e820_entry e820::bios_e820_entries[e820::MAX_E820_ENTRIES]; e820::bios_e820_entry e820::bios_e820_entries[e820::MAX_E820_ENTRIES];
int16_t e820::bios_e820_entry_count = 0; int16_t e820::bios_e820_entry_count = 0;
#include "vesa.hpp"
vesa::vbe_info_block_t vesa::vbe_info_block;
bool vesa::vesa_enabled = false;
namespace { namespace {
struct gdt_ptr { struct gdt_ptr {
@ -101,6 +106,18 @@ void detect_memory(){
e820::bios_e820_entry_count = detect_memory_e820(); e820::bios_e820_entry_count = detect_memory_e820();
} }
void setup_vesa(){
uint16_t return_code;
asm volatile ("int 0x10"
: "=a"(return_code)
: "a"(0x4F00), "D"(&vesa::vbe_info_block));
if(return_code == 0x4F){
vesa::vesa_enabled = true;
}
}
void disable_interrupts(){ void disable_interrupts(){
__asm__ __volatile__ ("cli"); __asm__ __volatile__ ("cli");
} }
@ -242,6 +259,9 @@ void __attribute__ ((noreturn)) rm_main(){
//Analyze memory //Analyze memory
detect_memory(); detect_memory();
//Enable VESA
setup_vesa();
//Disable interrupts //Disable interrupts
disable_interrupts(); disable_interrupts();