From dd087dcdce5b624a92a5a5ace1a5b6484a3f9ce1 Mon Sep 17 00:00:00 2001 From: Amlal EL Mahrouss Date: Wed, 9 Oct 2024 19:55:19 +0200 Subject: IMP: Rename minkrnl.exe to minoskrnl.exe. - The Model that we choose is a minimal kernel and set of drivers. - This Model is used to build Operating Systems and other kind of low level software. Signed-off-by: Amlal EL Mahrouss --- dev/zba/amd64-efi.make | 4 ++-- dev/zba/src/HEL/AMD64/BootMain.cxx | 2 +- dev/zka/KernelKit/ThreadLocalStorage.hxx | 2 +- dev/zka/KernelRsrc.rsrc | 4 ++-- dev/zka/amd64-efi.make | 4 ++-- dev/zka/arm64-efi.make | 2 +- dev/zka/doc/TODO-LIST.md | 2 +- dev/zka/src/IDLLObject.cxx | 2 +- dev/zka/src/IPEFDLLObject.cxx | 2 +- dev/zka/src/Stop.cxx | 12 ++++++------ dev/zka/src/String.cxx | 4 ++-- dev/zka/src/ThreadLocalStorage.cxx | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) (limited to 'dev') diff --git a/dev/zba/amd64-efi.make b/dev/zba/amd64-efi.make index ed902eef..c00a0699 100644 --- a/dev/zba/amd64-efi.make +++ b/dev/zba/amd64-efi.make @@ -52,7 +52,7 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEWOSKRNL__ -D__NEWOSL -std=c++20 -D__HAVE_ZKA_APIS__ -D__ZKA_AMD64__ -D__ZKA__ BOOT_LOADER=newosldr.exe -KERNEL=minkrnl.exe +KERNEL=minoskrnl.exe DDK=ddk.dll SCI=zka-sci-cxx.dll CRT=zka-crt-cxx.dll @@ -105,7 +105,7 @@ download-edk: $(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd BINS=*.bin -EXECUTABLES=newosldr.exe minkrnl.dll OVMF.fd +EXECUTABLES=newosldr.exe minoskrnl.exe OVMF.fd TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES) diff --git a/dev/zba/src/HEL/AMD64/BootMain.cxx b/dev/zba/src/HEL/AMD64/BootMain.cxx index de069162..8f8c45d1 100644 --- a/dev/zba/src/HEL/AMD64/BootMain.cxx +++ b/dev/zba/src/HEL/AMD64/BootMain.cxx @@ -255,7 +255,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, // Assign to global 'kHandoverHeader'. - Boot::BFileReader readerKernel(L"minkrnl.exe", ImageHandle); + Boot::BFileReader readerKernel(L"minoskrnl.exe", ImageHandle); readerKernel.ReadAll(0); diff --git a/dev/zka/KernelKit/ThreadLocalStorage.hxx b/dev/zka/KernelKit/ThreadLocalStorage.hxx index 65b03d9e..0dd17c42 100644 --- a/dev/zka/KernelKit/ThreadLocalStorage.hxx +++ b/dev/zka/KernelKit/ThreadLocalStorage.hxx @@ -9,7 +9,7 @@ #include -///! @brief Thread Local Storage for minkrnl. +///! @brief Thread Local Storage for minoskrnl. #define kCookieMag0 'Z' #define kCookieMag1 'K' diff --git a/dev/zka/KernelRsrc.rsrc b/dev/zka/KernelRsrc.rsrc index 98c3e3ec..11afc7fa 100644 --- a/dev/zka/KernelRsrc.rsrc +++ b/dev/zka/KernelRsrc.rsrc @@ -11,9 +11,9 @@ BEGIN VALUE "CompanyName", "ZKA Technologies." VALUE "FileDescription", "ZKA Minimal Kernel." VALUE "FileVersion", KERNEL_VERSION - VALUE "InternalName", "minkrnl" + VALUE "InternalName", "minoskrnl" VALUE "LegalCopyright", "(c) ZKA Technologies, all rights reserved." - VALUE "OriginalFilename", "minkrnl.exe" + VALUE "OriginalFilename", "minoskrnl.exe" VALUE "ProductName", "ZKA Operating System Kernel." VALUE "ProductVersion", KERNEL_VERSION END diff --git a/dev/zka/amd64-efi.make b/dev/zka/amd64-efi.make index 335eb52c..6c69a423 100644 --- a/dev/zka/amd64-efi.make +++ b/dev/zka/amd64-efi.make @@ -1,6 +1,6 @@ ################################################## # (C) ZKA Technologies, all rights reserved. -# This is the minkrnl's makefile. +# This is the minoskrnl's makefile. ################################################## CC = x86_64-w64-mingw32-g++.exe @@ -39,7 +39,7 @@ LDFLAGS = -e hal_init_platform --subsystem=17 --image-base 0x4000000 LDOBJ = obj/*.obj # This file is the Kernel, responsible of task, memory, driver, sci, disk and device management. -KERNEL_IMG = minkrnl.exe +KERNEL_IMG = minoskrnl.exe .PHONY: error error: diff --git a/dev/zka/arm64-efi.make b/dev/zka/arm64-efi.make index 261087bf..51753026 100644 --- a/dev/zka/arm64-efi.make +++ b/dev/zka/arm64-efi.make @@ -23,7 +23,7 @@ LDFLAGS = -subsystem:efi_application -entry:hal_init_platform /nodefaultlib LDOBJ = obj/*.obj # This file is the Kernel, responsible of task management and memory. -KERNEL = minkrnl.so +KERNEL = minoskrnl.so .PHONY: error error: diff --git a/dev/zka/doc/TODO-LIST.md b/dev/zka/doc/TODO-LIST.md index dfaa8123..13d953fc 100644 --- a/dev/zka/doc/TODO-LIST.md +++ b/dev/zka/doc/TODO-LIST.md @@ -20,6 +20,6 @@ Status: NEWOSLDR: Need to boot from EPM partition. [ X ]
-minkrnl: New Filesystem is done. [ X ] +minoskrnl: New Filesystem is done. [ X ] **Refer to Jira please!** diff --git a/dev/zka/src/IDLLObject.cxx b/dev/zka/src/IDLLObject.cxx index 5220f928..d98d25b4 100644 --- a/dev/zka/src/IDLLObject.cxx +++ b/dev/zka/src/IDLLObject.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * minkrnl + * minoskrnl * Copyright ZKA Technologies., all rights reserved. * * ======================================================== diff --git a/dev/zka/src/IPEFDLLObject.cxx b/dev/zka/src/IPEFDLLObject.cxx index 7c655385..ae06f5ef 100644 --- a/dev/zka/src/IPEFDLLObject.cxx +++ b/dev/zka/src/IPEFDLLObject.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * minkrnl + * minoskrnl * Copyright ZKA Technologies., all rights reserved. * * ======================================================== diff --git a/dev/zka/src/Stop.cxx b/dev/zka/src/Stop.cxx index dd464659..a02ea099 100644 --- a/dev/zka/src/Stop.cxx +++ b/dev/zka/src/Stop.cxx @@ -32,7 +32,7 @@ namespace Kernel auto start_y = 10; auto x = 10; - CGDrawString("minkrnl.exe stopped working properly so it had to stop.", start_y, x, panicTxt); + CGDrawString("minoskrnl.exe stopped working properly so it had to stop.", start_y, x, panicTxt); start_y += 10; // simply offset from previous string and then write the website. @@ -69,21 +69,21 @@ namespace Kernel break; } case RUNTIME_CHECK_POINTER: { - CGDrawString("0x00000000 Heap error, the heap is corrupted.", start_y, x, panicTxt); + CGDrawString("0x00000000 Heap is corrupted.", start_y, x, panicTxt); PowerFactoryInterface power(nullptr); power.Shutdown(); break; } case RUNTIME_CHECK_BAD_BEHAVIOR: { - CGDrawString("0x00000009 CPU access error.", start_y, x, panicTxt); + CGDrawString("0x00000009 Bad behavior error.", start_y, x, panicTxt); PowerFactoryInterface power(nullptr); power.Shutdown(); break; } case RUNTIME_CHECK_BOOTSTRAP: { - CGDrawString("0x0000000A Boot Processor finished executing.", start_y, x, panicTxt); + CGDrawString("0x0000000A OS finished executing.", start_y, x, panicTxt); PowerFactoryInterface power(nullptr); power.Shutdown(); @@ -113,13 +113,13 @@ namespace Kernel break; } case RUNTIME_CHECK_FAILED: { - CGDrawString("0x10000001 Kernel Bug check failed.", start_y, x, panicTxt); + CGDrawString("0x10000001 Kernel Bug check appears to have failed, a dump has been written to the storage.", start_y, x, panicTxt); RecoveryFactory::Recover(); break; } default: { RecoveryFactory::Recover(); - CGDrawString("0xFFFFFFFC Unknown Kernel error.", start_y, x, panicTxt); + CGDrawString("0xFFFFFFFC Unknown Kernel Error.", start_y, x, panicTxt); break; } } diff --git a/dev/zka/src/String.cxx b/dev/zka/src/String.cxx index 567b51c6..bb0f80e3 100644 --- a/dev/zka/src/String.cxx +++ b/dev/zka/src/String.cxx @@ -139,7 +139,7 @@ namespace Kernel if (!fmt) return ("?"); - const Char* boolean_expr = i ? "true" : "false"; + const Char* boolean_expr = i ? "True" : "False"; char* ret = (char*)ALLOCA((sizeof(char) * i) ? 4 : 5 + rt_string_len(fmt)); if (!ret) @@ -200,7 +200,7 @@ namespace Kernel return ("?"); char* ret = - (char*)ALLOCA(sizeof(char) * rt_string_len(fmt2) + rt_string_len(fmt2)); + (char*)ALLOCA(sizeof(char) * rt_string_len(fmt2) + rt_string_len(fmt)); if (!ret) return ("?"); diff --git a/dev/zka/src/ThreadLocalStorage.cxx b/dev/zka/src/ThreadLocalStorage.cxx index be773eab..ae7cd92a 100644 --- a/dev/zka/src/ThreadLocalStorage.cxx +++ b/dev/zka/src/ThreadLocalStorage.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * minkrnl + * minoskrnl * Copyright ZKA Technologies., all rights reserved. * * ======================================================== -- cgit v1.2.3