From df44843bdf2c8bc5a784541511f0473a58547c79 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 16 Oct 2019 18:45:24 +0200
Subject: Added some VGA fallback features

---
 src/kernel/graphics/vesa.h | 17 ++++++++---------
 1 file changed, 8 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 4c78219..f58dcf4 100644
--- a/src/kernel/graphics/vesa.h
+++ b/src/kernel/graphics/vesa.h
@@ -99,11 +99,9 @@ struct vbe_mode_info_all {
  */
 struct vbe_mode_info {
     uint16_t attributes;
-    uint16_t pitch;
     uint16_t width;
     uint16_t height;
     uint8_t bpp;
-    uint8_t memory_model;
     uint32_t framebuffer;
 } __attribute__ ((packed));
 
@@ -114,6 +112,12 @@ struct vbe_mode_info {
  */
 struct edid_data get_edid();
 
+
+/**
+ * Forces switch to VGA, displays an error and halts the CPU
+ */
+void switch_to_vga();
+
 /**
  * Set the video mode to a specified resolution using
  * a video mode code
@@ -149,18 +153,13 @@ int vbe_width;
 int vbe_height;
 
 /**
- * The bits per pixel (pixel width) of the current video mode
+ * The bytes per pixel (pixel width) of the current video mode
  */
 int vbe_bpp;
 
-/**
- * The pitch (bytes per line) of the current video mode
- */
-int vbe_pitch;
-
 /**
  * The framebuffer interface
  */
-char *fb;
+uint32_t fb;
 
 #endif
-- 
cgit v1.2.3