Modules/VESA - Deferred mode population until needed (reduces lag at boot)
[tpg/acess2.git] / Modules / Display / VESA / main.c
index e87ca05..55083b0 100644 (file)
@@ -2,12 +2,12 @@
  * 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
 #include <vfs.h>\r
-#include <tpl_drv_video.h>\r
+#include <api_drv_video.h>\r
 #include <fs_devfs.h>\r
 #include <modules.h>\r
 #include <vm8086.h>\r
 \r
 // === CONSTANTS ===\r
 #define        FLAG_LFB        0x1\r
+#define VESA_DEFAULT_FRAMEBUFFER       (KERNEL_BASE|0xA0000)\r
+#define BLINKING_CURSOR        1\r
+#if BLINKING_CURSOR\r
+# define VESA_CURSOR_PERIOD    1000\r
+#endif\r
 \r
 // === PROTOTYPES ===\r
  int   Vesa_Install(char **Arguments);\r
 Uint64 Vesa_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);\r
 Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);\r
- int   Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data);\r
+ int   Vesa_IOCtl(tVFS_Node *Node, int ID, void *Data);\r
  int   Vesa_Int_SetMode(int Mode);\r
  int   Vesa_Int_FindMode(tVideo_IOCtl_Mode *data);\r
  int   Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data);\r
+void   Vesa_int_HideCursor(void);\r
+void   Vesa_int_ShowCursor(void);\r
+void   Vesa_FlipCursor(void *Arg);\r
 \r
 // === GLOBALS ===\r
 MODULE_DEFINE(0, VERSION, Vesa, Vesa_Install, NULL, "PCI", "VM8086", NULL);\r
@@ -32,33 +40,40 @@ tDevFS_Driver       gVesa_DriverStruct = {
        {\r
        .Read = Vesa_Read,\r
        .Write = Vesa_Write,\r
-       .IOCtl = Vesa_Ioctl\r
+       .IOCtl = Vesa_IOCtl\r
        }\r
 };\r
-tSpinlock      glVesa_Lock;\r
+tMutex glVesa_Lock;\r
 tVM8086        *gpVesa_BiosState;\r
- int   giVesaCurrentMode = -1;\r
- int   giVesaCurrentFormat = VIDEO_BUFFMT_TEXT;\r
  int   giVesaDriverId = -1;\r
-char   *gVesaFramebuffer = (void*)0xC00A0000;\r
+// --- Video Modes ---\r
+ int   giVesaCurrentMode = 0;\r
 tVesa_Mode     *gVesa_Modes;\r
+tVesa_Mode     *gpVesaCurMode;\r
  int   giVesaModeCount = 0;\r
- int   giVesaPageCount = 0;\r
+ int   gbVesaModesChecked;\r
+// --- Framebuffer ---\r
+char   *gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;\r
+ int   giVesaPageCount = 0;    //!< Framebuffer size in pages\r
+// --- Cursor Control ---\r
+ int   giVesaCursorX = -1;\r
+ int   giVesaCursorY = -1;\r
+ int   giVesaCursorTimer = -1; // Invalid timer\r
+ int   gbVesa_CursorVisible = 0;\r
+// --- 2D Video Stream Handlers ---\r
+tDrvUtil_Video_BufInfo gVesa_BufInfo;\r
 \r
-//CODE\r
+// === CODE ===\r
 int Vesa_Install(char **Arguments)\r
 {\r
        tVesa_CallInfo  *info;\r
        tFarPtr infoPtr;\r
-       tVesa_CallModeInfo      *modeinfo;\r
-       tFarPtr modeinfoPtr;\r
        Uint16  *modes;\r
        int     i;\r
        \r
        // Allocate Info Block\r
        gpVesa_BiosState = VM8086_Init();\r
        info = VM8086_Allocate(gpVesa_BiosState, 512, &infoPtr.seg, &infoPtr.ofs);\r
-       modeinfo = VM8086_Allocate(gpVesa_BiosState, 512, &modeinfoPtr.seg, &modeinfoPtr.ofs);\r
        // Set Requested Version\r
        memcpy(info->signature, "VBE2", 4);\r
        // Set Registers\r
@@ -67,17 +82,19 @@ int Vesa_Install(char **Arguments)
        // Call Interrupt\r
        VM8086_Int(gpVesa_BiosState, 0x10);\r
        if(gpVesa_BiosState->AX != 0x004F) {\r
-               Log_Warning("Vesa", "Vesa_Install - VESA/VBE Unsupported (AX = 0x%x)\n", gpVesa_BiosState->AX);\r
+               Log_Warning("VESA", "Vesa_Install - VESA/VBE Unsupported (AX = 0x%x)", gpVesa_BiosState->AX);\r
                return MODULE_ERR_NOTNEEDED;\r
        }\r
        \r
-       Log_Debug("Vesa", "info->VideoModes = %04x:%04x", info->VideoModes.seg, info->VideoModes.ofs);\r
+       //Log_Debug("VESA", "info->VideoModes = %04x:%04x", info->VideoModes.seg, info->VideoModes.ofs);\r
        modes = (Uint16 *) VM8086_GetPointer(gpVesa_BiosState, info->VideoModes.seg, info->VideoModes.ofs);\r
        \r
        // Read Modes\r
        for( giVesaModeCount = 0; modes[giVesaModeCount] != 0xFFFF; giVesaModeCount++ );\r
        gVesa_Modes = (tVesa_Mode *)malloc( giVesaModeCount * sizeof(tVesa_Mode) );\r
        \r
+       Log_Debug("VESA", "%i Modes", giVesaModeCount);\r
+       \r
        // Insert Text Mode\r
        gVesa_Modes[0].width = 80;\r
        gVesa_Modes[0].height = 25;\r
@@ -90,35 +107,9 @@ int Vesa_Install(char **Arguments)
        for( i = 1; i < giVesaModeCount; i++ )\r
        {\r
                gVesa_Modes[i].code = modes[i];\r
-               // Get Mode info\r
-               gpVesa_BiosState->AX = 0x4F01;\r
-               gpVesa_BiosState->CX = gVesa_Modes[i].code;\r
-               gpVesa_BiosState->ES = modeinfoPtr.seg;\r
-               gpVesa_BiosState->DI = modeinfoPtr.ofs;\r
-               VM8086_Int(gpVesa_BiosState, 0x10);\r
-               \r
-               // Parse Info\r
-               gVesa_Modes[i].flags = 0;\r
-               if ( (modeinfo->attributes & 0x90) == 0x90 )\r
-               {\r
-                       gVesa_Modes[i].flags |= FLAG_LFB;\r
-                       gVesa_Modes[i].framebuffer = modeinfo->physbase;\r
-                       gVesa_Modes[i].fbSize = modeinfo->Xres*modeinfo->Yres*modeinfo->bpp/8;\r
-               } else {\r
-                       gVesa_Modes[i].framebuffer = 0;\r
-                       gVesa_Modes[i].fbSize = 0;\r
-               }\r
-               \r
-               gVesa_Modes[i].width = modeinfo->Xres;\r
-               gVesa_Modes[i].height = modeinfo->Yres;\r
-               gVesa_Modes[i].bpp = modeinfo->bpp;\r
-               \r
-               #if DEBUG\r
-               Log_Log("Vesa", "0x%x - %ix%ix%i",\r
-                       gVesa_Modes[i].code, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp);\r
-               #endif\r
        }\r
-       \r
+\r
+//     VM8086_Deallocate( info );\r
        \r
        // Install Device\r
        giVesaDriverId = DevFS_AddDevice( &gVesa_DriverStruct );\r
@@ -127,12 +118,59 @@ int Vesa_Install(char **Arguments)
        return MODULE_ERR_OK;\r
 }\r
 \r
+void Vesa_int_FillModeList(void)\r
+{\r
+       if( !gbVesaModesChecked )\r
+       {\r
+                int    i;\r
+               tVesa_CallModeInfo      *modeinfo;\r
+               tFarPtr modeinfoPtr;\r
+               \r
+               modeinfo = VM8086_Allocate(gpVesa_BiosState, 512, &modeinfoPtr.seg, &modeinfoPtr.ofs);\r
+               for( i = 1; i < giVesaModeCount; i ++ )\r
+               {\r
+                       // Get Mode info\r
+                       gpVesa_BiosState->AX = 0x4F01;\r
+                       gpVesa_BiosState->CX = gVesa_Modes[i].code;\r
+                       gpVesa_BiosState->ES = modeinfoPtr.seg;\r
+                       gpVesa_BiosState->DI = modeinfoPtr.ofs;\r
+                       VM8086_Int(gpVesa_BiosState, 0x10);\r
+                       \r
+                       // Parse Info\r
+                       gVesa_Modes[i].flags = 0;\r
+                       if ( (modeinfo->attributes & 0x90) == 0x90 )\r
+                       {\r
+                               gVesa_Modes[i].flags |= FLAG_LFB;\r
+                               gVesa_Modes[i].framebuffer = modeinfo->physbase;\r
+                               gVesa_Modes[i].fbSize = modeinfo->Yres*modeinfo->pitch;\r
+                       } else {\r
+                               gVesa_Modes[i].framebuffer = 0;\r
+                               gVesa_Modes[i].fbSize = 0;\r
+                       }\r
+                       \r
+                       gVesa_Modes[i].pitch = modeinfo->pitch;\r
+                       gVesa_Modes[i].width = modeinfo->Xres;\r
+                       gVesa_Modes[i].height = modeinfo->Yres;\r
+                       gVesa_Modes[i].bpp = modeinfo->bpp;\r
+                       \r
+                       #if DEBUG\r
+                       Log_Log("VESA", "0x%x - %ix%ix%i",\r
+                               gVesa_Modes[i].code, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp);\r
+                       #endif\r
+               }\r
+       \r
+//             VM8086_Deallocate( modeinfo );\r
+               \r
+               gbVesaModesChecked = 1;\r
+       }\r
+}\r
+\r
 /* Read from the framebuffer\r
  */\r
 Uint64 Vesa_Read(tVFS_Node *Node, Uint64 off, Uint64 len, void *buffer)\r
 {\r
        #if DEBUG >= 2\r
-       LogF("Vesa_Read: () - NULL\n");\r
+       Log("Vesa_Read: () - NULL\n");\r
        #endif\r
        return 0;\r
 }\r
@@ -142,155 +180,26 @@ Uint64 Vesa_Read(tVFS_Node *Node, Uint64 off, Uint64 len, void *buffer)
  */\r
 Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)\r
 {\r
-       ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);\r
-\r
-       if(Buffer == NULL) {\r
-               LEAVE('i', 0);\r
-               return 0;\r
-       }\r
-\r
-       // Default Text mode\r
-       if( giVesaCurrentMode == 0 )\r
-       {\r
-               Uint8   *fb = (Uint8 *)(KERNEL_BASE|0xB8000);\r
-               Uint32  *buf = Buffer;\r
-                int    rem;\r
-               \r
-               if( giVesaCurrentFormat != VIDEO_BUFFMT_TEXT ) {\r
-                       Log_Warning("VESA", "Vesa_Write - Mode 0 is not framebuffer");\r
-                       LEAVE('i', -1);\r
-                       return -1;\r
-               }\r
-               \r
-               if( Offset + Length > 25*80*8 ) {\r
-                       Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");\r
-                       LEAVE('i', 0);\r
-                       return 0;\r
-               }\r
-               \r
-               fb += 2*Offset;\r
-               for(rem = Length / sizeof(tVT_Char); rem --; fb += 2)\r
-               {\r
-                       if( *buf < 0x80 )\r
-                               *fb = *buf & 0x7F;\r
-                       else\r
-                               *fb = 0x00;\r
-                       buf ++;\r
-                       \r
-                       fb[1] = 0;\r
-                       fb[1] |= (*buf & 0x888) == 0x888 ? 0x8 : 0;\r
-                       fb[1] |= (*buf & 0x700) > 0x300 ? 0x4 : 0;\r
-                       fb[1] |= (*buf & 0x070) > 0x030 ? 0x2 : 0;\r
-                       fb[1] |= (*buf & 0x007) > 0x003 ? 0x1 : 0;\r
-                       fb[1] |= (*buf & 0x888000) == 0x888000 ? 0x80 : 0;\r
-                       fb[1] |= (*buf & 0x700000) > 0x300000 ? 0x40 : 0;\r
-                       fb[1] |= (*buf & 0x070000) > 0x030000 ? 0x20 : 0;\r
-                       fb[1] |= (*buf & 0x007000) > 0x003000 ? 0x10 : 0;\r
-                       buf ++;\r
-               }\r
-               Length /= sizeof(tVT_Char);\r
-               Length *= sizeof(tVT_Char);\r
-               LEAVE('X', Length);\r
-               return Length;\r
-       }\r
-\r
        if( gVesa_Modes[giVesaCurrentMode].framebuffer == 0 ) {\r
                Log_Warning("VESA", "Vesa_Write - Non-LFB Modes not yet supported.");\r
-               LEAVE('i', 0);\r
                return 0;\r
        }\r
-       \r
-       // Text Mode\r
-       switch( giVesaCurrentFormat )\r
-       {\r
-       case VIDEO_BUFFMT_TEXT:\r
-               {\r
-               tVT_Char        *chars = Buffer;\r
-                int    pitch = gVesa_Modes[giVesaCurrentMode].width * giVT_CharWidth;\r
-                int    x, y;\r
-               Uint32  *dest;\r
-                int    rem;\r
-               \r
-               Offset /= sizeof(tVT_Char);\r
-               dest = (void*)gVesaFramebuffer;\r
-               x = (Offset % gVesa_Modes[giVesaCurrentMode].width) * giVT_CharWidth;\r
-               y = (Offset / gVesa_Modes[giVesaCurrentMode].width) * giVT_CharHeight;\r
-               \r
-               // Sanity Check\r
-               if(y > gVesa_Modes[giVesaCurrentMode].height) {\r
-                       LEAVE('i', 0);\r
-                       return 0;\r
-               }\r
-               \r
-               dest += y * pitch;\r
-               dest += x * giVT_CharWidth;\r
-               for( rem = Length / sizeof(tVT_Char); rem--; )\r
-               {\r
-                       VT_Font_Render(\r
-                               chars->Ch,\r
-                               dest, pitch,\r
-                               VT_Colour12to24(chars->BGCol),\r
-                               VT_Colour12to24(chars->FGCol)\r
-                               );\r
-                       \r
-                       dest += giVT_CharWidth;\r
-                       \r
-                       chars ++;\r
-                       x += giVT_CharWidth;\r
-                       if( x >= pitch ) {\r
-                               x = 0;\r
-                               y += giVT_CharHeight;\r
-                               dest += pitch*(giVT_CharHeight-1);\r
-                       }\r
-               }\r
-               Length /= sizeof(tVT_Char);\r
-               Length *= sizeof(tVT_Char);\r
-               }\r
-               break;\r
-       \r
-       case VIDEO_BUFFMT_FRAMEBUFFER:\r
-               {\r
-               Uint8   *destBuf = (Uint8*) ((Uint)gVesaFramebuffer + (Uint)Offset);\r
-               \r
-               if(gVesa_Modes[giVesaCurrentMode].fbSize < Offset+Length)\r
-               {\r
-                       Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");\r
-                       LEAVE('i', 0);\r
-                       return 0;\r
-               }\r
-               \r
-               LOG("buffer = %p", Buffer);\r
-               LOG("Updating Framebuffer (%p to %p)", destBuf, destBuf + (Uint)Length);\r
-               \r
-               \r
-               // Copy to Frambuffer\r
-               memcpy(destBuf, Buffer, Length);\r
-               \r
-               LOG("BGA Framebuffer updated");\r
-               }\r
-               break;\r
-       default:\r
-               LEAVE('i', -1);\r
-               return -1;\r
-       }\r
-       \r
-       LEAVE('X', Length);\r
-       return Length;\r
+\r
+       return DrvUtil_Video_WriteLFB(&gVesa_BufInfo, Offset, Length, Buffer);\r
 }\r
 \r
+const char *csaVESA_IOCtls[] = {DRV_IOCTLNAMES, DRV_VIDEO_IOCTLNAMES, NULL};\r
 /**\r
- * \fn int Vesa_Ioctl(vfs_node *node, int id, void *data)\r
  * \brief Handle messages to the device\r
  */\r
-int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)\r
+int Vesa_IOCtl(tVFS_Node *Node, int ID, void *Data)\r
 {\r
         int    ret;\r
+       //Log_Debug("VESA", "Vesa_Ioctl: (Node=%p, ID=%i, Data=%p)", Node, ID, Data);\r
        switch(ID)\r
        {\r
-       case DRV_IOCTL_TYPE:    return DRV_TYPE_VIDEO;\r
-       case DRV_IOCTL_IDENT:   memcpy("VESA", Data, 4);        return 1;\r
-       case DRV_IOCTL_VERSION: return VERSION;\r
-       \r
+       BASE_IOCTLS(DRV_TYPE_VIDEO, "VESA", VERSION, csaVESA_IOCtls);\r
+\r
        case VIDEO_IOCTL_GETSETMODE:\r
                if( !Data )     return giVesaCurrentMode;\r
                return Vesa_Int_SetMode( *(int*)Data );\r
@@ -301,34 +210,49 @@ int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
                return Vesa_Int_ModeInfo((tVideo_IOCtl_Mode*)Data);\r
        \r
        case VIDEO_IOCTL_SETBUFFORMAT:\r
-               ret = giVesaCurrentFormat;\r
-               if(Data)        giVesaCurrentFormat = *(int*)Data;\r
+               Vesa_int_HideCursor();\r
+               ret = gVesa_BufInfo.BufferFormat;\r
+               if(Data)        gVesa_BufInfo.BufferFormat = *(int*)Data;\r
+               if(gVesa_BufInfo.BufferFormat == VIDEO_BUFFMT_TEXT)\r
+                       DrvUtil_Video_SetCursor( &gVesa_BufInfo, &gDrvUtil_TextModeCursor );\r
+               Vesa_int_ShowCursor();\r
                return ret;\r
        \r
-       case VIDEO_IOCTL_REQLFB:        // Request Linear Framebuffer\r
+       case VIDEO_IOCTL_SETCURSOR:     // Set cursor position\r
+               Vesa_int_HideCursor();\r
+               giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x;\r
+               giVesaCursorY = ((tVideo_IOCtl_Pos*)Data)->y;\r
+               Vesa_int_ShowCursor();\r
+               return 0;\r
+       \r
+       case VIDEO_IOCTL_SETCURSORBITMAP:\r
+               DrvUtil_Video_SetCursor( &gVesa_BufInfo, Data );\r
                return 0;\r
        }\r
        return 0;\r
 }\r
 \r
+/**\r
+ * \brief Updates the video mode\r
+ */\r
 int Vesa_Int_SetMode(int mode)\r
 {      \r
-       #if DEBUG\r
-       LogF("Vesa_Int_SetMode: (mode=%i)\n", mode);\r
-       #endif\r
-       \r
        // Sanity Check values\r
        if(mode < 0 || mode > giVesaModeCount)  return -1;\r
-       \r
+\r
        // Check for fast return\r
        if(mode == giVesaCurrentMode)   return 1;\r
        \r
-       LOCK( &glVesa_Lock );\r
+       Vesa_int_FillModeList();\r
+\r
+       Time_RemoveTimer(giVesaCursorTimer);\r
+       giVesaCursorTimer = -1;\r
+       \r
+       Mutex_Acquire( &glVesa_Lock );\r
        \r
        gpVesa_BiosState->AX = 0x4F02;\r
        gpVesa_BiosState->BX = gVesa_Modes[mode].code;\r
        if(gVesa_Modes[mode].flags & FLAG_LFB) {\r
-               Log_Log("VESA", "Using LFB");\r
                gpVesa_BiosState->BX |= 0x4000; // Bit 14 - Use LFB\r
        }\r
        \r
@@ -336,18 +260,30 @@ int Vesa_Int_SetMode(int mode)
        VM8086_Int(gpVesa_BiosState, 0x10);\r
        \r
        // Map Framebuffer\r
-       MM_UnmapHWPages((tVAddr)gVesaFramebuffer, giVesaPageCount);\r
+       if( (tVAddr)gpVesa_Framebuffer != VESA_DEFAULT_FRAMEBUFFER )\r
+               MM_UnmapHWPages((tVAddr)gpVesa_Framebuffer, giVesaPageCount);\r
        giVesaPageCount = (gVesa_Modes[mode].fbSize + 0xFFF) >> 12;\r
-       gVesaFramebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount);\r
+       gpVesa_Framebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount);\r
        \r
-       LogF("Vesa", "Framebuffer (Phys) = 0x%x", gVesa_Modes[mode].framebuffer);\r
-       LogF("Vesa", "Framebuffer (Virt) = 0x%x", gVesaFramebuffer);\r
+       Log_Log("VESA", "Setting mode to %i (%ix%i %ibpp) %p[0x%x] maps %P",\r
+               mode,\r
+               gVesa_Modes[mode].width, gVesa_Modes[mode].height,\r
+               gVesa_Modes[mode].bpp,\r
+               gpVesa_Framebuffer, giVesaPageCount << 12, gVesa_Modes[mode].framebuffer\r
+               );\r
        \r
        // Record Mode Set\r
        giVesaCurrentMode = mode;\r
+       gpVesaCurMode = &gVesa_Modes[giVesaCurrentMode];\r
        \r
-       RELEASE( &glVesa_Lock );\r
-       \r
+       Mutex_Release( &glVesa_Lock );\r
+\r
+       gVesa_BufInfo.Framebuffer = gpVesa_Framebuffer;\r
+       gVesa_BufInfo.Pitch = gVesa_Modes[mode].pitch;\r
+       gVesa_BufInfo.Width = gVesa_Modes[mode].width;\r
+       gVesa_BufInfo.Height = gVesa_Modes[mode].height;\r
+       gVesa_BufInfo.Depth = gVesa_Modes[mode].bpp;    \r
+\r
        return 1;\r
 }\r
 \r
@@ -358,24 +294,43 @@ int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data)
         int    factor, tmp;\r
        \r
        ENTER("idata->width idata->height idata->bpp", data->width, data->height, data->bpp);\r
+\r
+       Vesa_int_FillModeList();\r
        \r
        for(i=0;i<giVesaModeCount;i++)\r
        {\r
                LOG("Mode %i (%ix%ix%i)", i, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp);\r
        \r
-               if(gVesa_Modes[i].width == data->width\r
-               && gVesa_Modes[i].height == data->height\r
-               && gVesa_Modes[i].bpp == data->bpp)\r
+               if(gVesa_Modes[i].width == data->width && gVesa_Modes[i].height == data->height)\r
                {\r
-                       LOG("Perfect!");\r
-                       best = i;\r
-                       break;\r
+                       //if( (data->bpp == 32 || data->bpp == 24)\r
+                       // && (gVesa_Modes[i].bpp == 32 || gVesa_Modes[i].bpp == 24) )\r
+                       if( data->bpp == gVesa_Modes[i].bpp )\r
+                       {\r
+                               LOG("Perfect!");\r
+                               best = i;\r
+                               break;\r
+                       }\r
                }\r
                \r
-               tmp = gVesa_Modes[i].width * gVesa_Modes[i].height * gVesa_Modes[i].bpp;\r
-               tmp -= data->width * data->height * data->bpp;\r
+               tmp = gVesa_Modes[i].width * gVesa_Modes[i].height;\r
+               tmp -= data->width * data->height;\r
                tmp = tmp < 0 ? -tmp : tmp;\r
-               factor = tmp * 100 / (data->width * data->height * data->bpp);\r
+               factor = tmp * 1000 / (data->width * data->height);\r
+               \r
+               if( data->bpp == 8 && gVesa_Modes[i].bpp != 8 ) continue;\r
+               if( data->bpp == 16 && gVesa_Modes[i].bpp != 16 )       continue;\r
+               \r
+               if( (data->bpp == 32 || data->bpp == 24)\r
+                && (gVesa_Modes[i].bpp == 32 || gVesa_Modes[i].bpp == 24) )\r
+               {\r
+                       if( data->bpp == gVesa_Modes[i].bpp )\r
+                               factor /= 2;\r
+               }\r
+               else {\r
+                       if( data->bpp != gVesa_Modes[i].bpp )\r
+                               continue ;\r
+               }\r
                \r
                LOG("factor = %i", factor);\r
                \r
@@ -396,8 +351,67 @@ int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data)
 int Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data)\r
 {\r
        if(data->id < 0 || data->id > giVesaModeCount)  return -1;\r
+\r
+       Vesa_int_FillModeList();\r
+\r
        data->width = gVesa_Modes[data->id].width;\r
        data->height = gVesa_Modes[data->id].height;\r
        data->bpp = gVesa_Modes[data->id].bpp;\r
        return 1;\r
 }\r
+\r
+void Vesa_int_HideCursor(void)\r
+{\r
+       DrvUtil_Video_RemoveCursor( &gVesa_BufInfo );\r
+       #if BLINKING_CURSOR\r
+       if(giVesaCursorTimer != -1) {\r
+               Time_RemoveTimer(giVesaCursorTimer);\r
+               giVesaCursorTimer = -1;\r
+       }\r
+       #endif\r
+}\r
+\r
+void Vesa_int_ShowCursor(void)\r
+{\r
+       gbVesa_CursorVisible = (giVesaCursorX >= 0);\r
+       if(gVesa_BufInfo.BufferFormat == VIDEO_BUFFMT_TEXT)\r
+       {\r
+               DrvUtil_Video_DrawCursor(\r
+                       &gVesa_BufInfo,\r
+                       giVesaCursorX*giVT_CharWidth,\r
+                       giVesaCursorY*giVT_CharHeight\r
+                       );\r
+               #if BLINKING_CURSOR\r
+               giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, NULL);\r
+               #endif\r
+       }\r
+       else\r
+               DrvUtil_Video_DrawCursor(\r
+                       &gVesa_BufInfo,\r
+                       giVesaCursorX,\r
+                       giVesaCursorY\r
+                       );\r
+}\r
+\r
+/**\r
+ * \brief Swaps the text cursor on/off\r
+ */\r
+void Vesa_FlipCursor(void *Arg)\r
+{\r
+       if( gVesa_BufInfo.BufferFormat != VIDEO_BUFFMT_TEXT )\r
+               return ;\r
+\r
+       if( gbVesa_CursorVisible )\r
+               DrvUtil_Video_RemoveCursor(&gVesa_BufInfo);\r
+       else\r
+               DrvUtil_Video_DrawCursor(&gVesa_BufInfo,\r
+                       giVesaCursorX*giVT_CharWidth,\r
+                       giVesaCursorY*giVT_CharHeight\r
+                       );\r
+       gbVesa_CursorVisible = !gbVesa_CursorVisible;\r
+               \r
+       #if BLINKING_CURSOR\r
+       giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Arg);\r
+       #endif\r
+}\r
+\r

UCC git Repository :: git.ucc.asn.au