From 67716b2871b1117510b26bc1aaf6fce7195272dc Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Sat, 9 Nov 2024 10:30:58 +0100
Subject: META: Important refactors and include SCIKit.dylib when building
 bootloader.

---
 dev/ZBAKit/src/HEL/AMD64/BootAHCI.cc | 20 --------------------
 dev/ZBAKit/src/HEL/AMD64/BootMain.cc | 12 ++++++------
 dev/ZBAKit/src/HEL/AMD64/BootSATA.cc | 20 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 dev/ZBAKit/src/HEL/AMD64/BootAHCI.cc
 create mode 100644 dev/ZBAKit/src/HEL/AMD64/BootSATA.cc

(limited to 'dev/ZBAKit/src')

diff --git a/dev/ZBAKit/src/HEL/AMD64/BootAHCI.cc b/dev/ZBAKit/src/HEL/AMD64/BootAHCI.cc
deleted file mode 100644
index 765870b0..00000000
--- a/dev/ZBAKit/src/HEL/AMD64/BootAHCI.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -------------------------------------------
-
-	Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved.
-
-------------------------------------------- */
-
-/**
- * @file BootAHCI.cc
- * @author Amlal EL Mahrouss (amlalelmahrouss@icloud.com)
- * @brief AHCI support for ZBA.
- * @version 0.1
- * @date 2024-02-02
- *
- * @copyright Copyright (c) Amlal EL Mahrouss
- *
- */
-
-#include <BootKit/Platform.h>
-#include <BootKit/Protocol.h>
-#include <BootKit/HW/SATA.h>
diff --git a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc
index ac06ee71..7bd861b1 100644
--- a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc
+++ b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc
@@ -173,7 +173,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 #ifdef ZKA_AUTO_FORMAT
 	if (!partition_factory.IsPartitionValid())
 	{
-		CGDrawString("FORMATTING EPM DISK...", 20, 10, RGB(0xFF, 0xFF, 0xFF));
+		CGDrawString("Formatting EPM disk...", 20, 10, RGB(0xFF, 0xFF, 0xFF));
 
 		Boot::BDiskFormatFactory<BootDeviceATA>::BFileDescriptor root;
 		root.fFileName[0] = kNeFSRoot[0];
@@ -187,7 +187,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 	}
 	else
 	{
-		CGDrawString("BOOTING FROM EPM DISK...", 20, 10, RGB(0xFF, 0xFF, 0xFF));
+		CGDrawString("Booting from EPM disk...", 20, 10, RGB(0xFF, 0xFF, 0xFF));
 	}
 #endif // ZKA_AUTO_FORMAT
 
@@ -243,7 +243,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 Driver)");
+		syschk_thread->SetName("System Check (ZBA EFI Driver)");
 	}
 
 	syschk_thread->Start(handover_hdr);
@@ -287,7 +287,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("ZBA: Please recover your kernel image.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
 #endif // ZBA_USE_FB
 
 		EFI::Stop();
@@ -312,7 +312,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 	else
 	{
 #ifdef ZBA_USE_FB
-		CGDrawString("ZBA: ONE OR MORE SYSTEM COMPONENTS ARE MISSING, PLEASE REINSTALL THE OS.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
+		CGDrawString("ZBA: OS resources are not present, please reinstall the OS.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
 #endif // ZBA_USE_FB
 
 		EFI::Stop();
@@ -321,7 +321,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 	EFI::ExitBootServices(map_key, ImageHandle);
 
 	// ---------------------------------------------------- //
-	// Finally load the operating system kernel.
+	// Finally load the OS kernel.
 	// ---------------------------------------------------- //
 
 	kernel_thread->Start(handover_hdr);
diff --git a/dev/ZBAKit/src/HEL/AMD64/BootSATA.cc b/dev/ZBAKit/src/HEL/AMD64/BootSATA.cc
new file mode 100644
index 00000000..765870b0
--- /dev/null
+++ b/dev/ZBAKit/src/HEL/AMD64/BootSATA.cc
@@ -0,0 +1,20 @@
+/* -------------------------------------------
+
+	Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved.
+
+------------------------------------------- */
+
+/**
+ * @file BootAHCI.cc
+ * @author Amlal EL Mahrouss (amlalelmahrouss@icloud.com)
+ * @brief AHCI support for ZBA.
+ * @version 0.1
+ * @date 2024-02-02
+ *
+ * @copyright Copyright (c) Amlal EL Mahrouss
+ *
+ */
+
+#include <BootKit/Platform.h>
+#include <BootKit/Protocol.h>
+#include <BootKit/HW/SATA.h>
-- 
cgit v1.2.3