diff --git a/GNUmakefile b/GNUmakefile index f7c84fd..8ed3b9c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -6,7 +6,7 @@ MAKEFLAGS += -rR ARCH := x86_64 # Default user QEMU flags. These are appended to the QEMU command calls. -QEMUFLAGS := -m 2G -s -S -d int -D qemu.log +QEMUFLAGS := -m 2G -d int -D qemu.log override IMAGE_NAME := os220-$(ARCH) diff --git a/kernel/src/ACPI/ACPI.cpp b/kernel/src/ACPI/ACPI.cpp index b190777..918f8d6 100644 --- a/kernel/src/ACPI/ACPI.cpp +++ b/kernel/src/ACPI/ACPI.cpp @@ -57,11 +57,11 @@ namespace Hal { ACPI::ACPI(XSDP* xsdp) { if (xsdp->TestChecksum() != true) { - KernelLogStream(ERROR, "ACPI") << "Checksum failed for (R/X)SDT!"; + KernelLogStream(ERROR, "ACPI") << "Checksum failed for SDT!"; return; } - KernelLogStream(OK, "ACPI") << "Checksum passed for (R/X)SDT!"; + KernelLogStream(OK, "ACPI") << "Checksum passed for SDT"; KernelLogStream(INFO, "ACPI") << "OEM ID: " << xsdp->GetOEMID(); diff --git a/kernel/src/CppLib/CString.hpp b/kernel/src/CppLib/CString.hpp index 6d450dc..c559ada 100644 --- a/kernel/src/CppLib/CString.hpp +++ b/kernel/src/CppLib/CString.hpp @@ -7,6 +7,8 @@ #pragma once #include +typedef const char* CString; + namespace kcp { - vector splitstr(const char* str, char delimiter); + vector splitstr(CString str, char delimiter); }; \ No newline at end of file diff --git a/kernel/src/Terminal/Terminal.hpp b/kernel/src/Terminal/Terminal.hpp index 8ab6d68..185824c 100644 --- a/kernel/src/Terminal/Terminal.hpp +++ b/kernel/src/Terminal/Terminal.hpp @@ -99,42 +99,13 @@ namespace Kt class KernelLogStream { KernelOutStream localStream{}; - KernelLogLevel level; const char* componentName = ""; public: - KernelLogStream(KernelLogLevel desiredLevel, const char* desiredComponentName) { - level = desiredLevel; + KernelLogStream(KernelLogLevel, const char* desiredComponentName) { /* level for potential future rich event logging */ componentName = desiredComponentName; - switch (level) { - case INFO: { - localStream << screen::colors::cyan << "INFO " << screen::colors::white; - break; - } - - case WARNING: { - localStream << screen::colors::yellow << "WARNING " << screen::colors::white; - break; - } - - case ERROR: { - localStream << screen::colors::red << "ERROR " << screen::colors::white; - break; - } - - case DEBUG: { - localStream << screen::colors::magenta << "DEBUG " << screen::colors::white; - break; - } - - case OK: { - localStream << screen::colors::green << "OK " << screen::colors::white; - break ; - } - } - localStream << componentName << ": "; }