BootZ: Improve format UI.

Signed-off-by: Amlal <amlalelmahrouss@icloud.com>

9 files changed, 55 insertions, 42 deletions

diff --git a/dev/ZBAKit/src/BootFileReader.cc b/dev/ZBAKit/src/BootFileReader.cc
index 6c461d40..1edf1281 100644
--- a/dev/ZBAKit/src/BootFileReader.cc
+++ b/dev/ZBAKit/src/BootFileReader.cc
@@ -56,13 +56,13 @@ Boot::BFileReader::BFileReader(const CharacterTypeUTF16* path,
 
 	if (BS->HandleProtocol(ImageHandle, &guidImg, (void**)&img) != kEfiOk)
 	{
-		mWriter.Write(L"ZBA: Handle-Protocol: No-Such-Protocol").Write(L"\r");
+		mWriter.Write(L"BootZ: Handle-Protocol: No-Such-Protocol").Write(L"\r");
 		this->mErrorCode = kNotSupported;
 	}
 
 	if (BS->HandleProtocol(img->DeviceHandle, &guidEfp, (void**)&efp) != kEfiOk)
 	{
-		mWriter.Write(L"ZBA: Handle-Protocol: No-Such-Protocol").Write(L"\r");
+		mWriter.Write(L"BootZ: 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"ZBA: Fetch-Protocol: No-Such-Volume").Write(L"\r");
+		mWriter.Write(L"BootZ: 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, &fileFs, mPath, kEFIFileRead, kEFIReadOnly) !=
 		kEfiOk)
 	{
-		mWriter.Write(L"ZBA: Fetch-Protocol: No-Such-Path: ")
+		mWriter.Write(L"BootZ: Fetch-Protocol: No-Such-Path: ")
 			.Write(mPath)
 			.Write(L"\r");
 		this->mErrorCode = kNotSupported;
 
-		CGDrawString("ZBA: PLEASE RECOVER YOUR MINKRNL INSTALL.", 40, 10, RGB(0xFF, 0xFF, 0xFF));
+		CGDrawString("BootZ: 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"ZBA: File size: ").Write(readUntil).Write("\r");
+			mWriter.Write(L"BootZ: File size: ").Write(readUntil).Write("\r");
 		}
 
 		if (!out_address)
diff --git a/dev/ZBAKit/src/BootString.cc b/dev/ZBAKit/src/BootString.cc
index 6c23f808..f511f2fc 100644
--- a/dev/ZBAKit/src/BootString.cc
+++ b/dev/ZBAKit/src/BootString.cc
@@ -3,7 +3,7 @@
 	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 	File: BootString.cc
-	Purpose: ZBA string library
+	Purpose: BootZ string library
 
 	Revision History:
 
diff --git a/dev/ZBAKit/src/BootTextWriter.cc b/dev/ZBAKit/src/BootTextWriter.cc
index 25fa3bd9..bbb9a961 100644
--- a/dev/ZBAKit/src/BootTextWriter.cc
+++ b/dev/ZBAKit/src/BootTextWriter.cc
@@ -3,7 +3,7 @@
 	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 	File: BootTextWriter.cc
-	Purpose: ZBA string library
+	Purpose: BootZ string library
 
 	Revision History:
 
diff --git a/dev/ZBAKit/src/BootThread.cc b/dev/ZBAKit/src/BootThread.cc
index 57ce270f..32f8fd86 100644
--- a/dev/ZBAKit/src/BootThread.cc
+++ b/dev/ZBAKit/src/BootThread.cc
@@ -51,40 +51,40 @@ namespace Boot
 			if (header_ptr->mMachine != kPeMachineAMD64 ||
 				header_ptr->mSignature != kPeSignature)
 			{
-				writer.Write("ZBA: Not a PE32+ executable.\r");
+				writer.Write("BootZ: Not a PE32+ executable.\r");
 				return;
 			}
 #elif defined(__ZKA_ARM64__)
 			if (header_ptr->mMachine != kPeMachineAMD64 ||
 				header_ptr->mSignature != kPeSignature)
 			{
-				writer.Write("ZBA: Not a PE32+ executable.\r");
+				writer.Write("BootZ: Not a PE32+ executable.\r");
 				return;
 			}
 #endif // __ZKA_AMD64__ || __ZKA_ARM64__
 
 			if (opt_header_ptr->mSubsystem != kZKASubsystem)
 			{
-				writer.Write("ZBA: Not a ZKA Subsystem executable.\r");
+				writer.Write("BootZ: Not a ZKA Subsystem executable.\r");
 				return;
 			}
 
-			writer.Write("ZBA: PE32+ executable detected (ZKA Subsystem).\r");
+			writer.Write("BootZ: PE32+ executable detected (ZKA Subsystem).\r");
 
 			auto numSecs = header_ptr->mNumberOfSections;
 
-			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");
+			writer.Write("BootZ: Major Linker Ver: ").Write(opt_header_ptr->mMajorLinkerVersion).Write("\r");
+			writer.Write("BootZ: Minor Linker Ver: ").Write(opt_header_ptr->mMinorLinkerVersion).Write("\r");
+			writer.Write("BootZ: Major Subsystem Ver: ").Write(opt_header_ptr->mMajorSubsystemVersion).Write("\r");
+			writer.Write("BootZ: Minor Subsystem Ver: ").Write(opt_header_ptr->mMinorSubsystemVersion).Write("\r");
+			writer.Write("BootZ: Magic: ").Write(header_ptr->mSignature).Write("\r");
 
 			constexpr auto cPageSize = 512;
 
 			EfiPhysicalAddress loadStartAddress = opt_header_ptr->mImageBase;
 			loadStartAddress += opt_header_ptr->mBaseOfData;
 
-			writer.Write("ZBA: ImageBase: ").Write(loadStartAddress).Write("\r");
+			writer.Write("BootZ: ImageBase: ").Write(loadStartAddress).Write("\r");
 
 			auto numPages = opt_header_ptr->mSizeOfImage / cPageSize;
 			BS->AllocatePages(AllocateAddress, EfiLoaderData, numPages, &loadStartAddress);
@@ -104,7 +104,7 @@ namespace Boot
 				if (StrCmp(sectionForCode, sect->mName) == 0)
 				{
 					fStartAddress = (VoidPtr)((UIntPtr)loadStartAddress + opt_header_ptr->mAddressOfEntryPoint);
-					writer.Write("ZBA: Executable entry address: ").Write((UIntPtr)fStartAddress).Write("\r");
+					writer.Write("BootZ: Executable entry address: ").Write((UIntPtr)fStartAddress).Write("\r");
 				}
 				else if (StrCmp(sectionForNewLdr, sect->mName) == 0)
 				{
@@ -122,7 +122,7 @@ namespace Boot
 #ifdef __ZKA_AMD64__
 						if (handover_struc->HandoverArch != HEL::kArchAMD64)
 						{
-							CGDrawString("ZBA: NOT AN HANDOVER IMAGE, BAD ARCHITECTURE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
+							CGDrawString("BootZ: NOT AN HANDOVER IMAGE, BAD ARCHITECTURE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
 							::EFI::Stop();
 						}
 #endif
@@ -130,17 +130,17 @@ namespace Boot
 #ifdef __ZKA_ARM64__
 						if (handover_struc->HandoverArch != HEL::kArchARM64)
 						{
-							CGDrawString("ZBA: NOT AN HANDOVER IMAGE, BAD ARCHITECTURE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
+							CGDrawString("BootZ: NOT AN HANDOVER IMAGE, BAD ARCHITECTURE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
 							::EFI::Stop();
 						}
 #endif
-						CGDrawString("ZBA: NOT AN HANDOVER IMAGE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
+						CGDrawString("BootZ: NOT AN HANDOVER IMAGE...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
 
 						::EFI::Stop();
 					}
 				}
 
-				writer.Write("ZBA: Raw offset: ").Write(sect->mPointerToRawData).Write(" of ").Write(sect->mName).Write("\r");
+				writer.Write("BootZ: Raw offset: ").Write(sect->mPointerToRawData).Write(" of ").Write(sect->mName).Write("\r");
 
 				CopyMem((VoidPtr)(loadStartAddress + sect->mVirtualAddress), (VoidPtr)((UIntPtr)fBlob + sect->mPointerToRawData), sect->mSizeOfRawData);
 			}
@@ -155,12 +155,12 @@ namespace Boot
 			//  =========================================  //
 
 			fStartAddress = nullptr;
-			writer.Write("ZBA: PEF executable detected, won't load it.\r");
-			writer.Write("ZBA: note: PEF executables aren't loadable by default.\r");
+			writer.Write("BootZ: PEF executable detected, won't load it.\r");
+			writer.Write("BootZ: note: PEF executables aren't loadable by default.\r");
 		}
 		else
 		{
-			writer.Write("ZBA: INVALID EXECUTABLE.\r");
+			writer.Write("BootZ: INVALID EXECUTABLE.\r");
 		}
 
 		fStack = new UInt8[mib_cast(8)];
@@ -170,7 +170,7 @@ namespace Boot
 	Void BThread::Start(HEL::BootInfoHeader* handover, Bool own_stack)
 	{
 		HEL::HandoverProc err_fn = [](HEL::BootInfoHeader* rcx) -> void {
-			CGDrawString("ZBA: INVALID IMAGE! ABORTING...", 50, 10, RGB(0xFF, 0xFF, 0xFF));
+			CGDrawString("BootZ: INVALID IMAGE! ABORTING...", 50, 10, RGB(0xFF, 0xFF, 0xFF));
 			::EFI::Stop();
 		};
 
diff --git a/dev/ZBAKit/src/HEL/64X000/Boot64x0.S b/dev/ZBAKit/src/HEL/64X000/Boot64x0.S
index 0415436e..a9ca1a2d 100644
--- a/dev/ZBAKit/src/HEL/64X000/Boot64x0.S
+++ b/dev/ZBAKit/src/HEL/64X000/Boot64x0.S
@@ -7,7 +7,7 @@
 .section .boot_hdr
 .align 4
 
-/* ZBA boot header begin for a 64x000 Kernel. */
+/* BootZ boot header begin for a 64x000 Kernel. */
 
 boot_hdr_mag:
         .ascii "CB"
@@ -19,7 +19,7 @@ boot_hdr_ver:
 boot_hdr_proc:
         .long bootloader_start
 
-/* ZBA boot header end */
+/* BootZ boot header end */
 
 .extern bootloader_main
 .extern bootloader_stack
diff --git a/dev/ZBAKit/src/HEL/AMD64/BootATA.cc b/dev/ZBAKit/src/HEL/AMD64/BootATA.cc
index f48c8350..572a124d 100644
--- a/dev/ZBAKit/src/HEL/AMD64/BootATA.cc
+++ b/dev/ZBAKit/src/HEL/AMD64/BootATA.cc
@@ -83,7 +83,7 @@ ATAInit_Retry:
 	if (statRdy & ATA_SR_ERR)
 	{
 		writer.Write(
-			L"ZBA: ATA: Not an IDE based drive.\r");
+			L"BootZ: ATA: Not an IDE based drive.\r");
 
 		return false;
 	}
diff --git a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc
index 26348ac2..dbe10366 100644
--- a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc
+++ b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc
@@ -20,7 +20,7 @@
 
 // Makes the compiler shut up.
 #ifndef kMachineModel
-#define kMachineModel "ZKA"
+#define kMachineModel "ZkaOS"
 #endif // !kMachineModel
 
 #ifndef kExpectedWidth
@@ -141,13 +141,13 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 
 	kHandoverHeader = handover_hdr;
 
-#ifdef ZBA_USE_FB
 	cg_init();
-	CGDrawInRegion(cg_color(0x00, 0x00, 0x00), handover_hdr->f_GOP.f_Height, handover_hdr->f_GOP.f_Width, 0, 0);
-	cg_fini();
+
+	CG::CGDrawBackground();
+
+	CGDrawBitMapInRegion(zka_disk, ZKA_DISK_HEIGHT, ZKA_DISK_WIDTH, (kHandoverHeader->f_GOP.f_Width - ZKA_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_DISK_HEIGHT) / 2);
 
 	cg_fini();
-#endif // ZBA_USE_FB
 
 	UInt32 cnt_enabled	= 0;
 	UInt32 cnt_disabled = 0;
@@ -155,7 +155,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 	mp->GetNumberOfProcessors(mp, &cnt_disabled, &cnt_enabled);
 
 #ifdef ZBA_USE_FB
-	CGDrawString("ZBA (c) Theater Quality Inc.", 10, 10, RGB(0xFF, 0xFF, 0xFF));
+	CGDrawString("BootZ (c) 2024 Theater Quality Inc.", 10, 10, RGB(0xFF, 0xFF, 0xFF));
 	CGDrawString((cnt_enabled > 1) ? "Multi processor configuration detected." : "Single processor configuration detected.", 20, 10, RGB(0xFF, 0xFF, 0xFF));
 #endif // ZBA_USE_FB
 
@@ -173,15 +173,28 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 #ifdef ZKA_AUTO_FORMAT
 	if (!partition_factory.IsPartitionValid())
 	{
+		CG::CGDrawBackground();
+
+		CGDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_HEIGHT, ZKA_NO_DISK_WIDTH, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2);
+
+		cg_fini();
+
 		CGDrawString("Formatting EPM disk...", 30, 10, RGB(0xFF, 0xFF, 0xFF));
 
 		Boot::BDiskFormatFactory<BootDeviceATA>::BFileDescriptor root;
+
 		root.fFileName[0] = kNeFSRoot[0];
 		root.fFileName[1] = 0;
 
 		root.fKind = kNeFSCatalogKindDir;
 
 		partition_factory.Format("FileSystem (A:)\0", &root, 1);
+		
+		CG::CGDrawBackground();
+
+		CGDrawBitMapInRegion(zka_has_disk, ZKA_HAS_DISK_HEIGHT, ZKA_HAS_DISK_WIDTH, (kHandoverHeader->f_GOP.f_Width - ZKA_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_HAS_DISK_HEIGHT) / 2);
+
+		cg_fini();
 	}
 #endif // ZKA_AUTO_FORMAT
 
@@ -237,7 +250,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 	if (reader_syschk.Blob())
 	{
 		syschk_thread = new Boot::BThread(reader_syschk.Blob());
-		syschk_thread->SetName("System Check (ZBA EFI Driver)");
+		syschk_thread->SetName("System Check (BootZ EFI Driver)");
 	}
 
 	syschk_thread->Start(handover_hdr, NO);
@@ -281,7 +294,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 	else
 	{
 #ifdef ZBA_USE_FB
-		CGDrawString("ZBA: Please recover your kernel image.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
+		CGDrawString("BootZ: Please recover your kernel image.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
 #endif // ZBA_USE_FB
 
 		EFI::Stop();
@@ -306,7 +319,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 	else
 	{
 #ifdef ZBA_USE_FB
-		CGDrawString("ZBA: OS resources are not present, please reinstall the OS.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
+		CGDrawString("BootZ: OS resources are not present, please reinstall the OS.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
 #endif // ZBA_USE_FB
 
 		EFI::Stop();
diff --git a/dev/ZBAKit/src/HEL/AMD64/BootSATA.cc b/dev/ZBAKit/src/HEL/AMD64/BootSATA.cc
index d252c15b..28516038 100644
--- a/dev/ZBAKit/src/HEL/AMD64/BootSATA.cc
+++ b/dev/ZBAKit/src/HEL/AMD64/BootSATA.cc
@@ -7,7 +7,7 @@
 /**
  * @file BootAHCI.cc
  * @author Theater Quality Inc (amlalelmahrouss@icloud.com)
- * @brief AHCI support for ZBA.
+ * @brief AHCI support for BootZ.
  * @version 0.1
  * @date 2024-02-02
  *
diff --git a/dev/ZBAKit/src/HEL/POWER/CoreBootStartup.S b/dev/ZBAKit/src/HEL/POWER/CoreBootStartup.S
index 0a3f2b00..e4964c59 100644
--- a/dev/ZBAKit/src/HEL/POWER/CoreBootStartup.S
+++ b/dev/ZBAKit/src/HEL/POWER/CoreBootStartup.S
@@ -7,7 +7,7 @@
 .section .boot_hdr
 .align 4
 
-/* ZBA boot header begin */
+/* BootZ boot header begin */
 
 boot_hdr_mag:
 	.ascii "CB"
@@ -19,7 +19,7 @@ boot_hdr_ver:
 boot_hdr_proc:
 	.long bootloader_start
 
-/* ZBA boot header end */
+/* BootZ boot header end */
 
 .extern bootloader_main
 .extern bootloader_stack