aboutsummaryrefslogtreecommitdiff
path: root/src/main.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.zig')
-rw-r--r--src/main.zig7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main.zig b/src/main.zig
index f3ea424..5534a84 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,8 +1,10 @@
comptime {
- asm (@embedFile("boot.s"));
+ asm (@embedFile("boot64.s"));
+ asm (@embedFile("boot32.s"));
}
const debug = @import("debugcon.zig");
+const console = @import("console.zig");
const ALIGN = 1 << 0;
const MEMINFO = 1 << 1;
@@ -37,6 +39,9 @@ export fn kmain() noreturn {
vga[0] = 0x2f4f;
vga[1] = 0x2f4b;
+ console.initialize();
+ console.puts("test");
+
// write debug data
debug.outb(0xe9, 'H');
debug.outb(0xe9, 'i');