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
-// --- 2D Acceleration Functions --\r
-void Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour);\r
-void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H);\r
\r
// === GLOBALS ===\r
MODULE_DEFINE(0, VERSION, Vesa, Vesa_Install, NULL, "PCI", "VM8086", NULL);\r
tVesa_Mode *gVesa_Modes;\r
tVesa_Mode *gpVesaCurMode;\r
int giVesaModeCount = 0;\r
+ int gbVesaModesChecked;\r
// --- Framebuffer ---\r
char *gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;\r
int giVesaPageCount = 0; //!< Framebuffer size in pages\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_2DHandlers gVesa_2DFunctions = {\r
- NULL,\r
- Vesa_2D_Fill,\r
- Vesa_2D_Blit\r
-};\r
tDrvUtil_Video_BufInfo gVesa_BufInfo;\r
\r
// === CODE ===\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
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->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
+\r
+// VM8086_Deallocate( info );\r
\r
// Install Device\r
giVesaDriverId = DevFS_AddDevice( &gVesa_DriverStruct );\r
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
return Vesa_Int_ModeInfo((tVideo_IOCtl_Mode*)Data);\r
\r
case VIDEO_IOCTL_SETBUFFORMAT:\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_SETCURSOR: // Set cursor position\r
- #if !BLINKING_CURSOR\r
- if(giVesaCursorX >= 0)\r
- Vesa_FlipCursor(Node);\r
- #endif\r
+ Vesa_int_HideCursor();\r
giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x;\r
giVesaCursorY = ((tVideo_IOCtl_Pos*)Data)->y;\r
- //Log_Debug("VESA", "Cursor position (%i,%i)", giVesaCursorX, giVesaCursorY);\r
- if(\r
- giVesaCursorX < 0 || giVesaCursorY < 0\r
- || giVesaCursorX >= gpVesaCurMode->width/giVT_CharWidth\r
- || giVesaCursorY >= gpVesaCurMode->height/giVT_CharHeight)\r
- {\r
- #if BLINKING_CURSOR\r
- if(giVesaCursorTimer != -1) {\r
- Time_RemoveTimer(giVesaCursorTimer);\r
- giVesaCursorTimer = -1;\r
- }\r
- #endif\r
- giVesaCursorX = -1;\r
- giVesaCursorY = -1;\r
- }\r
- else {\r
- #if BLINKING_CURSOR\r
- // Log_Debug("VESA", "Updating timer %i?", giVesaCursorTimer);\r
- if(giVesaCursorTimer == -1)\r
- giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Node);\r
- #else\r
- Vesa_FlipCursor(Node);\r
- #endif\r
- }\r
- //Log_Debug("VESA", "Cursor position (%i,%i) Timer %i", giVesaCursorX, giVesaCursorY, giVesaCursorTimer);\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
// Sanity Check values\r
if(mode < 0 || mode > giVesaModeCount) return -1;\r
\r
- Log_Log("VESA", "Setting mode to %i (%ix%i %ibpp)",\r
- mode,\r
- gVesa_Modes[mode].width, gVesa_Modes[mode].height,\r
- gVesa_Modes[mode].bpp\r
- );\r
- \r
// Check for fast return\r
if(mode == giVesaCurrentMode) return 1;\r
\r
+ Vesa_int_FillModeList();\r
+\r
Time_RemoveTimer(giVesaCursorTimer);\r
giVesaCursorTimer = -1;\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
giVesaPageCount = (gVesa_Modes[mode].fbSize + 0xFFF) >> 12;\r
gpVesa_Framebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount);\r
\r
- Log_Log("VESA", "Framebuffer (Phys) = 0x%x, (Virt) = 0x%x, Size = 0x%x",\r
- gVesa_Modes[mode].framebuffer, gpVesa_Framebuffer, giVesaPageCount << 12);\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
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
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
-/**\r
- * \brief Updates the state of the text cursor\r
- * \note Just does a bitwise not on the cursor region\r
- */\r
-void Vesa_FlipCursor(void *Arg)\r
+void Vesa_int_HideCursor(void)\r
{\r
- int pitch = gpVesaCurMode->pitch;\r
- int bytes_per_px = (gpVesaCurMode->bpp + 7) / 8;\r
- int x = giVesaCursorX*giVT_CharWidth;\r
- int y = giVesaCursorY*giVT_CharHeight;\r
- int i;\r
- Uint8 *fb = (void*)gpVesa_Framebuffer;\r
- \r
- //Debug("Cursor flip");\r
- \r
- // Sanity check\r
- if(giVesaCursorX < 0 || giVesaCursorY < 0\r
- || y*pitch + x + (giVT_CharHeight-1)*pitch > (int)gpVesaCurMode->fbSize) {\r
- Log_Notice("VESA", "Cursor OOB (%i,%i)", x, y);\r
- giVesaCursorTimer = -1;\r
- return;\r
- }\r
- \r
- // Draw cursor\r
- fb += (y+1)*pitch + x*bytes_per_px;\r
- \r
- switch(bytes_per_px)\r
- {\r
- case 1:\r
- for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch )\r
- *fb = ~*fb;\r
- break;\r
- case 2:\r
- for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch ) {\r
- fb[0] = ~fb[0];\r
- fb[1] = ~fb[1];\r
- }\r
- break;\r
- case 3:\r
- for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch ) {\r
- fb[0] = ~fb[0];\r
- fb[1] = ~fb[1];\r
- fb[2] = ~fb[2];\r
- }\r
- break;\r
- case 4:\r
- for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch ) {\r
- fb[0] = ~fb[0];\r
- fb[1] = ~fb[1];\r
- fb[2] = ~fb[2];\r
- fb[3] = ~fb[3];\r
- }\r
- break;\r
- default:\r
- Log_Error("VESA", "Vesa_FlipCursor - Bug Report, unknown bytes_per_px (%i)", bytes_per_px);\r
+ DrvUtil_Video_RemoveCursor( &gVesa_BufInfo );\r
+ #if BLINKING_CURSOR\r
+ if(giVesaCursorTimer != -1) {\r
+ Time_RemoveTimer(giVesaCursorTimer);\r
giVesaCursorTimer = -1;\r
- return ;\r
}\r
- \r
- #if BLINKING_CURSOR\r
- giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Arg);\r
#endif\r
}\r
\r
-// ------------------------\r
-// --- 2D Accelleration ---\r
-// ------------------------\r
-void Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour)\r
+void Vesa_int_ShowCursor(void)\r
{\r
- // TODO: Handle non-32bit modes\r
- int pitch = gpVesaCurMode->pitch/4;\r
- Uint32 *buf = (Uint32*)gpVesa_Framebuffer + Y*pitch + X;\r
- while( H -- ) {\r
- memsetd(buf, Colour, W);\r
- buf += pitch;\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
-void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H)\r
+/**\r
+ * \brief Swaps the text cursor on/off\r
+ */\r
+void Vesa_FlipCursor(void *Arg)\r
{\r
- int scrnpitch = gpVesaCurMode->pitch;\r
- int bytes_per_px = (gpVesaCurMode->bpp + 7) / 8;\r
- int dst = DstY*scrnpitch + DstX;\r
- int src = SrcY*scrnpitch + SrcX;\r
- int tmp;\r
- \r
- //Log("Vesa_2D_Blit: (Ent=%p, DstX=%i, DstY=%i, SrcX=%i, SrcY=%i, W=%i, H=%i)",\r
- // Ent, DstX, DstY, SrcX, SrcY, W, H);\r
- \r
- if(SrcX + W > gpVesaCurMode->width)\r
- W = gpVesaCurMode->width - SrcX;\r
- if(DstX + W > gpVesaCurMode->width)\r
- W = gpVesaCurMode->width - DstX;\r
- if(SrcY + H > gpVesaCurMode->height)\r
- H = gpVesaCurMode->height - SrcY;\r
- if(DstY + H > gpVesaCurMode->height)\r
- H = gpVesaCurMode->height - DstY;\r
- \r
- //Debug("W = %i, H = %i", W, H);\r
- \r
- if( dst > src ) {\r
- // Reverse copy\r
- dst += H*scrnpitch;\r
- src += H*scrnpitch;\r
- while( H -- ) {\r
- dst -= scrnpitch;\r
- src -= scrnpitch;\r
- tmp = W*bytes_per_px;\r
- for( tmp = W; tmp --; ) {\r
- *(Uint8*)(gpVesa_Framebuffer + dst + tmp) = *(Uint8*)(gpVesa_Framebuffer + src + tmp);\r
- }\r
- }\r
- }\r
- else {\r
- // Normal copy is OK\r
- while( H -- ) {\r
- memcpy((void*)gpVesa_Framebuffer + dst, (void*)gpVesa_Framebuffer + src, W*bytes_per_px);\r
- dst += scrnpitch;\r
- src += scrnpitch;\r
- }\r
- }\r
- //Log("Vesa_2D_Blit: RETURN");\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
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au