X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fmain.c;h=363fea1f7946c6bba67682b69920a72cd611f656;hb=df1d534cfe822903fc38e1cc13c4b18941c91908;hp=1dcf61a772d0ed0abc0676bfb31c81fe317f77f0;hpb=c0758a3d1053010f2c6f122365acde3efda2ba77;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/main.c b/AcessNative/acesskernel_src/main.c
index 1dcf61a7..363fea1f 100644
--- a/AcessNative/acesskernel_src/main.c
+++ b/AcessNative/acesskernel_src/main.c
@@ -4,85 +4,58 @@
  *
  * Kernel Main
  */
-#include <acess.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/time.h>
 
-int main(int argc, char *argv[])
-{
-	return 0;
-}
+// === IMPORTS ===
+extern int	UI_Initialise(int Width, int Height);
+extern int	VFS_Init(void);
+extern int	Video_Install(char **Arguments);
+extern int	NativeKeyboard_Install(char **Arguments);
+extern int	VT_Install(char **Arguments);
+extern int	VFS_Mount(const char *Device, const char *MountPoint, const char *Filesystem, const char *Options);
+extern int	SyscallServer(void);
 
-void LogF(const char *Fmt, ...)
-{
-	va_list	args;
-	va_start(args, Fmt);
-	vprintf(Fmt, args);
-	va_end(args);
-}
-
-void Log(const char *Fmt, ...)
-{
-	va_list	args;
-	printf("Log: ");
-	va_start(args, Fmt);
-	vprintf(Fmt, args);
-	va_end(args);
-	printf("\n");
-}
-
-void Warning(const char *Fmt, ...)
-{
-	va_list	args;
-	printf("Warning: ");
-	va_start(args, Fmt);
-	vprintf(Fmt, args);
-	va_end(args);
-	printf("\n");
-}
-
-void Panic(const char *Format, ...)
-{
-	va_list	args;
-	printf("Panic: ");
-	va_start(args, Format);
-	vprintf(Format, args);
-	va_end(args);
-	printf("\n");
-	exit(-1);
-}
+// === GLOBALS ===
+const char	*gsAcessDir = "../Usermode/Output/i386";
 
-void Debug_SetKTerminal(const char *Path)
-{
-	// Ignored, kernel debug goes to stdout
-}
-
-void *Heap_Allocate(int Count, const char *File, int Line)
-{
-	return malloc(Count);
-}
-
-tPAddr MM_GetPhysAddr(tVAddr VAddr)
-{
-	return VAddr;	// HACK!
-}
-
-Uint MM_GetFlags(tVAddr VAddr)
+// === CODE ===
+int main(int argc, char *argv[])
 {
+	// Parse command line settings
+	
+	// Start UI subsystem
+	UI_Initialise(800, 480);
+	
+	// Initialise VFS
+	VFS_Init();
+	// - Start IO Drivers
+	Video_Install(NULL);
+	NativeKeyboard_Install(NULL);
+	NativeFS_Install(NULL);
+	// - Start VTerm
+	{
+		char	*args[] = {
+			"Video=NativeVideo",
+			"Input=NativeKeyboard",
+			NULL
+			};
+		VT_Install(args);
+	}
+	
+	VFS_Mount(gsAcessDir, "/Acess", "nativefs", "");
+
+	Debug_SetKTerminal("/Devices/VTerm/8");
+	
+	// Start syscall server
+	// - Blocks
+	SyscallServer();
+	
 	return 0;
 }
 
-int Modules_InitialiseBuiltin(const char *Name)
+void AcessNative_Exit(void)
 {
-	return 0;	// Ignored
+	// TODO: Close client applications too
+	exit(0);
 }
-
-Sint64 now(void)
-{
-	struct timeval tv;
-	struct timezone tz;
-	gettimeofday(&tv, &tz);
-	return tv.tv_sec * 1000 + tv.tv_usec/1000;
-}
-