X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fmain.c;h=c154870610a74eb697a26a458e718b1f33cf8921;hb=d01b7e1a4924a41a5219eedfd2f6d32b310368cd;hp=044330a0d06750be8a6b837445192f4f5715c945;hpb=2ebf89999759fc9d1ece6f98dfd439170995bb28;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/main.c b/Kernel/arch/x86_64/main.c index 044330a0..c1548706 100644 --- a/Kernel/arch/x86_64/main.c +++ b/Kernel/arch/x86_64/main.c @@ -25,9 +25,12 @@ 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*)(KERNEL_BASE|0xB8000) = 0x1F00|'C'; @@ -38,8 +41,6 @@ void kmain(Uint MbMagic, void *MbInfoPtr) // Adjust Multiboot structure address mbInfo = (void*)( (Uint)MbInfoPtr + KERNEL_BASE ); gsBootCmdLine = (char*)( (Uint)mbInfo->CommandLine + KERNEL_BASE); - Log("gsBootCmdLine = '%s'", gsBootCmdLine); - MM_InitPhys_Multiboot( mbInfo ); // Set up physical memory manager break; default: @@ -54,14 +55,13 @@ void kmain(Uint MbMagic, void *MbInfoPtr) Heap_Install(); *(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'E'; - Log_Log("Arch", "Starting threading..."); Threads_Init(); Time_Setup(); *(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'F'; - Log_Log("Arch", "Starting VFS..."); // Load Virtual Filesystem + Log_Log("Arch", "Starting VFS..."); VFS_Init(); *(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'Z';