Kernel - Change virtual memory API to use void* for virtual addresses

[tpg/acess2.git] / KernelLand / Modules / Display / VESA / main.c

diff --git a/KernelLand/Modules/Display/VESA/main.c b/KernelLand/Modules/Display/VESA/main.c
index 3422d0e..32022ef 100644 (file)
--- a/KernelLand/Modules/Display/VESA/main.c
+++ b/KernelLand/Modules/Display/VESA/main.c
@@ -2,7 +2,7 @@
  * AcessOS 1\r
  * Video BIOS Extensions (Vesa) Driver\r
  */\r
-#define DEBUG  1\r
+#define DEBUG  0\r
 #define VERSION        0x100\r
 \r
 #include <acess.h>\r
@@ -13,6 +13,7 @@
 #include <vm8086.h>\r
 #include "common.h"\r
 #include <timers.h>\r
+#include <limits.h>\r
 \r
 // === CONSTANTS ===\r
 #define USE_BIOS       1\r
@@ -54,7 +55,7 @@ tVM8086       *gpVesa_BiosState;
  int   giVesaCurrentMode = 0;\r
 tVesa_Mode     gVesa_BootMode = {0x03, 80*8, 25*16, 80*8*2, 12, FLAG_POPULATED, 80*25*2, 0xB8000};\r
 tVesa_Mode     *gVesa_Modes;\r
-tVesa_Mode     *gpVesaCurMode;\r
+tVesa_Mode     *gpVesaCurMode = &gVesa_BootMode;\r
  int   giVesaModeCount = 0;\r
  int   gbVesaModesChecked;\r
 // --- Framebuffer ---\r
@@ -432,16 +433,10 @@ int Vesa_Int_SetMode(int mode)
        // Map Framebuffer\r
        if( gpVesaCurMode )\r
        {\r
-               if( gpVesaCurMode->framebuffer < 1024*1024 )\r
-                       ;\r
-               else\r
-                       MM_UnmapHWPages((tVAddr)gpVesa_Framebuffer, giVesaPageCount);\r
+               MM_UnmapHWPages(gpVesa_Framebuffer, giVesaPageCount);\r
        }\r
        giVesaPageCount = (modeptr->fbSize + 0xFFF) >> 12;\r
-       if( modeptr->framebuffer < 1024*1024 )\r
-               gpVesa_Framebuffer = (void*)(KERNEL_BASE|modeptr->framebuffer);\r
-       else\r
-               gpVesa_Framebuffer = (void*)MM_MapHWPages(modeptr->framebuffer, giVesaPageCount);\r
+       gpVesa_Framebuffer = MM_MapHWPages(modeptr->framebuffer, giVesaPageCount);\r
        \r
        Log_Log("VBE", "Setting mode to %i 0x%x (%ix%i %ibpp) %p[0x%x] maps %P",\r
                mode, modeptr->code,\r
@@ -470,6 +465,11 @@ int Vesa_Int_SetMode(int mode)
 \r
 int VBE_int_MatchModes(tVideo_IOCtl_Mode *ReqMode, tVesa_Mode *ThisMode)\r
 {\r
+       if( ThisMode->bpp == 0 ) {\r
+               Log_Warning("VBE", "VESA mode %x (%ix%i) has 0bpp",\r
+                       ThisMode->code, ThisMode->width, ThisMode->height);\r
+               return INT_MAX;\r
+       }\r
        LOG("Matching %ix%i %ibpp", ThisMode->width, ThisMode->height, ThisMode->bpp);\r
        if(ThisMode->width == ReqMode->width && ThisMode->height == ReqMode->height)\r
        {\r
@@ -580,7 +580,7 @@ void Vesa_int_HideCursor(void)
 \r
 void Vesa_int_ShowCursor(void)\r
 {\r
-       if( gpVesaCurMode->flags & FLAG_LFB )\r
+       if( gpVesaCurMode && gpVesaCurMode->flags & FLAG_LFB )\r
        {\r
                gbVesa_CursorVisible = (giVesaCursorX >= 0);\r
                if(gVesa_BufInfo.BufferFormat == VIDEO_BUFFMT_TEXT)\r
@@ -615,7 +615,7 @@ void Vesa_FlipCursor(void *Arg)
        if( gVesa_BufInfo.BufferFormat != VIDEO_BUFFMT_TEXT )\r
                return ;\r
 \r
-       if( gpVesaCurMode->flags & FLAG_LFB )\r
+       if( gpVesaCurMode && gpVesaCurMode->flags & FLAG_LFB )\r
        {\r
                if( gbVesa_CursorVisible )\r
                        DrvUtil_Video_RemoveCursor(&gVesa_BufInfo);\r