summaryrefslogtreecommitdiffhomepage
path: root/dev/Boot/src
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-01-01 23:25:44 +0100
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-01-01 23:25:44 +0100
commite154cbf9a2a9eedd4c122d6619f25d29e04610ef (patch)
treec02e69a8c41f58ebedc2e1cc0fbc3bb5437116d4 /dev/Boot/src
parentad97dd0ac528b837d14e9236369c823dec66aea8 (diff)
IMPL: Update to fixes to kernel and bootloader.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/Boot/src')
-rw-r--r--dev/Boot/src/BootThread.cc12
-rw-r--r--dev/Boot/src/HEL/AMD64/BootMain.cc8
-rw-r--r--dev/Boot/src/HEL/ARM64/BootMain.cc2
3 files changed, 11 insertions, 11 deletions
diff --git a/dev/Boot/src/BootThread.cc b/dev/Boot/src/BootThread.cc
index a3bc3500..782483f9 100644
--- a/dev/Boot/src/BootThread.cc
+++ b/dev/Boot/src/BootThread.cc
@@ -18,13 +18,13 @@
/// @brief External boot services symbol.
EXTERN EfiBootServices* BS;
-/// @note BThread doesn't parse the symbols so doesn't nullify them, .bss is though.
+/// @note BootThread doesn't parse the symbols so doesn't nullify them, .bss is though.
namespace Boot
{
EXTERN_C Void rt_jump_to_address(VoidPtr code, HEL::BootInfoHeader* handover, UInt8* stack);
- BThread::BThread(VoidPtr blob)
+ BootThread::BootThread(VoidPtr blob)
: fBlob(blob), fStartAddress(nullptr)
{
// detect the format.
@@ -167,7 +167,7 @@ namespace Boot
}
/// @note handover header has to be valid!
- Int32 BThread::Start(HEL::BootInfoHeader* handover, Bool own_stack)
+ Int32 BootThread::Start(HEL::BootInfoHeader* handover, Bool own_stack)
{
HEL::HandoverProc err_fn = [](HEL::BootInfoHeader* rcx) -> Int32 {
fb_render_string("BootZ: Invalid Boot Image...", 50, 10, RGB(0xFF, 0xFF, 0xFF));
@@ -196,17 +196,17 @@ namespace Boot
return NO;
}
- const Char* BThread::GetName()
+ const Char* BootThread::GetName()
{
return fBlobName;
}
- Void BThread::SetName(const Char* name)
+ Void BootThread::SetName(const Char* name)
{
CopyMem(fBlobName, name, StrLen(name));
}
- bool BThread::IsValid()
+ bool BootThread::IsValid()
{
return fStartAddress != nullptr;
}
diff --git a/dev/Boot/src/HEL/AMD64/BootMain.cc b/dev/Boot/src/HEL/AMD64/BootMain.cc
index b927b4f1..db370db1 100644
--- a/dev/Boot/src/HEL/AMD64/BootMain.cc
+++ b/dev/Boot/src/HEL/AMD64/BootMain.cc
@@ -206,7 +206,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle,
Boot::BFileReader reader_syschk(L"syschk.sys", image_handle);
reader_syschk.ReadAll(0);
- Boot::BThread* syschk_thread = nullptr;
+ Boot::BootThread* syschk_thread = nullptr;
// ------------------------------------------ //
// If we succeed in reading the blob, then execute it.
@@ -214,7 +214,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle,
if (reader_syschk.Blob())
{
- syschk_thread = new Boot::BThread(reader_syschk.Blob());
+ syschk_thread = new Boot::BootThread(reader_syschk.Blob());
syschk_thread->SetName("BootZ: System Recovery Check");
}
@@ -265,7 +265,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle,
reader_kernel.ReadAll(0);
- Boot::BThread* kernel_thread = nullptr;
+ Boot::BootThread* kernel_thread = nullptr;
// ------------------------------------------ //
// If we succeed in reading the blob, then execute it.
@@ -273,7 +273,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle,
if (reader_kernel.Blob())
{
- kernel_thread = new Boot::BThread(reader_kernel.Blob());
+ kernel_thread = new Boot::BootThread(reader_kernel.Blob());
kernel_thread->SetName("BootZ: ZkaOS Kernel.");
handover_hdr->f_KernelImage = reader_kernel.Blob();
diff --git a/dev/Boot/src/HEL/ARM64/BootMain.cc b/dev/Boot/src/HEL/ARM64/BootMain.cc
index 1cf72d4b..4d303c33 100644
--- a/dev/Boot/src/HEL/ARM64/BootMain.cc
+++ b/dev/Boot/src/HEL/ARM64/BootMain.cc
@@ -66,7 +66,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle,
if (reader_kernel.Blob())
{
- auto kernel_thread = Boot::BThread(reader_kernel.Blob());
+ auto kernel_thread = Boot::BootThread(reader_kernel.Blob());
if (kernel_thread.IsValid())
kernel_thread.Start(nullptr, YES);