From 14e5cd804a84e4a1c77157f6dc020f769db4a405 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sat, 12 Mar 2022 16:56:45 +0100 Subject: [PATCH] init -> kernel_init --- kernel/kernel.c | 2 +- kernel/kernel_entry.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/kernel.c b/kernel/kernel.c index fc0d90a..43dc835 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -1,6 +1,6 @@ #include "kernel.h" -void init() { +void kernel_init() { vga_init(); // Initialize the screen first // i.e. clear the screen et cetera. diff --git a/kernel/kernel_entry.asm b/kernel/kernel_entry.asm index 3482850..b9ce0cc 100644 --- a/kernel/kernel_entry.asm +++ b/kernel/kernel_entry.asm @@ -1,8 +1,8 @@ [bits 32] -[extern init] +[extern kernel_init] multiboot2: dw 0xE85250D6 -call init +call kernel_init jmp $