X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Fdrv%2Fvga.c;h=ac00c78b1ab8a2f257a73cf9bd395df4660c5ac4;hb=3e11c7767641614fbb3fad38fffefa0da9e66919;hp=015423de51ef66cd72d8c25605da7361f55b75fd;hpb=8a867fdf503d26e151bcc084a7147ba0f62271b0;p=tpg%2Facess2.git

diff --git a/Kernel/drv/vga.c b/Kernel/drv/vga.c
index 015423de..ac00c78b 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>
@@ -50,7 +51,7 @@ int VGA_Install(char **Arguments)
 	// Install DevFS
 	DevFS_AddDevice( &gVGA_DevInfo );
 	
-	return 1;
+	return MODULE_ERR_OK;
 }
 
 /**
@@ -90,8 +91,7 @@ int VGA_IOCtl(tVFS_Node *Node, int Id, void *Data)
 	case DRV_IOCTL_VERSION:	*(int*)Data = 50;	return 1;
 	case DRV_IOCTL_LOOKUP:	return 0;
 	
-	case VIDEO_IOCTL_GETMODE:	return 0;	// Mode 0 only
-	case VIDEO_IOCTL_SETMODE:	return 0;	// Ignored (Text Only ATM)
+	case VIDEO_IOCTL_GETSETMODE:	return 0;	// Mode 0 only
 	case VIDEO_IOCTL_FINDMODE:	return 0;	// Text Only!
 	case VIDEO_IOCTL_MODEINFO:
 		if( ((tVideo_IOCtl_Mode*)Data)->id != 0)	return 0;
@@ -99,6 +99,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;
@@ -119,7 +123,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