// === CONSTANTS ===\r
#define FLAG_LFB 0x1\r
#define VESA_DEFAULT_FRAMEBUFFER (KERNEL_BASE|0xA0000)\r
-#define VESA_CURSOR_PERIOD 1000\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
.IOCtl = Vesa_Ioctl\r
}\r
};\r
-tSpinlock glVesa_Lock;\r
+tMutex glVesa_Lock;\r
tVM8086 *gpVesa_BiosState;\r
int giVesaDriverId = -1;\r
// --- Video Modes ---\r
int giVesaCurrentMode = 0;\r
int giVesaCurrentFormat = VIDEO_BUFFMT_TEXT;\r
tVesa_Mode *gVesa_Modes;\r
+tVesa_Mode *gpVesaCurMode;\r
int giVesaModeCount = 0;\r
// --- Framebuffer ---\r
char *gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;\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
{\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
+ gVesa_Modes[i].fbSize = modeinfo->Yres*modeinfo->pitch;\r
} else {\r
gVesa_Modes[i].framebuffer = 0;\r
gVesa_Modes[i].fbSize = 0;\r
case VIDEO_BUFFMT_TEXT:\r
{\r
tVT_Char *chars = Buffer;\r
- int pitch = gVesa_Modes[giVesaCurrentMode].width;\r
+ int pitch = gVesa_Modes[giVesaCurrentMode].pitch;\r
+ int depth = gVesa_Modes[giVesaCurrentMode].bpp;\r
+ int bytes_per_px = gVesa_Modes[giVesaCurrentMode].bpp / 8;\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
+ Uint8 *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
+ if( depth == 32 ) depth = 24; // Actually 24-colour bits\r
+ \r
+ LOG("gVesa_Modes[%i] = {height:%i, width:%i, pitch:%i}",\r
+ giVesaCurrentMode,\r
+ gVesa_Modes[giVesaCurrentMode].height,\r
+ gVesa_Modes[giVesaCurrentMode].width,\r
+ gVesa_Modes[giVesaCurrentMode].pitch\r
+ );\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("(x,y) = (%i,%i) = [%i,%i]",\r
+ x,\r
+ y,\r
+ x * giVT_CharWidth * bytes_per_px,\r
+ y * giVT_CharHeight * pitch\r
+ );\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_CharWidth * bytes_per_px),\r
(int)((Length / widthInChars) * giVT_CharHeight * pitch)\r
);\r
\r
// Sanity Check\r
+ if( Offset > (Uint64)(heightInChars*widthInChars) ) {\r
+ LEAVE('i', 0);\r
+ return 0;\r
+ }\r
if(y >= heightInChars) {\r
LEAVE('i', 0);\r
return 0;\r
}\r
\r
- if( Offset + Length > heightInChars*widthInChars ) {\r
+ \r
+ if( (int)Offset + (int)Length > heightInChars*widthInChars ) {\r
Log_Debug("VESA", "%i + %i > %i*%i (%i)",\r
(int)Offset, (int)Length, heightInChars, widthInChars, heightInChars*widthInChars);\r
Length = heightInChars*widthInChars - Offset;\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
+ for( i = 0; i < (int)Length; i++ )\r
{\r
+ if(\r
+ !MM_GetPhysAddr( (tVAddr)dest + x*giVT_CharWidth*bytes_per_px )\r
+ // || !MM_GetPhysAddr( (tVAddr)dest + x*giVT_CharWidth*depth/8 + pitch*giVT_CharHeight-1)\r
+ )\r
+ {\r
+ Log_Notice("VESA", "Stopped at %i, not mapped", i);\r
+ break;\r
+ }\r
+ if( y >= heightInChars )\r
+ {\r
+ Log_Notice("VESA", "Stopped at %i", i);\r
+ break;\r
+ }\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
+ dest + x*giVT_CharWidth*bytes_per_px, bytes_per_px*8, pitch,\r
+ VT_Colour12toN(chars->BGCol, depth),\r
+ VT_Colour12toN(chars->FGCol, depth)\r
);\r
\r
chars ++;\r
x ++;\r
- if( x >= widthInChars ) {\r
+ if( x >= widthInChars )\r
+ {\r
x = 0;\r
y ++;\r
dest += pitch*giVT_CharHeight;\r
}\r
}\r
- Length *= sizeof(tVT_Char);\r
+ Length = i * sizeof(tVT_Char);\r
}\r
break;\r
\r
LOG("buffer = %p", Buffer);\r
LOG("Updating Framebuffer (%p to %p)", destBuf, destBuf + (Uint)Length);\r
\r
+ //TODO: Handle non 32-bpp framebuffer modes\r
\r
// Copy to Frambuffer\r
memcpy(destBuf, Buffer, Length);\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
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 >= gVesa_Modes[giVesaCurrentMode].width\r
- || giVesaCursorY >= gVesa_Modes[giVesaCurrentMode].height)\r
+ || giVesaCursorX >= gpVesaCurMode->width/giVT_CharWidth\r
+ || giVesaCursorY >= gpVesaCurMode->height/giVT_CharHeight)\r
{\r
- if(giVesaCursorTimer != -1)\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
return 0;\r
\r
- case VIDEO_IOCTL_REQLFB: // Request Linear Framebuffer\r
- return 0;\r
+// case VIDEO_IOCTL_REQLFB: // Request Linear Framebuffer\r
+// return 0;\r
}\r
return 0;\r
}\r
* \brief Updates the video mode\r
*/\r
int Vesa_Int_SetMode(int mode)\r
-{\r
- Log_Log("VESA", "Setting mode to %i", mode);\r
- \r
+{ \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
Time_RemoveTimer(giVesaCursorTimer);\r
+ giVesaCursorTimer = -1;\r
\r
- LOCK( &glVesa_Lock );\r
+ Mutex_Acquire( &glVesa_Lock );\r
\r
gpVesa_BiosState->AX = 0x4F02;\r
gpVesa_BiosState->BX = gVesa_Modes[mode].code;\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", gVesa_Modes[mode].framebuffer);\r
- Log_Log("VESA", "Framebuffer (Virt) = 0x%x", gpVesa_Framebuffer);\r
+ Log_Log("VESA", "Framebuffer (Phys) = 0x%x, (Virt) = 0x%x, Size = 0x%x",\r
+ gVesa_Modes[mode].framebuffer, gpVesa_Framebuffer, giVesaPageCount << 12);\r
\r
// Record Mode Set\r
giVesaCurrentMode = mode;\r
+ gpVesaCurMode = &gVesa_Modes[giVesaCurrentMode];\r
\r
- RELEASE( &glVesa_Lock );\r
+ Mutex_Release( &glVesa_Lock );\r
\r
return 1;\r
}\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
*/\r
void Vesa_FlipCursor(void *Arg)\r
{\r
- int pitch = gVesa_Modes[giVesaCurrentMode].pitch/4;\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
- Uint32 *fb = (void*)gpVesa_Framebuffer;\r
+ Uint8 *fb = (void*)gpVesa_Framebuffer;\r
+ \r
+ //Debug("Cursor flip");\r
\r
- if(giVesaCursorX < 0 || giVesaCursorY < 0) return;\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
- for( i = 1; i < giVT_CharHeight-1; i++ )\r
- fb[(y+i)*pitch+x] = ~fb[(y+i)*pitch+x];\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
+ 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
// ------------------------\r
void Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour)\r
{\r
- int scrnwidth = gVesa_Modes[giVesaCurrentMode].width;\r
- Uint32 *buf = (Uint32*)gpVesa_Framebuffer + Y*scrnwidth + X;\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 += scrnwidth;\r
+ buf += pitch;\r
}\r
}\r
\r
void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H)\r
{\r
- int scrnpitch = gVesa_Modes[giVesaCurrentMode].pitch;\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
//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 > gVesa_Modes[giVesaCurrentMode].width)\r
- W = gVesa_Modes[giVesaCurrentMode].width - SrcX;\r
- if(DstX + W > gVesa_Modes[giVesaCurrentMode].width)\r
- W = gVesa_Modes[giVesaCurrentMode].width - DstX;\r
- if(SrcY + H > gVesa_Modes[giVesaCurrentMode].height)\r
- H = gVesa_Modes[giVesaCurrentMode].height - SrcY;\r
- if(DstY + H > gVesa_Modes[giVesaCurrentMode].height)\r
- H = gVesa_Modes[giVesaCurrentMode].height - DstY;\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
while( H -- ) {\r
dst -= scrnpitch;\r
src -= scrnpitch;\r
- tmp = W;\r
+ tmp = W*bytes_per_px;\r
for( tmp = W; tmp --; ) {\r
- *(Uint32*)(gpVesa_Framebuffer + dst + tmp) = *(Uint32*)(gpVesa_Framebuffer + src + 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*sizeof(Uint32));\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
}\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au