From d418842a4852335b08fbcce4fb57c02be87f10a8 Mon Sep 17 00:00:00 2001 From: apio Date: Sat, 10 Sep 2022 22:17:18 +0200 Subject: [PATCH] Update TextRenderer to use kerrorln --- kernel/src/render/TextRenderer.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/src/render/TextRenderer.cpp b/kernel/src/render/TextRenderer.cpp index 740fd184..d0345acb 100644 --- a/kernel/src/render/TextRenderer.cpp +++ b/kernel/src/render/TextRenderer.cpp @@ -1,7 +1,10 @@ +#define MODULE "text" + #include "render/TextRenderer.h" #include "bootboot.h" #include "init/InitRD.h" #include "io/Serial.h" +#include "log/Log.h" #include "psf2.h" #include "render/Framebuffer.h" #include "std/stdio.h" @@ -17,16 +20,16 @@ static uint32_t ypos = 0; bool TextRenderer::try_initialize() { - InitRD::File font_file = InitRD::find_file("boot/font.psf"); + InitRD::File font_file = InitRD::open("boot/font.psf"); if (!font_file.addr) { - Serial::println("Failed to load boot/font.psf from initrd"); + kerrorln("Failed to load boot/font.psf from initrd"); return false; } font = (psf2_t*)font_file.addr; if (font->magic != PSF_FONT_MAGIC) { - Serial::println("Font magic does not match PSF font magic"); + kerrorln("Font magic does not match PSF font magic: %x", font->magic); return false; } return true;