X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fmain.c;h=61ed0fd878a524b108f6b1c7a2a6b7de618fce4b;hb=2207af75e8ed7a19de57ec756ef849f41b67530f;hp=eb0883d7b729a73cdd76273263cfe379107b613e;hpb=04a050f42807686dc119838c82372409246d55bb;p=tpg%2Facess2.git diff --git a/AcessNative/acesskernel_src/main.c b/AcessNative/acesskernel_src/main.c index eb0883d7..61ed0fd8 100644 --- a/AcessNative/acesskernel_src/main.c +++ b/AcessNative/acesskernel_src/main.c @@ -21,12 +21,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); @@ -96,6 +99,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 +115,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(); @@ -125,13 +131,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 +168,8 @@ int Module_EnsureLoaded(const char *Name) return 0; } +void Proc_PrintBacktrace(void) +{ + +} +