Kernel/x86 - Removed now-redundant extern prototype

[tpg/acess2.git] / KernelLand / Kernel / arch / x86 / main.c

diff --git a/KernelLand/Kernel/arch/x86/main.c b/KernelLand/Kernel/arch/x86/main.c
index af9007d..97a7c75 100644 (file)
--- a/KernelLand/Kernel/arch/x86/main.c
+++ b/KernelLand/Kernel/arch/x86/main.c
@@ -19,11 +19,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 +54,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 +79,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();