From: John Hodge <tpg@mutabah.net>
Date: Sun, 14 Jul 2013 15:18:06 +0000 (+0800)
Subject: AcessNative - Added PTY init to AcessKernel
X-Git-Tag: rel0.15~355
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=5b5ee32779c93bf44c03d91ea6476eb9a711d231;p=tpg%2Facess2.git

AcessNative - Added PTY init to AcessKernel
---

diff --git a/AcessNative/acesskernel_src/main.c b/AcessNative/acesskernel_src/main.c
index 8e170993..be03fe61 100644
--- a/AcessNative/acesskernel_src/main.c
+++ b/AcessNative/acesskernel_src/main.c
@@ -21,6 +21,7 @@
 extern int	UI_Initialise(int Width, int Height);
 extern void	UI_MainLoop(void);
 extern int	VFS_Init(void);
+extern int	PTY_Install(char **Arguments);
 extern int	Video_Install(char **Arguments);
 extern int	NativeKeyboard_Install(char **Arguments);
 extern int	NativeFS_Install(char **Arguments);
@@ -98,6 +99,7 @@ int main(int argc, char *argv[])
 	NativeFS_Install(NULL);
 	Mouse_Install(NULL);
 	IPCPipe_Install(NULL);
+	PTY_Install(NULL);
 	// - Start VTerm
 	{
 		char	*args[] = {
@@ -111,7 +113,7 @@ int main(int argc, char *argv[])
 	VFS_MkDir("/Acess");	
 	VFS_Mount(gsAcessDir, "/Acess", "nativefs", "");
 
-	Debug_SetKTerminal("/Devices/VTerm/8");
+	Debug_SetKTerminal("/Devices/pts/vt7c");
 	
 	// Start syscall server
 	SyscallServer();
diff --git a/AcessNative/ld-acess_src/syscalls.c b/AcessNative/ld-acess_src/syscalls.c
index 88db8c44..48305e35 100644
--- a/AcessNative/ld-acess_src/syscalls.c
+++ b/AcessNative/ld-acess_src/syscalls.c
@@ -22,7 +22,7 @@
 
 #define assert(cnd) do{ \
 	if( !(cnd) ) { \
-		fprintf(stderr, "%s:%i - assert failed - " #cnd, __FILE__, __LINE__);\
+		fprintf(stderr, "%s:%i - assert failed - " #cnd"\n", __FILE__, __LINE__);\
 		exit(-1); \
 	} \
 }while(0)