diff options
Diffstat (limited to 'kernel')
| -rwxr-xr-x | kernel/GlobalConstruct.cpp | 3 | ||||
| -rw-r--r-- | kernel/kernel.c | 11 |
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; }; - |