From 9be94a75b0f2a024be75a6b9f922b8313e30f862 Mon Sep 17 00:00:00 2001 From: Kevin Alavik Date: Thu, 15 May 2025 20:57:28 +0200 Subject: [PATCH] feat/kernel: Remove COM1 init hcf() --- kernel/src/emk.c | 12 ++++++------ kernel/src/mm/vmm.c | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/kernel/src/emk.c b/kernel/src/emk.c index 77c81b1..e3d3a76 100644 --- a/kernel/src/emk.c +++ b/kernel/src/emk.c @@ -50,11 +50,6 @@ struct flanterm_context *ft_ctx = NULL; void emk_entry(void) { __asm__ volatile("movq %%rsp, %0" : "=r"(kstack_top)); - if (serial_init(COM1) != 0) - { - /* Just halt and say nothing */ - hcf(); - } /* Init flanterm if we compiled with support */ #if FLANTERM_SUPPORT @@ -75,12 +70,17 @@ void emk_entry(void) 0); #endif // FLANTERM_SUPPORT + if (serial_init(COM1) != 0) + { + /* Just do nothing */ + } + log_early("Experimental Micro Kernel (EMK) 1.0 Copytright (c) 2025 Piraterna"); log_early("Compiled at %s %s, emk1.0-%s, flanterm support: %s", __TIME__, __DATE__, BUILD_MODE, FLANTERM_SUPPORT ? "yes" : "no"); if (!LIMINE_BASE_REVISION_SUPPORTED) { - kpanic(NULL, "Limine base revision is not supported\n"); + kpanic(NULL, "Limine base revision is not supported"); hcf(); } diff --git a/kernel/src/mm/vmm.c b/kernel/src/mm/vmm.c index 224979d..bc0bce6 100644 --- a/kernel/src/mm/vmm.c +++ b/kernel/src/mm/vmm.c @@ -52,7 +52,6 @@ void *valloc(vctx_t *ctx, size_t pages, uint64_t flags) while (region) { - if (region->next == NULL || region->start + region->pages < region->next->start) { new = (vregion_t *)palloc(1, true);