From 0c9472e15100c3ef1be519ed0783e45ded4cebc3 Mon Sep 17 00:00:00 2001 From: Daniel Hammer Date: Thu, 12 Jun 2025 08:16:29 +0200 Subject: [PATCH] fix(kernel): Add support for Flanterm breaking change & remove redundant code in ACPI.cpp --- kernel/src/ACPI/ACPI.cpp | 26 -------------------------- kernel/src/Libraries/flanterm | 2 +- kernel/src/Terminal/Terminal.cpp | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/kernel/src/ACPI/ACPI.cpp b/kernel/src/ACPI/ACPI.cpp index db67dbb..b190777 100644 --- a/kernel/src/ACPI/ACPI.cpp +++ b/kernel/src/ACPI/ACPI.cpp @@ -56,30 +56,6 @@ namespace Hal { } ACPI::ACPI(XSDP* xsdp) { - ACPITables = new kcp::vector({ - "APIC", - "BERT", - "CPEP", - "DSDT", - "ECDT", - "EINJ", - "ERST", - "FACP", - "FACS", - "HEST", - "MSCT", - "MPST", - "OEM", - "PMTT", - "PSDT", - "RASF", - "SBST", - "SLIT", - "SRAT", - "SSDT" - } - ); - if (xsdp->TestChecksum() != true) { KernelLogStream(ERROR, "ACPI") << "Checksum failed for (R/X)SDT!"; return; @@ -102,7 +78,5 @@ namespace Hal { nextTableAddress = xsdp->RSDTAddress; HandleRSDT((CommonSDTHeader*)Memory::HHDM(nextTableAddress)); } - - // KernelLogStream(DEBUG, "ACPI") << nextTableType.c_str() << " located at 0x" << base::hex << nextTableAddress; } }; \ No newline at end of file diff --git a/kernel/src/Libraries/flanterm b/kernel/src/Libraries/flanterm index 201100c..4cacad1 160000 --- a/kernel/src/Libraries/flanterm +++ b/kernel/src/Libraries/flanterm @@ -1 +1 @@ -Subproject commit 201100c968ad6db4f38632f9b6c3544854897788 +Subproject commit 4cacad16218ba85d7d7f7566b2b3de46574c7d60 diff --git a/kernel/src/Terminal/Terminal.cpp b/kernel/src/Terminal/Terminal.cpp index 3ff51f2..063287a 100644 --- a/kernel/src/Terminal/Terminal.cpp +++ b/kernel/src/Terminal/Terminal.cpp @@ -1,5 +1,5 @@ #include "Terminal.hpp" -#include "../Libraries/flanterm/backends/fb.h" +#include "../Libraries/flanterm/flanterm_backends/fb.h" #include "../Libraries/flanterm/flanterm.h" #include "../Libraries/String.hpp"