From cbcbf6e7d614ecf94dd7e1b9033f8d599f48662e Mon Sep 17 00:00:00 2001
From: Alexey Gavrilov <rebovas@yahoo.com>
Date: Thu, 22 Feb 2024 14:18:39 +0700
Subject: Implement support of cpuid instruction + include folder + some
 updates

---
 kernel/GlobalConstruct.cpp |  3 ++-
 kernel/kernel.c            | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kernel')

diff --git a/kernel/GlobalConstruct.cpp b/kernel/GlobalConstruct.cpp
index dc0a83a..b16b6ae 100755
--- a/kernel/GlobalConstruct.cpp
+++ b/kernel/GlobalConstruct.cpp
@@ -7,7 +7,8 @@ void GlobalConstruct::terminalInit()
 
 void GlobalConstruct::gdtInit()
 {
-    mngGdtInit();
+    mngGdt = MngGdt();
+
     mngGdt.addDescriptor(DescSeg32::flatCodeKernel());
     mngGdt.addDescriptor(DescSeg32::flatDataKernel()); 
     mngGdt.loadGdt();
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 59caf0a..3d9a3cc 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,13 +1,12 @@
 #include "GlobalConstruct.h"
-#include "../arch/x86/io/GlobalObj.h"
-#include "../arch/x86/inc/TypeConverter.h"
+#include <TypeConverter.h>
+#include <types.h>
+
+#include "../arch/x86/cpuinfo/Cpuinfo.h"
 
 void main()
 {
     GlobalConstruct::terminalInit();
     GlobalConstruct::gdtInit();
-
-    display << "Hello, World!";
-
+    Cpuinfo cpuinf;
 };
-
-- 
cgit v1.2.3