Kernel - Added pointer to IRQ callbacks

[tpg/acess2.git] / Kernel / arch / x86_64 / main.c

diff --git a/Kernel/arch/x86_64/main.c b/Kernel/arch/x86_64/main.c
index af231ee..d3b79c6 100644 (file)
--- a/Kernel/arch/x86_64/main.c
+++ b/Kernel/arch/x86_64/main.c
@@ -25,11 +25,14 @@ char        *gsBootCmdLine = NULL;
 void kmain(Uint MbMagic, void *MbInfoPtr)
 {
        tMBoot_Info     *mbInfo;
+
+       LogF("Acess2 x86_65 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)
        {
@@ -50,24 +53,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';
+       *(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");