X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fmain.c;h=77df36287d0c8b7b1b49511ad140611c0e340f09;hb=5e9042e320d0a24d1691bcd6845936879238e812;hp=7d69368095a210e9dbdd07df657c17a5260942ac;hpb=f5f082502f5aeaa144a6ff60ad331e23957b0bbb;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/main.c b/Kernel/arch/x86_64/main.c
index 7d693680..77df3628 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;
@@ -25,9 +27,9 @@ void kmain(Uint MbMagic, void *MbInfoPtr)
 	tMBoot_Info	*mbInfo;
 	
 	Desctab_Init();
-	
+
 	MM_InitVirt();
-	*(Uint16*)(0xB8000) = 0x1F00|'C';
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'C';
 	
 	switch(MbMagic)
 	{
@@ -48,24 +50,21 @@ void kmain(Uint MbMagic, void *MbInfoPtr)
 	
 	Log("gsBootCmdLine = '%s'", gsBootCmdLine);
 	
-	*(Uint16*)(0xB8000) = 0x1F00|'D';
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'D';
 	Heap_Install();
 	
-	*(Uint16*)(0xB8000) = 0x1F00|'E';
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'E';
 	Log_Log("Arch", "Starting threading...");
 	Threads_Init();
 	
-	//Time_Setup();
-	*(Uint16*)(0xB8000) = 0x1F00|'F';
+	Time_Setup();
+	*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'F';
 	
 	Log_Log("Arch", "Starting VFS...");
 	// Load Virtual Filesystem
 	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");
@@ -81,7 +80,7 @@ void Arch_LoadBootModules(void)
 	
 }
 
-void StartupPrint(char *String)
+void StartupPrint(const char *String)
 {
 	
 }