summaryrefslogtreecommitdiffhomepage
path: root/dev/zba/src
diff options
context:
space:
mode:
Diffstat (limited to 'dev/zba/src')
-rw-r--r--dev/zba/src/BootFileReader.cc12
-rw-r--r--dev/zba/src/BootString.cc2
-rw-r--r--dev/zba/src/BootTextWriter.cc2
-rw-r--r--dev/zba/src/BootloaderRsrc.rsrc6
-rw-r--r--dev/zba/src/HEL/64X000/Boot64x0.S6
-rw-r--r--dev/zba/src/HEL/AMD64/BootATA.cc2
-rw-r--r--dev/zba/src/HEL/AMD64/BootMain.cc6
-rw-r--r--dev/zba/src/HEL/POWER/CoreBootStartup.S6
-rw-r--r--dev/zba/src/Thread.cc38
9 files changed, 40 insertions, 40 deletions
diff --git a/dev/zba/src/BootFileReader.cc b/dev/zba/src/BootFileReader.cc
index ef1f3492..835fcb05 100644
--- a/dev/zba/src/BootFileReader.cc
+++ b/dev/zba/src/BootFileReader.cc
@@ -56,13 +56,13 @@ Boot::BFileReader::BFileReader(const CharacterTypeUTF16* path,
if (BS->HandleProtocol(ImageHandle, &guidImg, (void**)&img) != kEfiOk)
{
- mWriter.Write(L"NEWOSLDR: Handle-Protocol: No-Such-Protocol").Write(L"\r");
+ mWriter.Write(L"ZBA: Handle-Protocol: No-Such-Protocol").Write(L"\r");
this->mErrorCode = kNotSupported;
}
if (BS->HandleProtocol(img->DeviceHandle, &guidEfp, (void**)&efp) != kEfiOk)
{
- mWriter.Write(L"NEWOSLDR: Handle-Protocol: No-Such-Protocol").Write(L"\r");
+ mWriter.Write(L"ZBA: Handle-Protocol: No-Such-Protocol").Write(L"\r");
this->mErrorCode = kNotSupported;
return;
}
@@ -71,7 +71,7 @@ Boot::BFileReader::BFileReader(const CharacterTypeUTF16* path,
if (efp->OpenVolume(efp, &mRootFs) != kEfiOk)
{
- mWriter.Write(L"NEWOSLDR: Fetch-Protocol: No-Such-Volume").Write(L"\r");
+ mWriter.Write(L"ZBA: Fetch-Protocol: No-Such-Volume").Write(L"\r");
this->mErrorCode = kNotSupported;
return;
}
@@ -81,12 +81,12 @@ Boot::BFileReader::BFileReader(const CharacterTypeUTF16* path,
if (mRootFs->Open(mRootFs, &KernelFile, mPath, kEFIFileRead, kEFIReadOnly) !=
kEfiOk)
{
- mWriter.Write(L"NEWOSLDR: Fetch-Protocol: No-Such-Path: ")
+ mWriter.Write(L"ZBA: Fetch-Protocol: No-Such-Path: ")
.Write(mPath)
.Write(L"\r");
this->mErrorCode = kNotSupported;
- CGDrawString("NEWOSLDR: PLEASE RECOVER YOUR MINKRNL INSTALL.", 40, 10, RGB(0xFF, 0xFF, 0xFF));
+ CGDrawString("ZBA: PLEASE RECOVER YOUR MINKRNL INSTALL.", 40, 10, RGB(0xFF, 0xFF, 0xFF));
mRootFs->Close(mRootFs);
@@ -142,7 +142,7 @@ Void Boot::BFileReader::ReadAll(SizeT readUntil, SizeT chunkToRead, UIntPtr out_
else if (readUntil < 1)
readUntil = newPtrInfo.FileSize;
- mWriter.Write(L"NEWOSLDR: FileSize: ").Write(readUntil).Write("\r");
+ mWriter.Write(L"ZBA: FileSize: ").Write(readUntil).Write("\r");
}
if (!out_address)
diff --git a/dev/zba/src/BootString.cc b/dev/zba/src/BootString.cc
index 97ccbc43..faa7f168 100644
--- a/dev/zba/src/BootString.cc
+++ b/dev/zba/src/BootString.cc
@@ -3,7 +3,7 @@
Copyright ZKA Web Services Co.
File: String.cxx
- Purpose: NewBoot string library
+ Purpose: ZBA string library
Revision History:
diff --git a/dev/zba/src/BootTextWriter.cc b/dev/zba/src/BootTextWriter.cc
index 1446250c..650484b3 100644
--- a/dev/zba/src/BootTextWriter.cc
+++ b/dev/zba/src/BootTextWriter.cc
@@ -3,7 +3,7 @@
Copyright ZKA Web Services Co.
File: String.cxx
- Purpose: NewBoot string library
+ Purpose: ZBA string library
Revision History:
diff --git a/dev/zba/src/BootloaderRsrc.rsrc b/dev/zba/src/BootloaderRsrc.rsrc
index 23a0bf09..08389bb6 100644
--- a/dev/zba/src/BootloaderRsrc.rsrc
+++ b/dev/zba/src/BootloaderRsrc.rsrc
@@ -11,10 +11,10 @@ BEGIN
VALUE "CompanyName", "ZKA Web Services Co"
VALUE "FileDescription", "ZKA OS Loader."
VALUE "FileVersion", BOOTLOADER_VERSION
- VALUE "InternalName", "newosldr"
+ VALUE "InternalName", "zbaosldr"
VALUE "LegalCopyright", "Copyright ZKA Web Services Co., all rights reserved."
- VALUE "OriginalFilename", "newosldr.exe"
- VALUE "ProductName", "newosldr"
+ VALUE "OriginalFilename", "zbaosldr.exe"
+ VALUE "ProductName", "zbaosldr"
VALUE "ProductVersion", BOOTLOADER_VERSION
END
END
diff --git a/dev/zba/src/HEL/64X000/Boot64x0.S b/dev/zba/src/HEL/64X000/Boot64x0.S
index c9b11248..fdb982a4 100644
--- a/dev/zba/src/HEL/64X000/Boot64x0.S
+++ b/dev/zba/src/HEL/64X000/Boot64x0.S
@@ -7,19 +7,19 @@
.section .boot_hdr
.align 4
-/* NewBoot boot header begin for a 64x000 Kernel. */
+/* ZBA boot header begin for a 64x000 Kernel. */
boot_hdr_mag:
.ascii "CB"
boot_hdr_name:
// it has to match ten bytes.
- .asciz "newosldr\0\0"
+ .asciz "zbaosldr\0\0"
boot_hdr_ver:
.word 0x104
boot_hdr_proc:
.long bootloader_start
-/* NewBoot boot header end */
+/* ZBA boot header end */
.extern bootloader_main
.extern bootloader_stack
diff --git a/dev/zba/src/HEL/AMD64/BootATA.cc b/dev/zba/src/HEL/AMD64/BootATA.cc
index 78792175..32860836 100644
--- a/dev/zba/src/HEL/AMD64/BootATA.cc
+++ b/dev/zba/src/HEL/AMD64/BootATA.cc
@@ -83,7 +83,7 @@ ATAInit_Retry:
if (statRdy & ATA_SR_ERR)
{
writer.Write(
- L"NEWOSLDR: ATA: error, not an IDE based hard-drive.\r");
+ L"ZBA: ATA: error, not an IDE based hard-drive.\r");
return false;
}
diff --git a/dev/zba/src/HEL/AMD64/BootMain.cc b/dev/zba/src/HEL/AMD64/BootMain.cc
index 1520dd1d..392fce0d 100644
--- a/dev/zba/src/HEL/AMD64/BootMain.cc
+++ b/dev/zba/src/HEL/AMD64/BootMain.cc
@@ -149,7 +149,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle,
mp->GetNumberOfProcessors(mp, &cnt_disabled, &cnt_enabled);
#ifdef __ZKA_USE_FB__
- CGDrawString("NEWOSLDR (C) ZKA WEB SERVICES.", 10, 10, RGB(0xFF, 0xFF, 0xFF));
+ CGDrawString("ZBA (C) ZKA WEB SERVICES.", 10, 10, RGB(0xFF, 0xFF, 0xFF));
CGDrawString((cnt_enabled > 1) ? "MULTIPLE PROCESSORS DETECTED." : "SINGLE PROCESSOR DETECTED.", 20, 10, RGB(0xFF, 0xFF, 0xFF));
#endif // __ZKA_USE_FB__
@@ -275,7 +275,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle,
else
{
#ifdef __ZKA_USE_FB__
- CGDrawString("NEWOSLDR: PLEASE RECOVER YOUR KERNEL IMAGE.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
+ CGDrawString("ZBA: PLEASE RECOVER YOUR KERNEL IMAGE.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
#endif // __ZKA_USE_FB__
}
@@ -303,7 +303,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle,
else
{
#ifdef __ZKA_USE_FB__
- CGDrawString("NEWOSLDR: ONE OR MORE SYSTEM COMPONENTS ARE MISSING, PLEASE REINSTALL THE OS.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
+ CGDrawString("ZBA: ONE OR MORE SYSTEM COMPONENTS ARE MISSING, PLEASE REINSTALL THE OS.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
#endif // __ZKA_USE_FB__
}
diff --git a/dev/zba/src/HEL/POWER/CoreBootStartup.S b/dev/zba/src/HEL/POWER/CoreBootStartup.S
index 6e977940..67cf07c8 100644
--- a/dev/zba/src/HEL/POWER/CoreBootStartup.S
+++ b/dev/zba/src/HEL/POWER/CoreBootStartup.S
@@ -7,19 +7,19 @@
.section .boot_hdr
.align 4
-/* NewBoot boot header begin */
+/* ZBA boot header begin */
boot_hdr_mag:
.ascii "CB"
boot_hdr_name:
// it has to match ten bytes.
- .asciz "newosldr\0\0"
+ .asciz "zbaosldr\0\0"
boot_hdr_ver:
.word 0x104
boot_hdr_proc:
.long bootloader_start
-/* NewBoot boot header end */
+/* ZBA boot header end */
.extern bootloader_main
.extern bootloader_stack
diff --git a/dev/zba/src/Thread.cc b/dev/zba/src/Thread.cc
index 6efe3242..e1884dcb 100644
--- a/dev/zba/src/Thread.cc
+++ b/dev/zba/src/Thread.cc
@@ -49,40 +49,40 @@ namespace Boot
if (header_ptr->mMachine != kPeMachineAMD64 ||
header_ptr->mSignature != kPeSignature)
{
- writer.Write("NEWOSLDR: Not a PE32+ executable.\r");
+ writer.Write("ZBA: Not a PE32+ executable.\r");
return;
}
#elif defined(__ZKA_ARM64__)
if (header_ptr->mMachine != kPeMachineAMD64 ||
header_ptr->mSignature != kPeSignature)
{
- writer.Write("NEWOSLDR: Not a PE32+ executable.\r");
+ writer.Write("ZBA: Not a PE32+ executable.\r");
return;
}
#endif // __ZKA_AMD64__ || __ZKA_ARM64__
if (opt_header_ptr->mSubsystem != kZKASubsystem)
{
- writer.Write("NEWOSLDR: Not a ZKA Subsystem executable.\r");
+ writer.Write("ZBA: Not a ZKA Subsystem executable.\r");
return;
}
- writer.Write("NEWOSLDR: PE32+ executable detected (ZKA Subsystem).\r");
+ writer.Write("ZBA: PE32+ executable detected (ZKA Subsystem).\r");
auto numSecs = header_ptr->mNumberOfSections;
- writer.Write("NEWOSLDR: Major Linker Ver: ").Write(opt_header_ptr->mMajorLinkerVersion).Write("\r");
- writer.Write("NEWOSLDR: Minor Linker Ver: ").Write(opt_header_ptr->mMinorLinkerVersion).Write("\r");
- writer.Write("NEWOSLDR: Major Subsystem Ver: ").Write(opt_header_ptr->mMajorSubsystemVersion).Write("\r");
- writer.Write("NEWOSLDR: Minor Subsystem Ver: ").Write(opt_header_ptr->mMinorSubsystemVersion).Write("\r");
- writer.Write("NEWOSLDR: Magic: ").Write(header_ptr->mSignature).Write("\r");
+ writer.Write("ZBA: Major Linker Ver: ").Write(opt_header_ptr->mMajorLinkerVersion).Write("\r");
+ writer.Write("ZBA: Minor Linker Ver: ").Write(opt_header_ptr->mMinorLinkerVersion).Write("\r");
+ writer.Write("ZBA: Major Subsystem Ver: ").Write(opt_header_ptr->mMajorSubsystemVersion).Write("\r");
+ writer.Write("ZBA: Minor Subsystem Ver: ").Write(opt_header_ptr->mMinorSubsystemVersion).Write("\r");
+ writer.Write("ZBA: Magic: ").Write(header_ptr->mSignature).Write("\r");
constexpr auto cPageSize = 512;
EfiPhysicalAddress loadStartAddress = opt_header_ptr->mImageBase;
loadStartAddress += opt_header_ptr->mBaseOfData;
- writer.Write("NEWOSLDR: ImageBase: ").Write(loadStartAddress).Write("\r");
+ writer.Write("ZBA: ImageBase: ").Write(loadStartAddress).Write("\r");
auto numPages = opt_header_ptr->mSizeOfImage / cPageSize;
BS->AllocatePages(AllocateAddress, EfiLoaderData, numPages, &loadStartAddress);
@@ -102,7 +102,7 @@ namespace Boot
if (StrCmp(sectionForCode, sect->mName) == 0)
{
fStartAddress = (VoidPtr)((UIntPtr)loadStartAddress + opt_header_ptr->mAddressOfEntryPoint);
- writer.Write("NEWOSLDR: Executable entry address: ").Write((UIntPtr)fStartAddress).Write("\r");
+ writer.Write("ZBA: Executable entry address: ").Write((UIntPtr)fStartAddress).Write("\r");
}
else if (StrCmp(sectionForNewLdr, sect->mName) == 0)
{
@@ -120,7 +120,7 @@ namespace Boot
#ifdef __ZKA_AMD64__
if (handover_struc->HandoverArch != HEL::kArchAMD64)
{
- CGDrawString("NEWOSLDR: NOT AN HANDOVER IMAGE, BAD ARCHITECTURE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
+ CGDrawString("ZBA: NOT AN HANDOVER IMAGE, BAD ARCHITECTURE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
::EFI::Stop();
}
#endif
@@ -128,17 +128,17 @@ namespace Boot
#ifdef __ZKA_ARM64__
if (handover_struc->HandoverArch != HEL::kArchARM64)
{
- CGDrawString("NEWOSLDR: NOT AN HANDOVER IMAGE, BAD ARCHITECTURE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
+ CGDrawString("ZBA: NOT AN HANDOVER IMAGE, BAD ARCHITECTURE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
::EFI::Stop();
}
#endif
- CGDrawString("NEWOSLDR: NOT AN HANDOVER IMAGE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
+ CGDrawString("ZBA: NOT AN HANDOVER IMAGE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
::EFI::Stop();
}
}
- writer.Write("NEWOSLDR: Raw offset: ").Write(sect->mPointerToRawData).Write(" of ").Write(sect->mName).Write("\r");
+ writer.Write("ZBA: Raw offset: ").Write(sect->mPointerToRawData).Write(" of ").Write(sect->mName).Write("\r");
CopyMem((VoidPtr)(loadStartAddress + sect->mVirtualAddress), (VoidPtr)((UIntPtr)fBlob + sect->mPointerToRawData), sect->mSizeOfRawData);
}
@@ -153,12 +153,12 @@ namespace Boot
// ========================================= //
fStartAddress = nullptr;
- writer.Write("NEWOSLDR: PEF executable detected, won't load it.\r");
- writer.Write("NEWOSLDR: note: PEF executables aren't loadable by default.\r");
+ writer.Write("ZBA: PEF executable detected, won't load it.\r");
+ writer.Write("ZBA: note: PEF executables aren't loadable by default.\r");
}
else
{
- writer.Write("NEWOSLDR: Invalid executable.\r");
+ writer.Write("ZBA: Invalid executable.\r");
}
}
@@ -166,7 +166,7 @@ namespace Boot
Void BThread::Start(HEL::HANDOVER_INFO_HEADER* handover)
{
HEL::HandoverProc err_fn = [](HEL::HANDOVER_INFO_HEADER* rcx) -> void {
- CGDrawString("NEWOSLDR: INVALID IMAGE! ABORTING...", 50, 10, RGB(0xFF, 0xFF, 0xFF));
+ CGDrawString("ZBA: INVALID IMAGE! ABORTING...", 50, 10, RGB(0xFF, 0xFF, 0xFF));
::EFI::Stop();
};
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-15 01:38:19 +0000