X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fmain.c;h=c154870610a74eb697a26a458e718b1f33cf8921;hb=6a6f4fdb0cce6558bac6b30ce312555bb48a2c0a;hp=60d5cf08048abad9f5a1fb97260baa9b366403b9;hpb=1499c9eb8aa167dff5354a25c5a5bd2d00672a54;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/main.c b/Kernel/arch/x86_64/main.c
index 60d5cf08..c1548706 100644
--- a/Kernel/arch/x86_64/main.c
+++ b/Kernel/arch/x86_64/main.c
@@ -2,13 +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)
 {
+	tMBoot_Info	*mbInfo;
+
+	LogF("Acess2 x86_65 v"EXPAND_STR(KERNEL_VERSION)"\n");
+	LogF(" Build %i, Git Hash %s\n", BUILD_NUM, gsGitHash);
+	
+	Desctab_Init();
+
+	MM_InitVirt();
+	*(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(;;)
+		Threads_Sleep();
 }
 
 void Arch_LoadBootModules(void)
@@ -16,7 +80,7 @@ void Arch_LoadBootModules(void)
 	
 }
 
-void StartupPrint(char *String)
+void StartupPrint(const char *String)
 {
 	
 }