summaryrefslogtreecommitdiffstats
path: root/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 9a901b1..59caf0a 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,22 +1,13 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#include "GlobalConstruct.h"
#include "../arch/x86/io/GlobalObj.h"
#include "../arch/x86/inc/TypeConverter.h"
void main()
{
- VGADisplay d;
- IntConverter conv;
+ GlobalConstruct::terminalInit();
+ GlobalConstruct::gdtInit();
- unsigned int i = 124;
+ display << "Hello, World!";
- d << conv.intToChar(i);
- d << "Hello, world!\tHello, world!";
- for(int i = 0; i < 10; i++)d << "\tHello!";
};
-#ifdef __cplusplus
-};
-#endif