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

diff --git a/Kernel/arch/x86_64/main.c b/Kernel/arch/x86_64/main.c
index 5ea1934b..3532c809 100644
--- a/Kernel/arch/x86_64/main.c
+++ b/Kernel/arch/x86_64/main.c
@@ -3,18 +3,20 @@
  */
 #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 void	Time_Setup(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;
@@ -23,11 +25,14 @@ char	*gsBootCmdLine = NULL;
 void kmain(Uint MbMagic, void *MbInfoPtr)
 {
 	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();
-	
+
 	MM_InitVirt();
-	*(Uint16*)(0xB8000) = 0x1F00|'C';
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'C';
 	
 	switch(MbMagic)
 	{
@@ -36,7 +41,6 @@ void kmain(Uint MbMagic, void *MbInfoPtr)
 		// 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:
@@ -45,24 +49,22 @@ void kmain(Uint MbMagic, void *MbInfoPtr)
 		return ;
 	}
 	
-	*(Uint16*)(0xB8000) = 0x1F00|'D';
+	Log("gsBootCmdLine = '%s'", gsBootCmdLine);
+	
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'D';
 	Heap_Install();
 	
-	*(Uint16*)(0xB8000) = 0x1F00|'E';
-	Log_Log("Arch", "Starting threading...");
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'E';
 	Threads_Init();
 	
-	//Time_Setup();
-	*(Uint16*)(0xB8000) = 0x1F00|'F';
+	Time_Setup();
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'F';
 	
-	Log_Log("Arch", "Starting VFS...");
 	// Load Virtual Filesystem
+	Log_Log("Arch", "Starting VFS...");
 	VFS_Init();
 	
-	*(Uint16*)(0xB8000) = 0x1F00|'Z';
-	*(Uint16*)(0xB8002) = 0x1F00|'Z';
-	*(Uint16*)(0xB8004) = 0x1F00|'Z';
-	*(Uint16*)(0xB8006) = 0x1F00|'Z';
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'Z';
 	
 	// Pass on to Independent Loader
 	Log_Log("Arch", "Starting system");
@@ -78,7 +80,7 @@ void Arch_LoadBootModules(void)
 	
 }
 
-void StartupPrint(char *String)
+void StartupPrint(const char *String)
 {
 	
 }