* 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
\r
// === CONSTANTS ===\r
#define FLAG_LFB 0x1\r
+#define VESA_DEFAULT_FRAMEBUFFER (KERNEL_BASE|0xA0000)\r
\r
// === PROTOTYPES ===\r
int Vesa_Install(char **Arguments);\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
+char *gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;\r
tVesa_Mode *gVesa_Modes;\r
int giVesaModeCount = 0;\r
int giVesaPageCount = 0;\r
// 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
gVesa_Modes[0].height = 25;\r
gVesa_Modes[0].bpp = 12;\r
gVesa_Modes[0].code = 0x3;\r
- gVesa_Modes[0].flags = VIDEO_FLAG_TEXT;\r
+ gVesa_Modes[0].flags = 1;\r
gVesa_Modes[0].fbSize = 80*25*2;\r
gVesa_Modes[0].framebuffer = 0xB8000;\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
- Log_Log("Vesa", "0x%x - %ix%ix%i",\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
// Default Text mode\r
if( giVesaCurrentMode == 0 )\r
{\r
- Uint8 *fb = (Uint8 *)(KERNEL_BASE|0xB8000);\r
- Uint32 *buf = Buffer;\r
- if( Offset + Length > 25*80*8 ) {\r
+ Uint16 *fb = (Uint16*)(KERNEL_BASE|0xB8000);\r
+ tVT_Char *chars = Buffer;\r
+ int rem;\r
+ \r
+ Length /= sizeof(tVT_Char);\r
+ Offset /= sizeof(tVT_Char);\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 ) {\r
Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");\r
LEAVE('i', 0);\r
return 0;\r
}\r
\r
fb += 2*Offset;\r
- for(; Length > 0; Length -= 8, fb += 2)\r
+ LOG("fb = %p", fb);\r
+ for(rem = Length; rem --; fb ++, chars++)\r
{\r
- if( *buf < 0x80 )\r
- *fb = *buf & 0x7F;\r
+ if( chars->Ch < 0x80 )\r
+ *fb = chars->Ch & 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
+ *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
+ LEAVE('X', Length);\r
+ return Length;\r
}\r
\r
if( gVesa_Modes[giVesaCurrentMode].framebuffer == 0 ) {\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;\r
+ int widthInChars = gVesa_Modes[giVesaCurrentMode].width/giVT_CharWidth;\r
+ int heightInChars = gVesa_Modes[giVesaCurrentMode].height/giVT_CharHeight;\r
+ int x, y;\r
+ Uint32 *dest = (void*)gpVesa_Framebuffer;\r
+ int i;\r
+ \r
+ Length /= sizeof(tVT_Char);\r
+ Offset /= sizeof(tVT_Char);\r
+ \r
+ LOG("gVesa_Modes[%i].width = %i", giVesaCurrentMode, gVesa_Modes[giVesaCurrentMode].width);\r
+ x = Offset % widthInChars;\r
+ y = Offset / widthInChars;\r
+ LOG("(x,y) = (%i,%i) = [%i,%i]", x, y, x * giVT_CharWidth, y * giVT_CharHeight * pitch);\r
+ LOG("(w,h) = (%i,%i) = [%i,%i]",\r
+ (int)(Length % widthInChars),\r
+ (int)(Length / widthInChars),\r
+ (int)((Length % widthInChars) * giVT_CharWidth),\r
+ (int)((Length / widthInChars) * giVT_CharHeight * pitch)\r
+ );\r
+ \r
+ // Sanity Check\r
+ if(y > heightInChars) {\r
+ LEAVE('i', 0);\r
+ return 0;\r
+ }\r
+ \r
+ if( Offset + Length > heightInChars*widthInChars ) {\r
+ Length = heightInChars*widthInChars - Offset;\r
+ Log_Notice("VESA", "Clipping write size to %i characters", (int)Length);\r
+ }\r
+ \r
+ dest += y * giVT_CharHeight * pitch;\r
+ dest += x * giVT_CharWidth;\r
+ \r
+ LOG("dest = %p", dest);\r
+ \r
+ for( i = 0; i < Length; i++ )\r
+ {\r
+ VT_Font_Render(\r
+ chars->Ch,\r
+ dest + x*giVT_CharWidth, pitch,\r
+ VT_Colour12to24(chars->BGCol),\r
+ VT_Colour12to24(chars->FGCol)\r
+ );\r
+ \r
+ chars ++;\r
+ x ++;\r
+ if( x >= widthInChars ) {\r
+ x = 0;\r
+ y ++;\r
+ dest += pitch*giVT_CharHeight;\r
+ }\r
+ }\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)gpVesa_Framebuffer + (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
+ //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 VIDEO_IOCTL_MODEINFO:\r
return Vesa_Int_ModeInfo((tVideo_IOCtl_Mode*)Data);\r
\r
+ case VIDEO_IOCTL_SETBUFFORMAT:\r
+ ret = giVesaCurrentFormat;\r
+ if(Data) {\r
+ Log_Log("VESA", "Buffer mode to %i", *(int*)Data);\r
+ giVesaCurrentFormat = *(int*)Data;\r
+ }\r
+ return ret;\r
+ \r
+ case VIDEO_IOCTL_SETCURSOR: // Set cursor position\r
+ return 0;\r
+ \r
case VIDEO_IOCTL_REQLFB: // Request Linear Framebuffer\r
return 0;\r
}\r
}\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
+ Log_Log("VESA", "Setting mode to %i", mode);\r
\r
// Sanity Check values\r
if(mode < 0 || mode > giVesaModeCount) return -1;\r
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", "Framebuffer (Phys) = 0x%x", gVesa_Modes[mode].framebuffer);\r
+ Log_Log("VESA", "Framebuffer (Virt) = 0x%x", gpVesa_Framebuffer);\r
\r
// Record Mode Set\r
giVesaCurrentMode = mode;\r
\r
ENTER("idata->width idata->height idata->bpp", data->width, data->height, data->bpp);\r
\r
- if(data->flags & VIDEO_FLAG_TEXT) {\r
- LEAVE('i', 0);\r
- return 0;\r
- }\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
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au