X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmain.c;h=f6879f8d51f3d6943838503882af8a55bf764afc;hb=ca05044548d5c1de87c030d625a305731a6cc665;hp=710923d447e36c655540b3d26d4edaefb5d65e77;hpb=8bc40333b1401d7616b225945fee53d972c2f418;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/main.c b/Kernel/arch/x86/main.c
index 710923d4..f6879f8d 100644
--- a/Kernel/arch/x86/main.c
+++ b/Kernel/arch/x86/main.c
@@ -3,7 +3,7 @@
  * x86 Kernel Main
  * arch/x86/main.c
  */
-#include <common.h>
+#include <acess.h>
 #include <mboot.h>
 #include <init.h>
 #include <mm_virt.h>
@@ -17,10 +17,11 @@ extern void	Desctab_Install();
 extern void	MM_PreinitVirtual();
 extern void	MM_Install(tMBoot_Info *MBoot);
 extern void MM_InstallVirtual();
-extern void	Proc_Start();
+extern void	Threads_Init();
+extern int	Time_Setup();
 extern Uint	Proc_Clone(Uint *Err, Uint Flags);
-extern void	Proc_Sleep();
-extern void	Proc_Exit();
+extern void	Threads_Sleep();
+extern void	Threads_Exit();
 
 // === GLOBALS ===
 
@@ -41,7 +42,10 @@ int kmain(Uint MbMagic, tMBoot_Info *MbInfo)
 	
 	Log("Starting Multitasking...");
 	// Start Multitasking
-	Proc_Start();
+	Threads_Init();
+	
+	// Start Timers
+	Time_Setup();
 	
 	Log("Starting VFS...");
 	// Load Virtual Filesystem
@@ -71,6 +75,6 @@ int kmain(Uint MbMagic, tMBoot_Info *MbInfo)
 	System_Init( (char*)(MbInfo->CommandLine + KERNEL_BASE) );
 	
 	// Sleep forever (sleeping beauty)
-	for(;;)	Proc_Sleep();
+	for(;;)	Threads_Sleep();
 	return 0;
 }