summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAlexey Gavrilov <rebovas@yahoo.com>2024-02-22 14:18:39 +0700
committerAlexey Gavrilov <rebovas@yahoo.com>2024-02-22 14:18:39 +0700
commitcbcbf6e7d614ecf94dd7e1b9033f8d599f48662e (patch)
tree59872849d347794cc58c8ad3aa201a14e0db526f /kernel
parentc18781e37e6bfe153e7c0f2bc8b04df0aecf151d (diff)
Implement support of cpuid instruction + include folder + some updates
Diffstat (limited to 'kernel')
-rwxr-xr-xkernel/GlobalConstruct.cpp3
-rw-r--r--kernel/kernel.c11
2 files changed, 7 insertions, 7 deletions
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;
};
-