X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2Fmain.c;h=865e53e4b27b6fee0d0f0d4577abddeab6fd8e89;hb=9a135546ed260546b4903424232faf1a3c3a8be5;hp=af9007da9555e95366970afb3510a68925fd547a;hpb=e1a5a15ff663d68e107edf0ad0a2bc878c0670d5;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86/main.c b/KernelLand/Kernel/arch/x86/main.c
index af9007da..865e53e4 100644
--- a/KernelLand/Kernel/arch/x86/main.c
+++ b/KernelLand/Kernel/arch/x86/main.c
@@ -8,7 +8,6 @@
 #include <multiboot2.h>
 #include <init.h>
 #include <mm_virt.h>
-#include <mp.h>
 #include <pmemmap.h>
 
 #define	VGA_ERRORS	0
@@ -19,11 +18,11 @@
 
 // === IMPORTS ===
 extern char	gKernelEnd[];
-extern void	Heap_Install(void);
 extern void	MM_PreinitVirtual(void);
 extern void	MM_Install(int NPMemRanges, tPMemMapEnt *PMemRanges);
 extern void	MM_InstallVirtual(void);
 extern int	Time_Setup(void);
+extern int	ACPICA_Initialise(void);
 
 // === PROTOTYPES ===
  int	kmain(Uint MbMagic, void *MbInfoPtr);
@@ -54,7 +53,7 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
 		gsBootCmdLine = (char*)(mbInfo->CommandLine + KERNEL_BASE);
 
 		// Adjust Multiboot structure address
-		mbInfo = (void*)( (Uint)MbInfoPtr + KERNEL_BASE );
+		mbInfo = (void*)( (tVAddr)MbInfoPtr + KERNEL_BASE );
 
 		nPMemMapEnts = Multiboot_LoadMemoryMap(mbInfo, KERNEL_BASE, pmemmap, MAX_PMEMMAP_ENTS,
 			KERNEL_LOAD, (tVAddr)&gKernelEnd - KERNEL_BASE);
@@ -79,13 +78,16 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
 	
 	MM_InstallVirtual();	// Clean up virtual address space
 	Heap_Install();		// Create initial heap
+	Time_Setup();	// Initialise timing
 	
 	// Start Multitasking
 	Threads_Init();
-	
-	// Start Timers
-	Time_Setup();
-	
+
+	#if USE_ACPICA
+	// Poke ACPICA
+	ACPICA_Initialise();
+	#endif
+
 	Log_Log("Arch", "Starting VFS...");
 	// Load Virtual Filesystem
 	VFS_Init();