summaryrefslogtreecommitdiff
path: root/src/nrvn.c
diff options
context:
space:
mode:
authorAnna (navi) Figueiredo Gomes <navi@vlhl.dev>2024-01-07 20:19:20 +0100
committerAnna (navi) Figueiredo Gomes <navi@vlhl.dev>2024-01-07 20:19:24 +0100
commit0ee22520f50b4f006a554c79dd0e5f1d5d780d4d (patch)
tree0345608543d423f376909614700da4f11ace1b28 /src/nrvn.c
parent30d6e8f850d2fe26fffdeef0c38fc627ef8bab9a (diff)
replace make with meson
Signed-off-by: Anna (navi) Figueiredo Gomes <navi@vlhl.dev>
Diffstat (limited to 'src/nrvn.c')
-rw-r--r--src/nrvn.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nrvn.c b/src/nrvn.c
index 84b297f..042ffd0 100644
--- a/src/nrvn.c
+++ b/src/nrvn.c
@@ -14,13 +14,13 @@
/* Check if the compiler thinks you are targeting the wrong operating system. */
#if defined(__linux__)
-#error "You are not using a cross-compiler, you will most certainly run into trouble"
+# error "You are not using a cross-compiler, you will most certainly run into trouble"
#endif
/* This tutorial will only work for the 32-bit ix86 targets. */
-//#if !defined(__i386__) | !defined(__x86_64__)
-//#error "This tutorial needs to be compiled with a ix86-elf compiler"
-//#endif
+#if !defined(__x86_64__)
+# error "This tutorial needs to be compiled with a ix86-elf compiler"
+#endif
void kernel_main(void) {
vga_init();
@@ -45,8 +45,6 @@ void kernel_main(void) {
asm volatile ("hlt");
}
- // TODO -- fix acpi
-
vga_puts("initializing ps/2...\n");
if (ps2_init(NULL))
vga_puts("ps/2 initialized.\n");