Modules/VESA - Fix calling SETCURSOR when in B8000 text mode

[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..0af86cb 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,9 +13,14 @@
 #include <vm8086.h>\r
 #include "common.h"\r
 #include <timers.h>\r
+#include <limits.h>\r
 \r
 // === CONSTANTS ===\r
-#define USE_BIOS       1\r
+#ifdef ARCHDIR_is_x86\r
+# define USE_BIOS      1\r
+#else\r
+# define USE_BIOS      0\r
+#endif\r
 #define VESA_DEFAULT_FRAMEBUFFER       (KERNEL_BASE|0xA0000)\r
 #define BLINKING_CURSOR        0\r
 #if BLINKING_CURSOR\r
@@ -32,6 +37,7 @@ size_t        Vesa_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buff
  int   Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data);\r
 void   Vesa_int_HideCursor(void);\r
 void   Vesa_int_ShowCursor(void);\r
+ int   Vesa_int_SetCursor(tVideo_IOCtl_Bitmap *Cursor);\r
 void   Vesa_FlipCursor(void *Arg);\r
 Uint16 VBE_int_GetWord(const tVT_Char *Char);\r
 void   VBE_int_Text_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour);\r
@@ -54,7 +60,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
@@ -123,6 +129,10 @@ int VBE_int_GetModeList(void)
        \r
        // Allocate Info Block\r
        info = VM8086_Allocate(gpVesa_BiosState, 512, &infoPtr.seg, &infoPtr.ofs);\r
+       if( info == NULL ) {\r
+               Log_Warning("VBE", "VM8086 allocation error");\r
+               return MODULE_ERR_NOTNEEDED;\r
+       }\r
        // Set Requested Version\r
        memcpy(info->signature, "VBE2", 4);\r
        // Set Registers\r
@@ -360,13 +370,16 @@ int Vesa_IOCtl(tVFS_Node *Node, int ID, void *Data)
        case VIDEO_IOCTL_SETBUFFORMAT:\r
                Vesa_int_HideCursor();\r
                ret = gVesa_BufInfo.BufferFormat;\r
-               if(Data)        gVesa_BufInfo.BufferFormat = *(int*)Data;\r
+               if(Data)\r
+                       gVesa_BufInfo.BufferFormat = *(int*)Data;\r
                if(gVesa_BufInfo.BufferFormat == VIDEO_BUFFMT_TEXT)\r
-                       DrvUtil_Video_SetCursor( &gVesa_BufInfo, &gDrvUtil_TextModeCursor );\r
+                       Vesa_int_SetCursor(&gDrvUtil_TextModeCursor);\r
                Vesa_int_ShowCursor();\r
                return ret;\r
        \r
        case VIDEO_IOCTL_SETCURSOR:     // Set cursor position\r
+               if( !CheckMem(Data, sizeof(tVideo_IOCtl_Pos)) )\r
+                       return -EINVAL;\r
                Vesa_int_HideCursor();\r
                giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x;\r
                giVesaCursorY = ((tVideo_IOCtl_Pos*)Data)->y;\r
@@ -374,9 +387,7 @@ int Vesa_IOCtl(tVFS_Node *Node, int ID, void *Data)
                return 0;\r
        \r
        case VIDEO_IOCTL_SETCURSORBITMAP:\r
-               if( gpVesaCurMode->flags & FLAG_LFB )\r
-                       DrvUtil_Video_SetCursor( &gVesa_BufInfo, Data );\r
-               return 0;\r
+               return Vesa_int_SetCursor(Data);\r
        }\r
        return 0;\r
 }\r
@@ -432,16 +443,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 +475,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 +590,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
@@ -607,6 +617,21 @@ void Vesa_int_ShowCursor(void)
        }\r
 }\r
 \r
+int Vesa_int_SetCursor(tVideo_IOCtl_Bitmap *Cursor)\r
+{\r
+       if( !CheckMem(Cursor, sizeof(tVideo_IOCtl_Bitmap)) )\r
+               return -EINVAL;\r
+       \r
+       if( gpVesaCurMode && gpVesaCurMode->flags & FLAG_LFB )\r
+       {\r
+               DrvUtil_Video_SetCursor( &gVesa_BufInfo, Cursor );\r
+       }\r
+       else\r
+       {\r
+       }\r
+       return 0;\r
+}\r
+\r
 /**\r
  * \brief Swaps the text cursor on/off\r
  */\r
@@ -615,7 +640,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