X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FDisplay%2FVESA%2Fmain.c;h=04e339ba288658ea515c3bed675a315c033287a3;hb=7f80ab30017689efe0aaaab18abc7ceda689d859;hp=e625c57705118e6bfd980ca3fffe6c5decf04daa;hpb=144175640d070e26aa6a661a3a0014fa69e604dd;p=tpg%2Facess2.git

diff --git a/Modules/Display/VESA/main.c b/Modules/Display/VESA/main.c
index e625c577..04e339ba 100644
--- a/Modules/Display/VESA/main.c
+++ b/Modules/Display/VESA/main.c
@@ -16,6 +16,10 @@
 // === 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);
@@ -25,6 +29,10 @@ Uint64	Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
  int	Vesa_Int_SetMode(int Mode);
  int	Vesa_Int_FindMode(tVideo_IOCtl_Mode *data);
  int	Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data);
+void	Vesa_FlipCursor(void *Arg);
+// --- 2D Acceleration Functions --
+void	Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour);
+void	Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, VERSION, Vesa, Vesa_Install, NULL, "PCI", "VM8086", NULL);
@@ -36,17 +44,30 @@ tDevFS_Driver	gVesa_DriverStruct = {
 	.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;
- int	giVesaDriverId = -1;
-char	*gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;
 tVesa_Mode	*gVesa_Modes;
+tVesa_Mode	*gpVesaCurMode;
  int	giVesaModeCount = 0;
- int	giVesaPageCount = 0;
+// --- Framebuffer ---
+char	*gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;
+ int	giVesaPageCount = 0;	//!< Framebuffer size in pages
+// --- Cursor Control ---
+ int	giVesaCursorX = -1;
+ int	giVesaCursorY = -1;
+ int	giVesaCursorTimer = -1;	// Invalid timer
+// --- 2D Video Stream Handlers ---
+tDrvUtil_Video_2DHandlers	gVesa_2DFunctions = {
+	NULL,
+	Vesa_2D_Fill,
+	Vesa_2D_Blit
+};
 
-//CODE
+// === CODE ===
 int Vesa_Install(char **Arguments)
 {
 	tVesa_CallInfo	*info;
@@ -68,17 +89,19 @@ int Vesa_Install(char **Arguments)
 	// Call Interrupt
 	VM8086_Int(gpVesa_BiosState, 0x10);
 	if(gpVesa_BiosState->AX != 0x004F) {
-		Log_Warning("VESA", "Vesa_Install - VESA/VBE Unsupported (AX = 0x%x)\n", gpVesa_BiosState->AX);
+		Log_Warning("VESA", "Vesa_Install - VESA/VBE Unsupported (AX = 0x%x)", gpVesa_BiosState->AX);
 		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;
@@ -104,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;
@@ -210,57 +233,96 @@ Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 	case VIDEO_BUFFMT_TEXT:
 		{
 		tVT_Char	*chars = Buffer;
-		 int	pitch = gVesa_Modes[giVesaCurrentMode].width;
-		 int	widthInChars;
+		 int	pitch = gVesa_Modes[giVesaCurrentMode].pitch;
+		 int	depth = gVesa_Modes[giVesaCurrentMode].bpp;
+		 int	bytes_per_px = gVesa_Modes[giVesaCurrentMode].bpp / 8;
+		 int	widthInChars = gVesa_Modes[giVesaCurrentMode].width/giVT_CharWidth;
+		 int	heightInChars = gVesa_Modes[giVesaCurrentMode].height/giVT_CharHeight;
 		 int	x, y;
-		Uint32	*dest = (void*)gpVesa_Framebuffer;
+		Uint8	*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);
-		widthInChars = gVesa_Modes[giVesaCurrentMode].width/giVT_CharWidth;
+		if( depth == 32 )	depth = 24;	// Actually 24-colour bits
+		
+		LOG("gVesa_Modes[%i] = {height:%i, width:%i, pitch:%i}",
+			giVesaCurrentMode,
+			gVesa_Modes[giVesaCurrentMode].height,
+			gVesa_Modes[giVesaCurrentMode].width,
+			gVesa_Modes[giVesaCurrentMode].pitch
+			);
 		x = Offset % widthInChars;
 		y = Offset / widthInChars;
-		LOG("(x,y) = (%i,%i) = [%i,%i]", x, y, x * giVT_CharWidth, y * giVT_CharHeight * pitch);
+		LOG("(x,y) = (%i,%i) = [%i,%i]",
+			x,
+			y,
+			x * giVT_CharWidth * bytes_per_px,
+			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_CharWidth * bytes_per_px),
 			(int)((Length / widthInChars) * giVT_CharHeight * pitch)
 			);
 		
 		// Sanity Check
-		if(y > gVesa_Modes[giVesaCurrentMode].height/giVT_CharHeight) {
+		if( Offset > (Uint64)(heightInChars*widthInChars) ) {
 			LEAVE('i', 0);
 			return 0;
 		}
+		if(y >= heightInChars) {
+			LEAVE('i', 0);
+			return 0;
+		}
+		
+		
+		if( (int)Offset + (int)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++ )
+		for( i = 0; i < (int)Length; i++ )
 		{
+			if(
+			    !MM_GetPhysAddr( (tVAddr)dest + x*giVT_CharWidth*bytes_per_px )
+			// || !MM_GetPhysAddr( (tVAddr)dest + x*giVT_CharWidth*depth/8 + pitch*giVT_CharHeight-1)
+				)
+			{
+				Log_Notice("VESA", "Stopped at %i, not mapped", i);
+				break;
+			}
+			if( y >= heightInChars )
+			{
+				Log_Notice("VESA", "Stopped at %i", i);
+				break;
+			}
+			
 			VT_Font_Render(
 				chars->Ch,
-				dest + x*giVT_CharWidth, pitch,
-				VT_Colour12to24(chars->BGCol),
-				VT_Colour12to24(chars->FGCol)
+				dest + x*giVT_CharWidth*bytes_per_px, bytes_per_px*8, pitch,
+				VT_Colour12toN(chars->BGCol, depth),
+				VT_Colour12toN(chars->FGCol, depth)
 				);
 			
-			
 			chars ++;
 			x ++;
-			if( x >= widthInChars ) {
+			if( x >= widthInChars )
+			{
 				x = 0;
 				y ++;
 				dest += pitch*giVT_CharHeight;
 			}
 		}
-		Length *= sizeof(tVT_Char);
+		Length = i * sizeof(tVT_Char);
 		}
 		break;
 	
@@ -278,6 +340,7 @@ Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 		LOG("buffer = %p", Buffer);
 		LOG("Updating Framebuffer (%p to %p)", destBuf, destBuf + (Uint)Length);
 		
+		//TODO: Handle non 32-bpp framebuffer modes
 		
 		// Copy to Frambuffer
 		memcpy(destBuf, Buffer, Length);
@@ -285,6 +348,14 @@ Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 		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;
@@ -301,6 +372,7 @@ Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 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;
@@ -319,28 +391,72 @@ int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
 	case VIDEO_IOCTL_SETBUFFORMAT:
 		ret = giVesaCurrentFormat;
 		if(Data) {
-			Log_Log("VESA", "Buffer mode to %i", *(int*)Data);
+			//Log_Log("VESA", "Buffer mode to %i", *(int*)Data);
 			giVesaCurrentFormat = *(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 >= gpVesaCurMode->width/giVT_CharWidth
+		||	giVesaCursorY >= gpVesaCurMode->height/giVT_CharHeight)
+		{
+			#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(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Node);
+			#else
+			Vesa_FlipCursor(Node);
+			#endif
+		}
+		//Log_Debug("VESA", "Cursor position (%i,%i) Timer %i", giVesaCursorX, giVesaCursorY, giVesaCursorTimer);
+		return 0;
+	
 	case VIDEO_IOCTL_REQLFB:	// Request Linear Framebuffer
 		return 0;
 	}
 	return 0;
 }
 
+/**
+ * \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;
@@ -358,13 +474,14 @@ 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 );
 	
 	return 1;
 }
@@ -381,19 +498,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);
 		
@@ -419,3 +553,127 @@ int Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data)
 	data->bpp = gVesa_Modes[data->id].bpp;
 	return 1;
 }
+
+/**
+ * \brief Updates the state of the text cursor
+ * \note Just does a bitwise not on the cursor region
+ */
+void Vesa_FlipCursor(void *Arg)
+{
+	 int	pitch = gpVesaCurMode->pitch;
+	 int	bytes_per_px = (gpVesaCurMode->bpp + 7) / 8;
+	 int	x = giVesaCursorX*giVT_CharWidth;
+	 int	y = giVesaCursorY*giVT_CharHeight;
+	 int	i;
+	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;
+	}
+	
+	// Draw cursor
+	fb += (y+1)*pitch + x*bytes_per_px;
+	
+	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 ;
+	}
+	
+	#if BLINKING_CURSOR
+	giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Arg);
+	#endif
+}
+
+// ------------------------
+// --- 2D Accelleration ---
+// ------------------------
+void Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour)
+{
+	// 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 += pitch;
+	}
+}
+
+void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H)
+{
+	 int	scrnpitch = gpVesaCurMode->pitch;
+	 int	bytes_per_px = (gpVesaCurMode->bpp + 7) / 8;
+	 int	dst = DstY*scrnpitch + DstX;
+	 int	src = SrcY*scrnpitch + SrcX;
+	 int	tmp;
+	
+	//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 > 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);
+	
+	if( dst > src ) {
+		// Reverse copy
+		dst += H*scrnpitch;
+		src += H*scrnpitch;
+		while( H -- ) {
+			dst -= scrnpitch;
+			src -= scrnpitch;
+			tmp = W*bytes_per_px;
+			for( tmp = W; 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*bytes_per_px);
+			dst += scrnpitch;
+			src += scrnpitch;
+		}
+	}
+	//Log("Vesa_2D_Blit: RETURN");
+}