X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fmain.c;h=4e6001d6ea15e5d3a3092704859830e5c1f9ad11;hb=203882b7bbd4aacaf5c4e99be0cca17455690585;hp=5ea1934b6a9e431289a515ab1d0440672a010506;hpb=dea6bcf35a3f52396724d74e47f71cb3afade37c;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/main.c b/Kernel/arch/x86_64/main.c index 5ea1934b..4e6001d6 100644 --- a/Kernel/arch/x86_64/main.c +++ b/Kernel/arch/x86_64/main.c @@ -9,7 +9,7 @@ extern void Desctab_Init(void); extern void MM_InitVirt(void); extern void Heap_Install(void); extern void Threads_Init(void); -//extern void Time_Setup(void); +extern int Time_Setup(void); extern void System_Init(char *Commandline); extern void MM_InitPhys_Multiboot(tMBoot_Info *MBoot); @@ -36,6 +36,7 @@ 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; @@ -45,6 +46,8 @@ void kmain(Uint MbMagic, void *MbInfoPtr) return ; } + Log("gsBootCmdLine = '%s'", gsBootCmdLine); + *(Uint16*)(0xB8000) = 0x1F00|'D'; Heap_Install(); @@ -52,7 +55,7 @@ void kmain(Uint MbMagic, void *MbInfoPtr) Log_Log("Arch", "Starting threading..."); Threads_Init(); - //Time_Setup(); + Time_Setup(); *(Uint16*)(0xB8000) = 0x1F00|'F'; Log_Log("Arch", "Starting VFS...");