From 513077cfec0ea87303ba19502c368f5adcc8ed99 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 7 Feb 2025 09:25:08 +0100 Subject: ADD: VGA logging and tweaks. Signed-off-by: Amlal El Mahrouss --- dev/Boot/BootKit/BootKit.h | 2 +- dev/Boot/arm64-desktop.make | 2 +- dev/Boot/arm64-mobile.make | 2 +- dev/Boot/src/BootThread.cc | 6 +++--- dev/Boot/src/BootloaderRsrc.rsrc | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'dev/Boot') diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h index ccc36db1..c4431b8f 100644 --- a/dev/Boot/BootKit/BootKit.h +++ b/dev/Boot/BootKit/BootKit.h @@ -379,7 +379,7 @@ namespace Boot epm_boot.LbaStart = kNeFSRootCatalogStartAddress; epm_boot.LbaEnd = fDiskDev.GetDiskSize(); epm_boot.SectorSz = part.SectorSize; - epm_boot.Kind = kEPMZkaOS; + epm_boot.Kind = kEPMNeOS; epm_boot.NumBlocks = part.CatalogCount; CopyMem(epm_boot.Name, reinterpret_cast(const_cast(kBlockName)), StrLen(kBlockName)); diff --git a/dev/Boot/arm64-desktop.make b/dev/Boot/arm64-desktop.make index d5ac561a..42aa1f57 100644 --- a/dev/Boot/arm64-desktop.make +++ b/dev/Boot/arm64-desktop.make @@ -19,7 +19,7 @@ EMU=qemu-system-aarch64 endif ifeq ($(NEWS_MODEL), ) -NE_MODEL=-DkMachineModel="\"ZKA\"" +NE_MODEL=-DkMachineModel="\"NeKernel\"" endif BIOS=OVMF.fd diff --git a/dev/Boot/arm64-mobile.make b/dev/Boot/arm64-mobile.make index 2b6e0e2b..853d984a 100644 --- a/dev/Boot/arm64-mobile.make +++ b/dev/Boot/arm64-mobile.make @@ -19,7 +19,7 @@ EMU=qemu-system-aarch64 endif ifeq ($(NEWS_MODEL), ) -NE_MODEL=-DkMachineModel="\"ZKA\"" +NE_MODEL=-DkMachineModel="\"NeKernel\"" endif BIOS=OVMF.fd diff --git a/dev/Boot/src/BootThread.cc b/dev/Boot/src/BootThread.cc index a0969953..93ebd9ac 100644 --- a/dev/Boot/src/BootThread.cc +++ b/dev/Boot/src/BootThread.cc @@ -63,13 +63,13 @@ namespace Boot } #endif // __NE_AMD64__ || __NE_ARM64__ - if (opt_header_ptr->mSubsystem != kZKASubsystem) + if (opt_header_ptr->mSubsystem != kNeKernelSubsystem) { - writer.Write("BootZ: Not a ZKA Subsystem executable.\r"); + writer.Write("BootZ: Not a NeKernel Subsystem executable.\r"); return; } - writer.Write("BootZ: PE32+ executable detected (ZKA Subsystem).\r"); + writer.Write("BootZ: PE32+ executable detected (NeKernel Subsystem).\r"); auto numSecs = header_ptr->mNumberOfSections; diff --git a/dev/Boot/src/BootloaderRsrc.rsrc b/dev/Boot/src/BootloaderRsrc.rsrc index cb68da9a..47623fbc 100644 --- a/dev/Boot/src/BootloaderRsrc.rsrc +++ b/dev/Boot/src/BootloaderRsrc.rsrc @@ -9,7 +9,7 @@ BEGIN BLOCK "080904E4" BEGIN VALUE "CompanyName", "Amlal EL Mahrouss" - VALUE "FileDescription", "ZKA OS Loader." + VALUE "FileDescription", "NeKernel OS Loader." VALUE "FileVersion", BOOTLOADER_VERSION VALUE "InternalName", "zbaosldr" VALUE "LegalCopyright", "Copyright (C) 2024, Amlal EL Mahrouss all rights reserved." -- cgit v1.2.3