X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdrv%2Fvterm.c;h=217557058c0376ae5507092f951d9e037ebd7d07;hb=85362e8a4c919b58cd261345d29f26bae4ad75e2;hp=9a88fa697347298445116f973b6e358aaf773f14;hpb=9659f4f4435c25edeafacece13450da80c9d5066;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/drv/vterm.c b/KernelLand/Kernel/drv/vterm.c
index 9a88fa69..21755705 100644
--- a/KernelLand/Kernel/drv/vterm.c
+++ b/KernelLand/Kernel/drv/vterm.c
@@ -5,7 +5,7 @@
  * drv/vterm.c
  * - Virtual Terminal - Initialisation and VFS Interface
  */
-#define DEBUG	1
+#define DEBUG	0
 #include "vterm.h"
 #include <fs_devfs.h>
 #include <modules.h>
@@ -20,7 +20,6 @@
 #define	NUM_VTS	8
 //#define DEFAULT_OUTPUT	"BochsGA"
 #define DEFAULT_OUTPUT	"Vesa"
-#define FALLBACK_OUTPUT	"x86_VGAText"
 #define DEFAULT_INPUT	"Keyboard"
 #define	DEFAULT_WIDTH	640
 #define	DEFAULT_HEIGHT	480
@@ -35,7 +34,6 @@ extern void	Debug_SetKTerminal(const char *File);
 // === PROTOTYPES ===
  int	VT_Install(char **Arguments);
  int	VT_Root_IOCtl(tVFS_Node *Node, int Id, void *Data);
-void	VT_int_PutFBData(tVTerm *Term, size_t Offset, size_t Length, const void *Data);
 void	VT_PTYOutput(void *Handle, size_t Length, const void *Data);
  int	VT_PTYResize(void *Handle, const struct ptydims *Dims); 
  int	VT_PTYModeset(void *Handle, const struct ptymode *Mode);
@@ -126,9 +124,9 @@ int VT_Install(char **Arguments)
 	// Apply Defaults
 	if(!gsVT_OutputDevice)	gsVT_OutputDevice = (char*)DEFAULT_OUTPUT;
 	else if( Module_EnsureLoaded( gsVT_OutputDevice ) )	gsVT_OutputDevice = (char*)DEFAULT_OUTPUT;
-	if( Module_EnsureLoaded( gsVT_OutputDevice ) )	gsVT_OutputDevice = (char*)FALLBACK_OUTPUT;
+	//if( Module_EnsureLoaded( gsVT_OutputDevice ) )	gsVT_OutputDevice = (char*)FALLBACK_OUTPUT;
 	if( Module_EnsureLoaded( gsVT_OutputDevice ) ) {
-		Log_Error("VTerm", "Fallback video '%s' is not avaliable, giving up", FALLBACK_OUTPUT);
+		Log_Error("VTerm", "Video device '%s' is not avaliable, giving up", gsVT_OutputDevice);
 		return MODULE_ERR_MISC;
 	}
 	
@@ -370,15 +368,16 @@ void VT_PTYOutput(void *Handle, size_t Length, const void *Data)
 		VT_int_PutString(term, Data, Length);
 		break;
 	case PTYBUFFMT_FB:
-		// TODO: How do offset?
+		// TODO: How can the offset be done cleanly? (Ask the PTY for its offset?)
+		Warning("TODO: Offsets for VT_PTYOutput FBData");
 		VT_int_PutFBData(term, 0, Length, Data);
 		break;
 	case PTYBUFFMT_2DCMD:
-		// TODO: Impliment 2D commands
 		VT_int_Handle2DCmd(term, Length, Data);
 		break;
 	case PTYBUFFMT_3DCMD:
-		// TODO: Impliment 3D commands
+		// TODO: Implement 3D commands
+		Warning("TODO: VTerm 3D commands");
 		break;
 	}
 }