X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fmain.c;h=4f5de2399d7f501d8c61218224b251253ec25a28;hb=3c283c4831c40c14d308a54cefb997832a860bca;hp=be03fe61de177410ecb3a7822eef684bdada3908;hpb=5b5ee32779c93bf44c03d91ea6476eb9a711d231;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/main.c b/AcessNative/acesskernel_src/main.c
index be03fe61..4f5de239 100644
--- a/AcessNative/acesskernel_src/main.c
+++ b/AcessNative/acesskernel_src/main.c
@@ -13,6 +13,7 @@
 #endif
 #include <unistd.h>
 #include <string.h>
+#include <stdbool.h>
 #include "../../KernelLand/Kernel/include/logdebug.h"
 
 #define VALGRIND_CLIENT	0
@@ -29,6 +30,7 @@ extern void	Debug_SetKTerminal(char *Path);
 extern int	VT_Install(char **Arguments);
 extern int	Mouse_Install(char **Arguments);
 extern int	IPCPipe_Install(char **Arguments);
+extern int	Net_Install(char **Arguments);
 extern int	VFS_Mount(const char *Device, const char *MountPoint, const char *Filesystem, const char *Options);
 extern int	VFS_MkDir(const char *Path);
 extern int	SyscallServer(void);
@@ -38,7 +40,7 @@ extern const char	gsGitHash[];
 extern int	giBuildNumber;
 
 // === GLOBALS ===
-const char	*gsAcessDir = "../Usermode/Output/x86_64";
+const char	*gsAcessDir = "../Usermode/Output/native";
 
 // === CODE ===
 #ifndef __WIN32__
@@ -100,6 +102,7 @@ int main(int argc, char *argv[])
 	Mouse_Install(NULL);
 	IPCPipe_Install(NULL);
 	PTY_Install(NULL);
+	Net_Install(NULL);
 	// - Start VTerm
 	{
 		char	*args[] = {
@@ -113,7 +116,7 @@ int main(int argc, char *argv[])
 	VFS_MkDir("/Acess");	
 	VFS_Mount(gsAcessDir, "/Acess", "nativefs", "");
 
-	Debug_SetKTerminal("/Devices/pts/vt7c");
+	Debug_SetKTerminal("/Devices/pts/vt7");
 	
 	// Start syscall server
 	SyscallServer();
@@ -129,13 +132,13 @@ int main(int argc, char *argv[])
 		args[argcount++] = "valgrind";
 		#endif
 		args[argcount++] = "./ld-acess";
-		args[argcount++] = "--open";	args[argcount++] = "/Devices/VTerm/0";
-		args[argcount++] = "--open";	args[argcount++] = "/Devices/VTerm/0";
-		args[argcount++] = "--open";	args[argcount++] = "/Devices/VTerm/0";
+		args[argcount++] = "--open";	args[argcount++] = "/Devices/pts/vt0";
+		args[argcount++] = "--open";	args[argcount++] = "/Devices/pts/vt0";
+		args[argcount++] = "--open";	args[argcount++] = "/Devices/pts/vt0";
 		for( i = 0; i < rootapp_argc; i ++ )
 			args[argcount+i] = rootapp[i];
 		args[argcount+rootapp_argc] = NULL;
-		pid = spawnv(P_NOWAIT, "./ld-acess", args);
+		pid = spawnv(P_NOWAIT, "./ld-acess", (char *const*)args);
 		if(pid < 0) {
 			perror("Starting root application [fork(2)]");
 			return 1;
@@ -166,3 +169,8 @@ int Module_EnsureLoaded(const char *Name)
 	return 0;
 }
 
+void Proc_PrintBacktrace(void)
+{
+	
+}
+