AcessNative - Fix incorrect VT name, clean up a warning

[tpg/acess2.git] / AcessNative / acesskernel_src / main.c

diff --git a/AcessNative/acesskernel_src/main.c b/AcessNative/acesskernel_src/main.c
index eb0883d..4f5de23 100644 (file)
--- 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
@@ -21,12 +22,15 @@
 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);
 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);
@@ -36,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__
@@ -96,6 +100,9 @@ int main(int argc, char *argv[])
        }
        NativeFS_Install(NULL);
        Mouse_Install(NULL);
+       IPCPipe_Install(NULL);
+       PTY_Install(NULL);
+       Net_Install(NULL);
        // - Start VTerm
        {
                char    *args[] = {
@@ -109,7 +116,7 @@ int main(int argc, char *argv[])
        VFS_MkDir("/Acess");    
        VFS_Mount(gsAcessDir, "/Acess", "nativefs", "");
 
-       Debug_SetKTerminal("/Devices/VTerm/8");
+       Debug_SetKTerminal("/Devices/pts/vt7");
        
        // Start syscall server
        SyscallServer();
@@ -125,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;
@@ -162,3 +169,8 @@ int Module_EnsureLoaded(const char *Name)
        return 0;
 }
 
+void Proc_PrintBacktrace(void)
+{
+       
+}
+