// === CONSTANTS ===\r
#define FLAG_LFB 0x1\r
#define VESA_DEFAULT_FRAMEBUFFER (KERNEL_BASE|0xA0000)\r
-#define BLINKING_CURSOR 0\r
+#define BLINKING_CURSOR 1\r
#if BLINKING_CURSOR\r
# define VESA_CURSOR_PERIOD 1000\r
#endif\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
);\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
LOG("dest = %p", dest);\r
\r
- for( i = 0; i < Length; i++ )\r
+ for( i = 0; i < (int)Length; i++ )\r
{\r
VT_Font_Render(\r
chars->Ch,\r
\r
case VIDEO_IOCTL_SETCURSOR: // Set cursor position\r
#if !BLINKING_CURSOR\r
- if(giVesaCursorX > 0 && giVesaCursorY)\r
+ if(giVesaCursorX > 0)\r
Vesa_FlipCursor(Node);\r
#endif\r
giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x;\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
giVesaCurrentMode = mode;\r
gpVesaCurMode = &gVesa_Modes[giVesaCurrentMode];\r
\r
- RELEASE( &glVesa_Lock );\r
+ Mutex_Release( &glVesa_Lock );\r
\r
return 1;\r
}\r
\r
// Sanity 1\r
if(giVesaCursorX < 0 || giVesaCursorY < 0\r
- || y*pitch + x + giVT_CharHeight*pitch > gpVesaCurMode->fbSize/4) {\r
+ || y*pitch + x + giVT_CharHeight*pitch > (int)gpVesaCurMode->fbSize/4) {\r
Debug("Cursor OOB (%i,%i)", x, y);\r
giVesaCursorTimer = -1;\r
return;\r