From dd6a7fb6fa4e1f81895f09d52797f51ca662e65a Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Tue, 21 Jul 2015 16:53:10 +0400 Subject: Edit entry point --- kernel/main.cpp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'kernel/main.cpp') diff --git a/kernel/main.cpp b/kernel/main.cpp index 634a147..15eb154 100644 --- a/kernel/main.cpp +++ b/kernel/main.cpp @@ -1,16 +1,31 @@ #include "GDT/gdt.hpp" +#include "Drivers/memPrint/memPrint.hpp" -//----- PiegOS kernel main ----- +//----- PiegOS kernel main ----- int main(){ + //Infinite loop + while(1); + + //Exit code + return 0; +} + + + +//----- PiegOS kernel boot ----- + +//Mangling the _boot function +extern "C" void _boot(){ + //Create Gdt instance Gdt gdt; //Load Gdt into memory gdt.loadGdt(); - while(1); - - return 0; + //Call main function + main(); } + -- cgit v1.2.3