summaryrefslogtreecommitdiff
path: root/kernel/main.cpp
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2015-07-21 16:53:10 +0400
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2015-07-21 16:53:10 +0400
commitdd6a7fb6fa4e1f81895f09d52797f51ca662e65a (patch)
tree4f57e4917aec248c74271358a0f632a6800b38e7 /kernel/main.cpp
parent9d07b13fcf420ef34b5f409fc0041aba6e060727 (diff)
Edit entry point
Diffstat (limited to 'kernel/main.cpp')
-rw-r--r--kernel/main.cpp23
1 files changed, 19 insertions, 4 deletions
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();
}
+