* AcessOS 1\r
* Video BIOS Extensions (Vesa) Driver\r
*/\r
-#define DEBUG 0\r
+#define DEBUG 1\r
#define VERSION 0x100\r
\r
#include <acess.h>\r
// === GLOBALS ===\r
MODULE_DEFINE(0, VERSION, Vesa, Vesa_Install, NULL, "PCI", "VM8086", NULL);\r
tDevFS_Driver gVesa_DriverStruct = {\r
- NULL, "VESA",\r
+ NULL, "Vesa",\r
{\r
.Read = Vesa_Read,\r
.Write = Vesa_Write,\r
};\r
tSpinlock glVesa_Lock;\r
tVM8086 *gpVesa_BiosState;\r
- int giVesaCurrentMode = -1;\r
+ int giVesaCurrentMode = 0;\r
+ int giVesaCurrentFormat = VIDEO_BUFFMT_TEXT;\r
int giVesaDriverId = -1;\r
char *gVesaFramebuffer = (void*)0xC00A0000;\r
tVesa_Mode *gVesa_Modes;\r
return MODULE_ERR_NOTNEEDED;\r
}\r
\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 = 1; modes[giVesaModeCount] != 0xFFFF; giVesaModeCount++ );\r
+ for( giVesaModeCount = 0; modes[giVesaModeCount] != 0xFFFF; giVesaModeCount++ );\r
gVesa_Modes = (tVesa_Mode *)malloc( giVesaModeCount * sizeof(tVesa_Mode) );\r
\r
// Insert Text Mode\r
gVesa_Modes[0].width = 80;\r
gVesa_Modes[0].height = 25;\r
- gVesa_Modes[0].bpp = 4;\r
+ gVesa_Modes[0].bpp = 12;\r
gVesa_Modes[0].code = 0x3;\r
+ gVesa_Modes[0].flags = 1;\r
+ gVesa_Modes[0].fbSize = 80*25*2;\r
+ gVesa_Modes[0].framebuffer = 0xB8000;\r
\r
for( i = 1; i < giVesaModeCount; i++ )\r
{\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
- LogF(" Vesa_Install: 0x%x - %ix%ix%i\n",\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
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
*/\r
Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)\r
{\r
- ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Bufffer);\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
+ Uint16 *fb = (Uint16*)(KERNEL_BASE|0xB8000);\r
+ tVT_Char *chars = 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*sizeof(tVT_Char) ) {\r
+ Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");\r
+ LEAVE('i', 0);\r
+ return 0;\r
+ }\r
+ \r
+ fb += 2*(Offset/sizeof(tVT_Char));\r
+ LOG("fb = %p", fb);\r
+ for(rem = Length / sizeof(tVT_Char); rem --; fb ++, chars++)\r
+ {\r
+ if( chars->Ch < 0x80 )\r
+ *fb = chars->Ch & 0x7F;\r
+ else\r
+ *fb = 0x00;\r
+ \r
+ *fb |= (chars->FGCol & 0x888) == 0x888 ? 0x8 : 0;\r
+ *fb |= (chars->FGCol & 0x700) > 0x300 ? 0x4 : 0;\r
+ *fb |= (chars->FGCol & 0x070) > 0x030 ? 0x2 : 0;\r
+ *fb |= (chars->FGCol & 0x007) > 0x003 ? 0x1 : 0;\r
+ *fb |= (chars->BGCol & 0x888) == 0x888 ? 0x80 : 0;\r
+ *fb |= (chars->BGCol & 0x700) > 0x300 ? 0x40 : 0;\r
+ *fb |= (chars->BGCol & 0x070) > 0x030 ? 0x20 : 0;\r
+ *fb |= (chars->BGCol & 0x007) > 0x003 ? 0x10 : 0;\r
+ //LOG("%08x (%03x,%03x) = %04x",\r
+ // chars->Ch, chars->BGCol, chars->FGCol, *fb);\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
- if(gVesa_Modes[giVesaCurrentMode].fbSize < Offset+Length)\r
+ \r
+ // Text Mode\r
+ switch( giVesaCurrentFormat )\r
{\r
- Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");\r
- LEAVE('i', 0);\r
- return 0;\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
+ LOG("gVesa_Modes[%i].width = %i", giVesaCurrentMode, gVesa_Modes[giVesaCurrentMode].width);\r
+ x = (Offset % (gVesa_Modes[giVesaCurrentMode].width/giVT_CharWidth)) * giVT_CharWidth;\r
+ y = (Offset / (gVesa_Modes[giVesaCurrentMode].width/giVT_CharWidth)) * giVT_CharHeight;\r
+ LOG("(x,y) = (%i,%i)", x, y);\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
- memcpy(gVesaFramebuffer + Offset, Buffer, Length);\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
int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)\r
{\r
+ int ret;\r
switch(ID)\r
{\r
case DRV_IOCTL_TYPE: return DRV_TYPE_VIDEO;\r
case VIDEO_IOCTL_MODEINFO:\r
return Vesa_Int_ModeInfo((tVideo_IOCtl_Mode*)Data);\r
\r
+ case VIDEO_IOCTL_SETBUFFORMAT:\r
+ ret = giVesaCurrentFormat;\r
+ if(Data) giVesaCurrentFormat = *(int*)Data;\r
+ return ret;\r
+ \r
case VIDEO_IOCTL_REQLFB: // Request Linear Framebuffer\r
return 0;\r
}\r
int Vesa_Int_SetMode(int mode)\r
{ \r
#if DEBUG\r
- LogF("Vesa_Int_SetMode: (mode=%i)\n", mode);\r
+ Log("Vesa_Int_SetMode: (mode=%i)", mode);\r
#endif\r
\r
// Sanity Check values\r
gpVesa_BiosState->AX = 0x4F02;\r
gpVesa_BiosState->BX = gVesa_Modes[mode].code;\r
if(gVesa_Modes[mode].flags & FLAG_LFB) {\r
- LogF(" Vesa_Int_SetMode: Using LFB\n");\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
gVesaFramebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount);\r
\r
- LogF(" Vesa_Int_SetMode: Fb (Phys) = 0x%x\n", gVesa_Modes[mode].framebuffer);\r
- LogF(" Vesa_Int_SetMode: Fb (Virt) = 0x%x\n", gVesaFramebuffer);\r
+ Log("Vesa", "Framebuffer (Phys) = 0x%x", gVesa_Modes[mode].framebuffer);\r
+ Log("Vesa", "Framebuffer (Virt) = 0x%x", gVesaFramebuffer);\r
\r
// Record Mode Set\r
giVesaCurrentMode = mode;\r
int i;\r
int best = -1, bestFactor = 1000;\r
int factor, tmp;\r
- #if DEBUG\r
- LogF("Vesa_Int_FindMode: (data={width:%i,height:%i,bpp:%i})\n", data->width, data->height, data->bpp);\r
- #endif\r
+ \r
+ ENTER("idata->width idata->height idata->bpp", data->width, data->height, data->bpp);\r
+ \r
for(i=0;i<giVesaModeCount;i++)\r
{\r
- #if DEBUG >= 2\r
- LogF("Mode %i (%ix%ix%i), ", i, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp);\r
- #endif\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
{\r
- #if DEBUG >= 2\r
- LogF("Perfect!\n");\r
- #endif\r
+ LOG("Perfect!");\r
best = i;\r
break;\r
}\r
tmp = tmp < 0 ? -tmp : tmp;\r
factor = tmp * 100 / (data->width * data->height * data->bpp);\r
\r
- #if DEBUG >= 2\r
- LogF("factor = %i\n", factor);\r
- #endif\r
+ LOG("factor = %i", factor);\r
\r
if(factor < bestFactor)\r
{\r
data->width = gVesa_Modes[best].width;\r
data->height = gVesa_Modes[best].height;\r
data->bpp = gVesa_Modes[best].bpp;\r
+ LEAVE('i', best);\r
return best;\r
}\r
\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au