X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fmain.c;h=3532c8091e1f6c6bcbdf8ca2c3e78d4279d0f7eb;hb=6d5880d56afb2c6a900e480c891fb40e05457ea3;hp=8dfd17719634d9985a4ff95118849658ceaf7b57;hpb=eecce4b7a55315f6c385ad8be35c25dbb12d43d8;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/main.c b/Kernel/arch/x86_64/main.c
index 8dfd1771..3532c809 100644
--- a/Kernel/arch/x86_64/main.c
+++ b/Kernel/arch/x86_64/main.c
@@ -2,28 +2,77 @@
  * Acess2 x86_64 Project
  */
 #include <acess.h>
+#include <mboot.h>
+#include <init.h>
 
 // === IMPORTS ===
 extern void	Desctab_Init(void);
 extern void	MM_InitVirt(void);
+extern void	Heap_Install(void);
+extern void	Threads_Init(void);
+extern int	Time_Setup(void);
+extern void	System_Init(char *Commandline);
+
+extern void	MM_InitPhys_Multiboot(tMBoot_Info *MBoot);
 
 // === PROTOTYPES ===
+void	kmain(Uint MbMagic, void *MbInfoPtr);
 
 // === GLOBALS ==
+char	*gsBootCmdLine = NULL;
 
 // === CODE ===
 void kmain(Uint MbMagic, void *MbInfoPtr)
 {
-	*(Uint16*)(0xB8000) = 0x1F00|'A';
+	tMBoot_Info	*mbInfo;
+
+	LogF("Acess2 x86_64 v"EXPAND_STR(KERNEL_VERSION)"\n");
+	LogF(" Build %i, Git Hash %s\n", BUILD_NUM, gsGitHash);
 	
 	Desctab_Init();
-	*(Uint16*)(0xB8000) = 0x1F00|'B';
-	
+
 	MM_InitVirt();
-	*(Uint16*)(0xB8000) = 0x1F00|'B';
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'C';
+	
+	switch(MbMagic)
+	{
+	// Multiboot 1
+	case MULTIBOOT_MAGIC:
+		// Adjust Multiboot structure address
+		mbInfo = (void*)( (Uint)MbInfoPtr + KERNEL_BASE );
+		gsBootCmdLine = (char*)( (Uint)mbInfo->CommandLine + KERNEL_BASE);
+		MM_InitPhys_Multiboot( mbInfo );	// Set up physical memory manager
+		break;
+	default:
+		Panic("Multiboot magic invalid %08x, expected %08x\n",
+			MbMagic, MULTIBOOT_MAGIC);
+		return ;
+	}
+	
+	Log("gsBootCmdLine = '%s'", gsBootCmdLine);
+	
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'D';
+	Heap_Install();
+	
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'E';
+	Threads_Init();
+	
+	Time_Setup();
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'F';
+	
+	// Load Virtual Filesystem
+	Log_Log("Arch", "Starting VFS...");
+	VFS_Init();
+	
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'Z';
+	
+	// Pass on to Independent Loader
+	Log_Log("Arch", "Starting system");
+	System_Init(gsBootCmdLine);
 	
+	// Sleep forever (sleeping beauty)
 	for(;;)
-		__asm__ __volatile__ ("hlt");
+		Threads_Sleep();
 }
 
 void Arch_LoadBootModules(void)
@@ -31,7 +80,7 @@ void Arch_LoadBootModules(void)
 	
 }
 
-void StartupPrint(char *String)
+void StartupPrint(const char *String)
 {
 	
 }