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