X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FDisplay%2FVESA%2Fmain.c;h=02689ea2cdadb816d933c5ae0893711f25b920fd;hb=cc8b3e3a6e84370a5b1e1109c17a08dcbc82d3b9;hp=d4e2d135d99e160c2ef6ab41c03dc67976c2ecdc;hpb=da7ef0c8cace452ccfdfa0881a3c0b09970874d8;p=tpg%2Facess2.git

diff --git a/Modules/Display/VESA/main.c b/Modules/Display/VESA/main.c
index d4e2d135..02689ea2 100644
--- a/Modules/Display/VESA/main.c
+++ b/Modules/Display/VESA/main.c
@@ -7,7 +7,7 @@
 
 #include <acess.h>
 #include <vfs.h>
-#include <tpl_drv_video.h>
+#include <api_drv_video.h>
 #include <fs_devfs.h>
 #include <modules.h>
 #include <vm8086.h>
@@ -16,12 +16,16 @@
 // === CONSTANTS ===
 #define	FLAG_LFB	0x1
 #define VESA_DEFAULT_FRAMEBUFFER	(KERNEL_BASE|0xA0000)
+#define BLINKING_CURSOR	1
+#if BLINKING_CURSOR
+# define VESA_CURSOR_PERIOD	1000
+#endif
 
 // === PROTOTYPES ===
  int	Vesa_Install(char **Arguments);
 Uint64	Vesa_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
 Uint64	Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
- int	Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data);
+ int	Vesa_IOCtl(tVFS_Node *Node, int ID, void *Data);
  int	Vesa_Int_SetMode(int Mode);
  int	Vesa_Int_FindMode(tVideo_IOCtl_Mode *data);
  int	Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data);
@@ -37,16 +41,16 @@ tDevFS_Driver	gVesa_DriverStruct = {
 	{
 	.Read = Vesa_Read,
 	.Write = Vesa_Write,
-	.IOCtl = Vesa_Ioctl
+	.IOCtl = Vesa_IOCtl
 	}
 };
-tSpinlock	glVesa_Lock;
+tMutex	glVesa_Lock;
 tVM8086	*gpVesa_BiosState;
  int	giVesaDriverId = -1;
 // --- Video Modes ---
  int	giVesaCurrentMode = 0;
- int	giVesaCurrentFormat = VIDEO_BUFFMT_TEXT;
 tVesa_Mode	*gVesa_Modes;
+tVesa_Mode	*gpVesaCurMode;
  int	giVesaModeCount = 0;
 // --- Framebuffer ---
 char	*gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;
@@ -61,6 +65,7 @@ tDrvUtil_Video_2DHandlers	gVesa_2DFunctions = {
 	Vesa_2D_Fill,
 	Vesa_2D_Blit
 };
+tDrvUtil_Video_BufInfo	gVesa_BufInfo;
 
 // === CODE ===
 int Vesa_Install(char **Arguments)
@@ -88,13 +93,15 @@ int Vesa_Install(char **Arguments)
 		return MODULE_ERR_NOTNEEDED;
 	}
 	
-	Log_Debug("VESA", "info->VideoModes = %04x:%04x", info->VideoModes.seg, info->VideoModes.ofs);
+	//Log_Debug("VESA", "info->VideoModes = %04x:%04x", info->VideoModes.seg, info->VideoModes.ofs);
 	modes = (Uint16 *) VM8086_GetPointer(gpVesa_BiosState, info->VideoModes.seg, info->VideoModes.ofs);
 	
 	// Read Modes
 	for( giVesaModeCount = 0; modes[giVesaModeCount] != 0xFFFF; giVesaModeCount++ );
 	gVesa_Modes = (tVesa_Mode *)malloc( giVesaModeCount * sizeof(tVesa_Mode) );
 	
+	Log_Debug("VESA", "%i Modes", giVesaModeCount);
+	
 	// Insert Text Mode
 	gVesa_Modes[0].width = 80;
 	gVesa_Modes[0].height = 25;
@@ -120,7 +127,7 @@ int Vesa_Install(char **Arguments)
 		{
 			gVesa_Modes[i].flags |= FLAG_LFB;
 			gVesa_Modes[i].framebuffer = modeinfo->physbase;
-			gVesa_Modes[i].fbSize = modeinfo->Xres*modeinfo->Yres*modeinfo->bpp/8;
+			gVesa_Modes[i].fbSize = modeinfo->Yres*modeinfo->pitch;
 		} else {
 			gVesa_Modes[i].framebuffer = 0;
 			gVesa_Modes[i].fbSize = 0;
@@ -160,184 +167,26 @@ Uint64 Vesa_Read(tVFS_Node *Node, Uint64 off, Uint64 len, void *buffer)
  */
 Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 {
-	ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
-
-	if(Buffer == NULL) {
-		LEAVE('i', 0);
-		return 0;
-	}
-
-	// Default Text mode
-	if( giVesaCurrentMode == 0 )
-	{
-		Uint16	*fb = (Uint16*)(KERNEL_BASE|0xB8000);
-		tVT_Char	*chars = Buffer;
-		 int	rem;
-		
-		Length /= sizeof(tVT_Char);
-		Offset /= sizeof(tVT_Char);
-		
-		if( giVesaCurrentFormat != VIDEO_BUFFMT_TEXT ) {
-			Log_Warning("VESA", "Vesa_Write - Mode 0 is not framebuffer");
-			LEAVE('i', -1);
-			return -1;
-		}
-		
-		if( Offset + Length > 25*80 ) {
-			Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");
-			LEAVE('i', 0);
-			return 0;
-		}
-		
-		fb += 2*Offset;
-		LOG("fb = %p", fb);
-		for(rem = Length; rem --; fb ++, chars++)
-		{
-			if( chars->Ch < 0x80 )
-				*fb = chars->Ch & 0x7F;
-			else
-				*fb = 0x00;
-			
-			*fb |= (chars->FGCol & 0x888) == 0x888 ? 0x8 : 0;
-			*fb |= (chars->FGCol & 0x700) > 0x300 ? 0x4 : 0;
-			*fb |= (chars->FGCol & 0x070) > 0x030 ? 0x2 : 0;
-			*fb |= (chars->FGCol & 0x007) > 0x003 ? 0x1 : 0;
-			*fb |= (chars->BGCol & 0x888) == 0x888 ? 0x80 : 0;
-			*fb |= (chars->BGCol & 0x700) > 0x300 ? 0x40 : 0;
-			*fb |= (chars->BGCol & 0x070) > 0x030 ? 0x20 : 0;
-			*fb |= (chars->BGCol & 0x007) > 0x003 ? 0x10 : 0;
-			//LOG("%08x (%03x,%03x) = %04x",
-			//	chars->Ch, chars->BGCol, chars->FGCol, *fb);
-		}
-		Length *= sizeof(tVT_Char);
-		LEAVE('X', Length);
-		return Length;
-	}
-
 	if( gVesa_Modes[giVesaCurrentMode].framebuffer == 0 ) {
 		Log_Warning("VESA", "Vesa_Write - Non-LFB Modes not yet supported.");
-		LEAVE('i', 0);
 		return 0;
 	}
-	
-	// Text Mode
-	switch( giVesaCurrentFormat )
-	{
-	case VIDEO_BUFFMT_TEXT:
-		{
-		tVT_Char	*chars = Buffer;
-		 int	pitch = gVesa_Modes[giVesaCurrentMode].width;
-		 int	widthInChars = gVesa_Modes[giVesaCurrentMode].width/giVT_CharWidth;
-		 int	heightInChars = gVesa_Modes[giVesaCurrentMode].height/giVT_CharHeight;
-		 int	x, y;
-		Uint32	*dest = (void*)gpVesa_Framebuffer;
-		 int	i;
-		
-		Length /= sizeof(tVT_Char);
-		Offset /= sizeof(tVT_Char);
-		
-		LOG("gVesa_Modes[%i].width = %i", giVesaCurrentMode, gVesa_Modes[giVesaCurrentMode].width);
-		x = Offset % widthInChars;
-		y = Offset / widthInChars;
-		LOG("(x,y) = (%i,%i) = [%i,%i]", x, y, x * giVT_CharWidth, y * giVT_CharHeight * pitch);
-		LOG("(w,h) = (%i,%i) = [%i,%i]",
-			(int)(Length % widthInChars),
-			(int)(Length / widthInChars),
-			(int)((Length % widthInChars) * giVT_CharWidth),
-			(int)((Length / widthInChars) * giVT_CharHeight * pitch)
-			);
-		
-		// Sanity Check
-		if(y >= heightInChars) {
-			LEAVE('i', 0);
-			return 0;
-		}
-		
-		if( Offset + Length > heightInChars*widthInChars ) {
-			Log_Debug("VESA", "%i + %i > %i*%i (%i)",
-				(int)Offset, (int)Length, heightInChars, widthInChars, heightInChars*widthInChars);
-			Length = heightInChars*widthInChars - Offset;
-			Log_Notice("VESA", "Clipping write size to %i characters", (int)Length);
-		}
-		
-		dest += y * giVT_CharHeight * pitch;
-		dest += x * giVT_CharWidth;
-		
-		LOG("dest = %p", dest);
-		
-		for( i = 0; i < Length; i++ )
-		{
-			VT_Font_Render(
-				chars->Ch,
-				dest + x*giVT_CharWidth, pitch,
-				VT_Colour12to24(chars->BGCol),
-				VT_Colour12to24(chars->FGCol)
-				);
-			
-			chars ++;
-			x ++;
-			if( x >= widthInChars ) {
-				x = 0;
-				y ++;
-				dest += pitch*giVT_CharHeight;
-			}
-		}
-		Length *= sizeof(tVT_Char);
-		}
-		break;
-	
-	case VIDEO_BUFFMT_FRAMEBUFFER:
-		{
-		Uint8	*destBuf = (Uint8*) ((Uint)gpVesa_Framebuffer + (Uint)Offset);
-		
-		if(gVesa_Modes[giVesaCurrentMode].fbSize < Offset+Length)
-		{
-			Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");
-			LEAVE('i', 0);
-			return 0;
-		}
-		
-		LOG("buffer = %p", Buffer);
-		LOG("Updating Framebuffer (%p to %p)", destBuf, destBuf + (Uint)Length);
-		
-		
-		// Copy to Frambuffer
-		memcpy(destBuf, Buffer, Length);
-		
-		LOG("BGA Framebuffer updated");
-		}
-		break;
-	
-	case VIDEO_BUFFMT_2DSTREAM:
-		Length = DrvUtil_Video_2DStream(
-			NULL,	// Single framebuffer, so Ent is unused
-			Buffer, Length, &gVesa_2DFunctions, sizeof(gVesa_2DFunctions)
-			);
-		break;
-	
-	default:
-		LEAVE('i', -1);
-		return -1;
-	}
-	
-	LEAVE('X', Length);
-	return Length;
+
+	return DrvUtil_Video_WriteLFB(&gVesa_BufInfo, Offset, Length, Buffer);
 }
 
+const char *csaVESA_IOCtls[] = {DRV_IOCTLNAMES, DRV_VIDEO_IOCTLNAMES, NULL};
 /**
- * \fn int Vesa_Ioctl(vfs_node *node, int id, void *data)
  * \brief Handle messages to the device
  */
-int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
+int Vesa_IOCtl(tVFS_Node *Node, int ID, void *Data)
 {
 	 int	ret;
 	//Log_Debug("VESA", "Vesa_Ioctl: (Node=%p, ID=%i, Data=%p)", Node, ID, Data);
 	switch(ID)
 	{
-	case DRV_IOCTL_TYPE:	return DRV_TYPE_VIDEO;
-	case DRV_IOCTL_IDENT:	memcpy("VESA", Data, 4);	return 1;
-	case DRV_IOCTL_VERSION:	return VERSION;
-	
+	BASE_IOCTLS(DRV_TYPE_VIDEO, "VESA", VERSION, csaVESA_IOCtls);
+
 	case VIDEO_IOCTL_GETSETMODE:
 		if( !Data )	return giVesaCurrentMode;
 		return Vesa_Int_SetMode( *(int*)Data );
@@ -348,36 +197,42 @@ int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
 		return Vesa_Int_ModeInfo((tVideo_IOCtl_Mode*)Data);
 	
 	case VIDEO_IOCTL_SETBUFFORMAT:
-		ret = giVesaCurrentFormat;
-		if(Data) {
-			//Log_Log("VESA", "Buffer mode to %i", *(int*)Data);
-			giVesaCurrentFormat = *(int*)Data;
-		}
+		ret = gVesa_BufInfo.BufferFormat;
+		if(Data)	gVesa_BufInfo.BufferFormat = *(int*)Data;
 		return ret;
 	
 	case VIDEO_IOCTL_SETCURSOR:	// Set cursor position
+		#if !BLINKING_CURSOR
+		if(giVesaCursorX >= 0)
+			Vesa_FlipCursor(Node);
+		#endif
 		giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x;
 		giVesaCursorY = ((tVideo_IOCtl_Pos*)Data)->y;
+		//Log_Debug("VESA", "Cursor position (%i,%i)", giVesaCursorX, giVesaCursorY);
 		if(
 			giVesaCursorX < 0 || giVesaCursorY < 0
-		||	giVesaCursorX >= gVesa_Modes[giVesaCurrentMode].width
-		||	giVesaCursorY >= gVesa_Modes[giVesaCurrentMode].height)
+		||	giVesaCursorX >= gpVesaCurMode->width/giVT_CharWidth
+		||	giVesaCursorY >= gpVesaCurMode->height/giVT_CharHeight)
 		{
-			if(giVesaCursorTimer != -1)
+			#if BLINKING_CURSOR
+			if(giVesaCursorTimer != -1) {
 				Time_RemoveTimer(giVesaCursorTimer);
+				giVesaCursorTimer = -1;
+			}
+			#endif
 			giVesaCursorX = -1;
 			giVesaCursorY = -1;
 		}
 		else {
+			#if BLINKING_CURSOR
+		//	Log_Debug("VESA", "Updating timer %i?", giVesaCursorTimer);
 			if(giVesaCursorTimer == -1)
-				giVesaCursorTimer = Time_CreateTimer(500, Vesa_FlipCursor, Node);
+				giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Node);
+			#else
+			Vesa_FlipCursor(Node);
+			#endif
 		}
-		
-		Log_Debug("VESA", "Cursor at (%i,%i), timer %i",
-			giVesaCursorX, giVesaCursorY, giVesaCursorTimer);
-		return 0;
-	
-	case VIDEO_IOCTL_REQLFB:	// Request Linear Framebuffer
+		//Log_Debug("VESA", "Cursor position (%i,%i) Timer %i", giVesaCursorX, giVesaCursorY, giVesaCursorTimer);
 		return 0;
 	}
 	return 0;
@@ -387,16 +242,23 @@ int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
  * \brief Updates the video mode
  */
 int Vesa_Int_SetMode(int mode)
-{
-	Log_Log("VESA", "Setting mode to %i", mode);
-	
+{	
 	// Sanity Check values
 	if(mode < 0 || mode > giVesaModeCount)	return -1;
+
+	Log_Log("VESA", "Setting mode to %i (%ix%i %ibpp)",
+		mode,
+		gVesa_Modes[mode].width, gVesa_Modes[mode].height,
+		gVesa_Modes[mode].bpp
+		);
 	
 	// Check for fast return
 	if(mode == giVesaCurrentMode)	return 1;
 	
-	LOCK( &glVesa_Lock );
+	Time_RemoveTimer(giVesaCursorTimer);
+	giVesaCursorTimer = -1;
+	
+	Mutex_Acquire( &glVesa_Lock );
 	
 	gpVesa_BiosState->AX = 0x4F02;
 	gpVesa_BiosState->BX = gVesa_Modes[mode].code;
@@ -414,14 +276,21 @@ int Vesa_Int_SetMode(int mode)
 	giVesaPageCount = (gVesa_Modes[mode].fbSize + 0xFFF) >> 12;
 	gpVesa_Framebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount);
 	
-	Log_Log("VESA", "Framebuffer (Phys) = 0x%x", gVesa_Modes[mode].framebuffer);
-	Log_Log("VESA", "Framebuffer (Virt) = 0x%x", gpVesa_Framebuffer);
+	Log_Log("VESA", "Framebuffer (Phys) = 0x%x, (Virt) = 0x%x, Size = 0x%x",
+		gVesa_Modes[mode].framebuffer, gpVesa_Framebuffer, giVesaPageCount << 12);
 	
 	// Record Mode Set
 	giVesaCurrentMode = mode;
+	gpVesaCurMode = &gVesa_Modes[giVesaCurrentMode];
 	
-	RELEASE( &glVesa_Lock );
-	
+	Mutex_Release( &glVesa_Lock );
+
+	gVesa_BufInfo.Framebuffer = gpVesa_Framebuffer;
+	gVesa_BufInfo.Pitch = gVesa_Modes[mode].pitch;
+	gVesa_BufInfo.Width = gVesa_Modes[mode].width;
+	gVesa_BufInfo.Height = gVesa_Modes[mode].height;
+	gVesa_BufInfo.Depth = gVesa_Modes[mode].bpp;	
+
 	return 1;
 }
 
@@ -437,19 +306,36 @@ int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data)
 	{
 		LOG("Mode %i (%ix%ix%i)", i, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp);
 	
-		if(gVesa_Modes[i].width == data->width
-		&& gVesa_Modes[i].height == data->height
-		&& gVesa_Modes[i].bpp == data->bpp)
+		if(gVesa_Modes[i].width == data->width && gVesa_Modes[i].height == data->height)
 		{
-			LOG("Perfect!");
-			best = i;
-			break;
+			//if( (data->bpp == 32 || data->bpp == 24)
+			// && (gVesa_Modes[i].bpp == 32 || gVesa_Modes[i].bpp == 24) )
+			if( data->bpp == gVesa_Modes[i].bpp )
+			{
+				LOG("Perfect!");
+				best = i;
+				break;
+			}
 		}
 		
-		tmp = gVesa_Modes[i].width * gVesa_Modes[i].height * gVesa_Modes[i].bpp;
-		tmp -= data->width * data->height * data->bpp;
+		tmp = gVesa_Modes[i].width * gVesa_Modes[i].height;
+		tmp -= data->width * data->height;
 		tmp = tmp < 0 ? -tmp : tmp;
-		factor = tmp * 100 / (data->width * data->height * data->bpp);
+		factor = tmp * 1000 / (data->width * data->height);
+		
+		if( data->bpp == 8 && gVesa_Modes[i].bpp != 8 )	continue;
+		if( data->bpp == 16 && gVesa_Modes[i].bpp != 16 )	continue;
+		
+		if( (data->bpp == 32 || data->bpp == 24)
+		 && (gVesa_Modes[i].bpp == 32 || gVesa_Modes[i].bpp == 24) )
+		{
+			if( data->bpp == gVesa_Modes[i].bpp )
+				factor /= 2;
+		}
+		else {
+			if( data->bpp != gVesa_Modes[i].bpp )
+				continue ;
+		}
 		
 		LOG("factor = %i", factor);
 		
@@ -482,18 +368,62 @@ int Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data)
  */
 void Vesa_FlipCursor(void *Arg)
 {
-	 int	pitch = gVesa_Modes[giVesaCurrentMode].pitch;
+	 int	pitch = gpVesaCurMode->pitch;
+	 int	bytes_per_px = (gpVesaCurMode->bpp + 7) / 8;
 	 int	x = giVesaCursorX*giVT_CharWidth;
 	 int	y = giVesaCursorY*giVT_CharHeight;
 	 int	i;
-	Uint32	*fb = (void*)gpVesa_Framebuffer;
+	Uint8	*fb = (void*)gpVesa_Framebuffer;
+	
+	//Debug("Cursor flip");
+	
+	// Sanity check
+	if(giVesaCursorX < 0 || giVesaCursorY < 0
+	|| y*pitch + x + (giVT_CharHeight-1)*pitch > (int)gpVesaCurMode->fbSize) {
+		Log_Notice("VESA", "Cursor OOB (%i,%i)", x, y);
+		giVesaCursorTimer = -1;
+		return;
+	}
 	
-	if(giVesaCursorX < 0 || giVesaCursorY < 0)	return;
+	// Draw cursor
+	fb += (y+1)*pitch + x*bytes_per_px;
 	
-	for( i = 0; i < giVT_CharHeight; i++ )
-		fb[(y+i)*pitch+x] = fb[(y+i)*pitch+x];
+	switch(bytes_per_px)
+	{
+	case 1:
+		for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch )
+			*fb = ~*fb;
+		break;
+	case 2:
+		for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch ) {
+			fb[0] = ~fb[0];
+			fb[1] = ~fb[1];
+		}
+		break;
+	case 3:
+		for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch ) {
+			fb[0] = ~fb[0];
+			fb[1] = ~fb[1];
+			fb[2] = ~fb[2];
+		}
+		break;
+	case 4:
+		for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch ) {
+			fb[0] = ~fb[0];
+			fb[1] = ~fb[1];
+			fb[2] = ~fb[2];
+			fb[3] = ~fb[3];
+		}
+		break;
+	default:
+		Log_Error("VESA", "Vesa_FlipCursor - Bug Report, unknown bytes_per_px (%i)", bytes_per_px);
+		giVesaCursorTimer = -1;
+		return ;
+	}
 	
-	giVesaCursorTimer = Time_CreateTimer(500, Vesa_FlipCursor, Arg);
+	#if BLINKING_CURSOR
+	giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Arg);
+	#endif
 }
 
 // ------------------------
@@ -501,17 +431,19 @@ void Vesa_FlipCursor(void *Arg)
 // ------------------------
 void Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour)
 {
-	 int	scrnwidth = gVesa_Modes[giVesaCurrentMode].width;
-	Uint32	*buf = (Uint32*)gpVesa_Framebuffer + Y*scrnwidth + X;
+	// TODO: Handle non-32bit modes
+	 int	pitch = gpVesaCurMode->pitch/4;
+	Uint32	*buf = (Uint32*)gpVesa_Framebuffer + Y*pitch + X;
 	while( H -- ) {
 		memsetd(buf, Colour, W);
-		buf += scrnwidth;
+		buf += pitch;
 	}
 }
 
 void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H)
 {
-	 int	scrnpitch = gVesa_Modes[giVesaCurrentMode].pitch;
+	 int	scrnpitch = gpVesaCurMode->pitch;
+	 int	bytes_per_px = (gpVesaCurMode->bpp + 7) / 8;
 	 int	dst = DstY*scrnpitch + DstX;
 	 int	src = SrcY*scrnpitch + SrcX;
 	 int	tmp;
@@ -519,14 +451,14 @@ void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY,
 	//Log("Vesa_2D_Blit: (Ent=%p, DstX=%i, DstY=%i, SrcX=%i, SrcY=%i, W=%i, H=%i)",
 	//	Ent, DstX, DstY, SrcX, SrcY, W, H);
 	
-	if(SrcX + W > gVesa_Modes[giVesaCurrentMode].width)
-		W = gVesa_Modes[giVesaCurrentMode].width - SrcX;
-	if(DstX + W > gVesa_Modes[giVesaCurrentMode].width)
-		W = gVesa_Modes[giVesaCurrentMode].width - DstX;
-	if(SrcY + H > gVesa_Modes[giVesaCurrentMode].height)
-		H = gVesa_Modes[giVesaCurrentMode].height - SrcY;
-	if(DstY + H > gVesa_Modes[giVesaCurrentMode].height)
-		H = gVesa_Modes[giVesaCurrentMode].height - DstY;
+	if(SrcX + W > gpVesaCurMode->width)
+		W = gpVesaCurMode->width - SrcX;
+	if(DstX + W > gpVesaCurMode->width)
+		W = gpVesaCurMode->width - DstX;
+	if(SrcY + H > gpVesaCurMode->height)
+		H = gpVesaCurMode->height - SrcY;
+	if(DstY + H > gpVesaCurMode->height)
+		H = gpVesaCurMode->height - DstY;
 	
 	//Debug("W = %i, H = %i", W, H);
 	
@@ -537,18 +469,19 @@ void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY,
 		while( H -- ) {
 			dst -= scrnpitch;
 			src -= scrnpitch;
-			tmp = W;
+			tmp = W*bytes_per_px;
 			for( tmp = W; tmp --; ) {
-				*(Uint32*)(gpVesa_Framebuffer + dst + tmp) = *(Uint32*)(gpVesa_Framebuffer + src + tmp);
+				*(Uint8*)(gpVesa_Framebuffer + dst + tmp) = *(Uint8*)(gpVesa_Framebuffer + src + tmp);
 			}
 		}
 	}
 	else {
 		// Normal copy is OK
 		while( H -- ) {
-			memcpy((void*)gpVesa_Framebuffer + dst, (void*)gpVesa_Framebuffer + src, W*sizeof(Uint32));
+			memcpy((void*)gpVesa_Framebuffer + dst, (void*)gpVesa_Framebuffer + src, W*bytes_per_px);
 			dst += scrnpitch;
 			src += scrnpitch;
 		}
 	}
+	//Log("Vesa_2D_Blit: RETURN");
 }