diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2025-01-03 22:18:21 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2025-01-03 22:18:21 +0100 |
| commit | 6047573b5198299cf26b5e05504d7a5aa9c5d93f (patch) | |
| tree | 9759bd9cfa4e153f94414d843ae1193b76165f02 | |
| parent | bf2fc74c6552f9359955210c8f60e45308ae1d31 (diff) | |
ADD: Move to 2025 edition of ZkaOS.
IMPL: New Formatting of kernel debug output.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
| -rw-r--r-- | dev/Kernel/CompilerKit/Version.h | 4 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc | 8 | ||||
| -rw-r--r-- | dev/Kernel/KernelKit/DebugOutput.h | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/dev/Kernel/CompilerKit/Version.h b/dev/Kernel/CompilerKit/Version.h index 25ee0007..c3d0efda 100644 --- a/dev/Kernel/CompilerKit/Version.h +++ b/dev/Kernel/CompilerKit/Version.h @@ -3,5 +3,5 @@ #pragma once /// <COMMIT NUMBER>.<YEAR>.<PROGRAM VERSION> -#define BOOTLOADER_VERSION "1104.2024.110" -#define KERNEL_VERSION "1104.2024.110" +#define BOOTLOADER_VERSION "1104.2025.110" +#define KERNEL_VERSION "1104.2025.110" diff --git a/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc b/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc index 081ce0b2..1d02ca7b 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc @@ -78,14 +78,14 @@ ATAInit_Retry: if (statRdy & ATA_SR_ERR) { - kcout << "ERROR: ATA DRIVE RETURNED ERROR BIT! ABORTING...\r"; + kcout << "ATA Error, aborting...\r"; return false; } if ((statRdy & ATA_SR_BSY)) { - kcout << "Retrying..."; + kcout << "Retrying as controller is busy...\r"; goto ATAInit_Retry; } @@ -105,9 +105,7 @@ ATAInit_Retry: OutMaster = (Bus == ATA_PRIMARY_IO) ? ATA_MASTER : ATA_SLAVE; - kcout << "INFO: INITIALIZED ATA DRIVE!\r"; - - return true; + return YES; } Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz, SizeT Size) diff --git a/dev/Kernel/KernelKit/DebugOutput.h b/dev/Kernel/KernelKit/DebugOutput.h index da285329..a3fc5a9d 100644 --- a/dev/Kernel/KernelKit/DebugOutput.h +++ b/dev/Kernel/KernelKit/DebugOutput.h @@ -192,7 +192,7 @@ namespace Kernel #endif // ifdef kcout #define kcout \ - (Kernel::TerminalDevice::The() << "\e[0;31m [ (" << __FILE__ << ") Line: " << Kernel::number(__LINE__)); \ - (Kernel::TerminalDevice::The() << " ] \e[0m" \ + (Kernel::TerminalDevice::The() << "\e[0;31m [Kernel] (Path: /" << __FILE__ << ") (Line: " << Kernel::number(__LINE__)); \ + (Kernel::TerminalDevice::The() << ") \e[0m" \ << ": ") #define endl Kernel::TerminalDevice::The() << Kernel::end_line() |