X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fvga.c;h=54360697dd6a5117bdbc621190d0500a30012c59;hb=881a49e0164c582d24db527e474f587a8b5e0c32;hp=4c85631f1442c12d5cf6ae97a8f494adc29a7d9d;hpb=1e7db40300bc594cf708bb6082a6e05a268da946;p=tpg%2Facess2.git

diff --git a/Kernel/drv/vga.c b/Kernel/drv/vga.c
index 4c85631f..54360697 100644
--- a/Kernel/drv/vga.c
+++ b/Kernel/drv/vga.c
@@ -1,7 +1,8 @@
 /*
  * Acess2 VGA Controller Driver
  */
-#include <common.h>
+#define DEBUG	0
+#include <acess.h>
 #include <fs_devfs.h>
 #include <tpl_drv_video.h>
 #include <modules.h>
@@ -14,6 +15,7 @@
  int	VGA_Install(char **Arguments);
 Uint64	VGA_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
  int	VGA_IOCtl(tVFS_Node *Node, int Id, void *Data);
+Uint8	VGA_int_GetColourNibble(Uint16 col);
 Uint16	VGA_int_GetWord(tVT_Char *Char);
 void	VGA_int_SetCursor(Sint16 x, Sint16 y);
 
@@ -50,7 +52,7 @@ int VGA_Install(char **Arguments)
 	// Install DevFS
 	DevFS_AddDevice( &gVGA_DevInfo );
 	
-	return 1;
+	return MODULE_ERR_OK;
 }
 
 /**
@@ -98,6 +100,10 @@ int VGA_IOCtl(tVFS_Node *Node, int Id, void *Data)
 		((tVideo_IOCtl_Mode*)Data)->height = VGA_HEIGHT;
 		((tVideo_IOCtl_Mode*)Data)->bpp = 4;
 		return 1;
+	
+	case VIDEO_IOCTL_SETBUFFORMAT:
+		return 0;
+	
 	case VIDEO_IOCTL_SETCURSOR:
 		VGA_int_SetCursor( ((tVideo_IOCtl_Pos*)Data)->x, ((tVideo_IOCtl_Pos*)Data)->y );
 		return 1;
@@ -118,7 +124,6 @@ Uint8 VGA_int_GetColourNibble(Uint16 col)
 	col = ((col>>2)&3) | ((col>>4)&0xC) | ((col>>6)&0x30);
 	bright = ( (col & 2 ? 1 : 0) + (col & 8 ? 1 : 0) + (col & 32 ? 1 : 0) ) / 2;
 	
-	
 	switch(col)
 	{
 	//	Black