X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fmain.c;h=af231eeaa342466859bcdffe0d2e0d28af30ccf2;hb=dec96d539a700885bace43218e26f684934a1a01;hp=7d69368095a210e9dbdd07df657c17a5260942ac;hpb=f5f082502f5aeaa144a6ff60ad331e23957b0bbb;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/main.c b/Kernel/arch/x86_64/main.c index 7d693680..af231eea 100644 --- a/Kernel/arch/x86_64/main.c +++ b/Kernel/arch/x86_64/main.c @@ -3,18 +3,20 @@ */ #include #include +#include // === IMPORTS === 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); // === PROTOTYPES === +void kmain(Uint MbMagic, void *MbInfoPtr); // === GLOBALS == char *gsBootCmdLine = NULL; @@ -55,7 +57,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..."); @@ -81,7 +83,7 @@ void Arch_LoadBootModules(void) } -void StartupPrint(char *String) +void StartupPrint(const char *String) { }