X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmain.c;h=99c10206306548969a58e8e557db444815c6860b;hb=a351b9ff476150105829df774989ecc98fb4e31a;hp=0557760e1a3dcfa1badb0ccfbd8f01292995fb5a;hpb=e7fb36caedf6cd739359e98a163041b6e058ce7a;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86/main.c b/Kernel/arch/x86/main.c index 0557760e..99c10206 100644 --- a/Kernel/arch/x86/main.c +++ b/Kernel/arch/x86/main.c @@ -19,16 +19,14 @@ extern void Heap_Install(void); extern void Desctab_Install(void); extern void MM_PreinitVirtual(void); extern void MM_Install(tMBoot_Info *MBoot); -extern void MM_InstallVirtual(void); +extern void MM_InstallVirtual(void); extern void Threads_Init(void); extern int Time_Setup(void); -extern Uint Proc_Clone(Uint *Err, Uint Flags); -extern void Threads_Sleep(void); // --- Core --- extern void System_Init(char *Commandline); // === PROTOTYPES === -void Arch_LoadBootModules(void); + int kmain(Uint MbMagic, void *MbInfoPtr); // === GLOBALS === char *gsBootCmdLine = NULL; @@ -46,9 +44,11 @@ int kmain(Uint MbMagic, void *MbInfoPtr) int i; tMBoot_Module *mods; tMBoot_Info *mbInfo; + + LogF("Acess2 x86_65 v"EXPAND_STR(KERNEL_VERSION)"\n"); + LogF(" Build %i, Git Hash %s\n", BUILD_NUM, gsGitHash); - Log("MbMagic = %08x", MbMagic); - Log("MbInfoPtr = %p", MbInfoPtr); + Log("MbMagic = %08x, MbInfoPtr = %p", MbMagic, MbInfoPtr); // Set up non-boot info dependent stuff Desctab_Install(); // Set up GDT and IDT @@ -81,13 +81,13 @@ int kmain(Uint MbMagic, void *MbInfoPtr) MM_InstallVirtual(); // Clean up virtual address space Heap_Install(); // Create initial heap - // Start Timers - Time_Setup(); - //Log_Log("Arch", "Starting Multitasking..."); // Start Multitasking Threads_Init(); + // Start Timers + Time_Setup(); + Log_Log("Arch", "Starting VFS..."); // Load Virtual Filesystem VFS_Init();