From ef4e182a426a405f0d469a85f7513e01fd9ee75c Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 12 Oct 2019 17:54:25 +0200 Subject: Testing vesa text display I absolutely don't know why it doesn't work :( --- src/kernel/graphics/vesa.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/kernel/graphics/vesa.h') diff --git a/src/kernel/graphics/vesa.h b/src/kernel/graphics/vesa.h index ff7481d..7b49e8b 100644 --- a/src/kernel/graphics/vesa.h +++ b/src/kernel/graphics/vesa.h @@ -8,16 +8,17 @@ int vesa_available; struct edid_data { uint8_t padding[8]; - uint32_t manufacture_id; - uint32_t edid_id; - int serial_number; + uint16_t manufacture_id; + uint16_t product_code; + uint32_t serial_number; uint8_t manufacture_week; uint8_t manufacture_year; uint8_t edid_version; + uint8_t edid_revision; uint8_t video_input_type; uint8_t max_horizontal_size; uint8_t max_vertical_size; - uint8_t gama_factor; + uint8_t gamma_factor; uint8_t dpms_flags; uint8_t chroma_information[10]; uint8_t timings_1; @@ -93,6 +94,11 @@ struct vbe_mode_info { uint8_t reserved1[206]; } __attribute__ ((packed)); +/** + * Get the monitors EDID information + * TODO: Add EDID/VBE resolution mode verification + * @return The EDID information + */ struct edid_data get_edid(); /** @@ -115,11 +121,6 @@ void set_optimal_resolution(); */ void vesa_draw_string(char *data); -/** - * The best VBE mode info data - */ -struct vbe_mode_info *mode_info; - /** * The current video mode */ @@ -145,4 +146,9 @@ int vbe_bpp; */ int vbe_pitch; +/** + * The framebuffer interface + */ +char *fb; + #endif -- cgit v1.2.3