Merge pull request #1 from rebovas/init_proc

Mechanism of initialization

3 files changed, 7 insertions, 35 deletions

diff --git a/kernel/GlobalConstruct.cpp b/kernel/GlobalConstruct.cpp
deleted file mode 100755
index b16b6ae..0000000
--- a/kernel/GlobalConstruct.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "GlobalConstruct.h"
-
-void GlobalConstruct::terminalInit()
-{
-    display = VGADisplay();
-};
-
-void GlobalConstruct::gdtInit()
-{
-    mngGdt = MngGdt();
-
-    mngGdt.addDescriptor(DescSeg32::flatCodeKernel());
-    mngGdt.addDescriptor(DescSeg32::flatDataKernel()); 
-    mngGdt.loadGdt();
-};
diff --git a/kernel/GlobalConstruct.h b/kernel/GlobalConstruct.h
deleted file mode 100755
index 2b0a675..0000000
--- a/kernel/GlobalConstruct.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef GLOBALCONSTRUCT_H
-#define GLOBALCONSTRUCT_H
-
-#include "../arch/x86/io/GlobalObj.h"
-#include "../arch/x86/gdt/GlobalObj.h"
-
-class GlobalConstruct
-{
-    public:
-        static void terminalInit();
-        static void gdtInit();
-};
-
-#endif
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 3d9a3cc..dfb03e4 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,12 +1,13 @@
-#include "GlobalConstruct.h"
-#include <TypeConverter.h>
-#include <types.h>
+#include "../arch/SecondaryInit.h"
 
 #include "../arch/x86/cpuinfo/Cpuinfo.h"
 
 void main()
 {
-    GlobalConstruct::terminalInit();
-    GlobalConstruct::gdtInit();
-    Cpuinfo cpuinf;
+    SecondaryInitialization init;
+
+    init.processorInitialize();
+    init.devicesInitialize();
+
+    out::display << "Hello, World!\n";
 };