Merged in MHR-23 (pull request #15)

MHR-23

13 files changed, 50 insertions, 30 deletions

diff --git a/Boot/Sources/BootloaderRsrc.rsrc b/Boot/Sources/BootloaderRsrc.rsrc
index 857e08e4..92ff177f 100644
--- a/Boot/Sources/BootloaderRsrc.rsrc
+++ b/Boot/Sources/BootloaderRsrc.rsrc
@@ -1,6 +1,6 @@
 #include "../../Kernel/CompilerKit/Version.hxx"
 
-1 ICON "../../Kernel/Root/Boot/Icons/boot-logo.ico"
+1 ICON "../../Icons/boot-logo.ico"
 
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
@@ -10,11 +10,11 @@ BEGIN
   BEGIN
     BLOCK "080904E4"
     BEGIN
-      VALUE "CompanyName", "SoftwareLabs"
+      VALUE "CompanyName", "Zeta Electronics Corporation"
       VALUE "FileDescription", "New OS multi-platform bootloader."
       VALUE "FileVersion", BOOTLOADER_VERSION
       VALUE "InternalName", "newosldr"
-      VALUE "LegalCopyright", "Copyright SoftwareLabs, all rights reserved."
+      VALUE "LegalCopyright", "Copyright Zeta Electronics Corporation, all rights reserved."
       VALUE "OriginalFilename", "newosldr.exe"
       VALUE "ProductName", "newosldr"
       VALUE "ProductVersion", BOOTLOADER_VERSION
diff --git a/Boot/Sources/HEL/AMD64/BootAHCI.cxx b/Boot/Sources/HEL/AMD64/BootAHCI.cxx
index d60b91fd..7d07f8f0 100644
--- a/Boot/Sources/HEL/AMD64/BootAHCI.cxx
+++ b/Boot/Sources/HEL/AMD64/BootAHCI.cxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
@@ -11,7 +11,7 @@
  * @version 0.1
  * @date 2024-02-02
  *
- * @copyright Copyright (c) SoftwareLabs
+ * @copyright Copyright (c) Zeta Electronics Corporation
  *
  */
 
diff --git a/Boot/Sources/HEL/AMD64/BootATA.cxx b/Boot/Sources/HEL/AMD64/BootATA.cxx
index d2753110..55a55a0c 100644
--- a/Boot/Sources/HEL/AMD64/BootATA.cxx
+++ b/Boot/Sources/HEL/AMD64/BootATA.cxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
@@ -11,7 +11,7 @@
  * @version 0.1
  * @date 2024-02-02
  *
- * @copyright Copyright (c) SoftwareLabs
+ * @copyright Copyright (c) Zeta Electronics Corporation
  *
  */
 
diff --git a/Boot/Sources/HEL/AMD64/BootFileReader.cxx b/Boot/Sources/HEL/AMD64/BootFileReader.cxx
index e6e70509..b5498cf9 100644
--- a/Boot/Sources/HEL/AMD64/BootFileReader.cxx
+++ b/Boot/Sources/HEL/AMD64/BootFileReader.cxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 	File: FileReader.cxx
 	Purpose: New Boot FileReader,
diff --git a/Boot/Sources/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx
index cb8bccba..5ab7914a 100644
--- a/Boot/Sources/HEL/AMD64/BootMain.cxx
+++ b/Boot/Sources/HEL/AMD64/BootMain.cxx
@@ -1,12 +1,12 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
 #include <BootKit/BootKit.hxx>
 #include <BootKit/Rsrc/NewBoot.rsrc>
-#include <Builtins/Toolbox/Toolbox.hxx>
+#include <Builtins/GX/GX>
 #include <FirmwareKit/EFI.hxx>
 #include <FirmwareKit/EFI/API.hxx>
 #include <FirmwareKit/Handover.hxx>
@@ -19,9 +19,17 @@
 
 /// make the compiler shut up.
 #ifndef kMachineModel
-#define kMachineModel "NeWS HD"
+#define kMachineModel "Zeta HD"
 #endif // !kMachineModel
 
+#ifndef cExpectedWidth
+#define cExpectedWidth 436
+#endif
+
+#ifndef cExpectedHeight
+#define cExpectedHeight 644
+#endif
+
 /** Graphics related. */
 
 STATIC EfiGraphicsOutputProtocol* kGop	  = nullptr;
@@ -34,7 +42,7 @@ EXTERN_C Void hal_init_platform(HEL::HandoverInformationHeader* HIH);
 	@brief Finds and stores the GOP.
 */
 
-STATIC Void CheckAndFindFramebuffer() noexcept
+STATIC Void InitVideoFB() noexcept
 {
 	kGopGuid = EfiGUID(EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID);
 	kGop	 = nullptr;
@@ -43,6 +51,18 @@ STATIC Void CheckAndFindFramebuffer() noexcept
 
 	BS->LocateProtocol(&kGopGuid, nullptr, (VoidPtr*)&kGop);
 
+	for (size_t i = 0; i < kGop->Mode->MaxMode; ++i)
+	{
+		EfiGraphicsOutputProtocolModeInformation* infoPtr = nullptr;
+
+		if (infoPtr->HorizontalResolution == cExpectedWidth &&
+			infoPtr->VerticalResolution == cExpectedHeight)
+		{
+			kGop->SetMode(kGop, i);
+			break;
+		}
+	}
+
 	kStride = 4;
 }
 
@@ -62,16 +82,16 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 							  EfiSystemTable* SystemTable)
 {
 	InitEFI(SystemTable);	   ///! Init the EFI library.
-	CheckAndFindFramebuffer(); ///! Init the GOP.
+	InitVideoFB(); ///! Init the GOP.
 
 	BTextWriter writer;
 
 	/// Splash screen stuff
 
-	writer.Write(L"SoftwareLabs (R) newosldr: ")
+	writer.Write(L"Zeta Electronics Corporation (R) newosldr: ")
 		.Write(BVersionString::The());
 
-	writer.Write(L"\rNew Boot: Firmware Vendor: ")
+	writer.Write(L"\rnewosldr: Firmware Vendor: ")
 		.Write(SystemTable->FirmwareVendor)
 		.Write(L"\r");
 
@@ -123,18 +143,18 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 
 	kHandoverHeader = handoverHdrPtr;
 
-	ToolboxInitRsrc();
+	GXInit();
 
-	ToolboxDrawZone(RGB(9d, 9d, 9d), handoverHdrPtr->f_GOP.f_Height,
+	GXDraw(RGB(9d, 9d, 9d), handoverHdrPtr->f_GOP.f_Height,
 					handoverHdrPtr->f_GOP.f_Width, 0, 0);
 
-	ToolboxClearRsrc();
+	GXFini();
 
-	ToolboxDrawRsrc(NewBoot, NEWBOOT_HEIGHT, NEWBOOT_WIDTH,
+	GXDrawImg(NewBoot, NEWBOOT_HEIGHT, NEWBOOT_WIDTH,
 					(handoverHdrPtr->f_GOP.f_Width - NEWBOOT_WIDTH) / 2,
 					(handoverHdrPtr->f_GOP.f_Height - NEWBOOT_HEIGHT) / 2);
 
-	ToolboxClearRsrc();
+	GXFini();
 
 	BS->GetMemoryMap(SizePtr, Descriptor, MapKey, SzDesc, RevDesc);
 
diff --git a/Boot/Sources/HEL/AMD64/BootPlatform.cxx b/Boot/Sources/HEL/AMD64/BootPlatform.cxx
index 866c4839..66fe2f8d 100644
--- a/Boot/Sources/HEL/AMD64/BootPlatform.cxx
+++ b/Boot/Sources/HEL/AMD64/BootPlatform.cxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
diff --git a/Boot/Sources/HEL/AMD64/BootString.cxx b/Boot/Sources/HEL/AMD64/BootString.cxx
index 54ab2c64..384cef33 100644
--- a/Boot/Sources/HEL/AMD64/BootString.cxx
+++ b/Boot/Sources/HEL/AMD64/BootString.cxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 	File: String.cxx
 	Purpose: NewBoot string library
diff --git a/Boot/Sources/HEL/AMD64/BootTextWriter.cxx b/Boot/Sources/HEL/AMD64/BootTextWriter.cxx
index 90d12f3d..3006591a 100644
--- a/Boot/Sources/HEL/AMD64/BootTextWriter.cxx
+++ b/Boot/Sources/HEL/AMD64/BootTextWriter.cxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 	File: String.cxx
 	Purpose: NewBoot string library
diff --git a/Boot/Sources/HEL/AMD64/New+Delete.cxx b/Boot/Sources/HEL/AMD64/New+Delete.cxx
index 6c025646..647cddb1 100644
--- a/Boot/Sources/HEL/AMD64/New+Delete.cxx
+++ b/Boot/Sources/HEL/AMD64/New+Delete.cxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
diff --git a/Boot/Sources/HEL/AMD64/Support.cxx b/Boot/Sources/HEL/AMD64/Support.cxx
index 22b01280..8ebfb2ff 100644
--- a/Boot/Sources/HEL/AMD64/Support.cxx
+++ b/Boot/Sources/HEL/AMD64/Support.cxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
diff --git a/Boot/Sources/HEL/POWER/CoreBootStartup.S b/Boot/Sources/HEL/POWER/CoreBootStartup.S
index ed39c3b5..e1a186ae 100644
--- a/Boot/Sources/HEL/POWER/CoreBootStartup.S
+++ b/Boot/Sources/HEL/POWER/CoreBootStartup.S
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-    Copyright SoftwareLabs
+    Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
diff --git a/Boot/Sources/HEL/RISCV/BootRISCV.S b/Boot/Sources/HEL/RISCV/BootRISCV.S
index b682d597..2f1e9eb9 100644
--- a/Boot/Sources/HEL/RISCV/BootRISCV.S
+++ b/Boot/Sources/HEL/RISCV/BootRISCV.S
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-    Copyright SoftwareLabs
+    Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
diff --git a/Boot/Sources/Root/SplashScreen.fmt b/Boot/Sources/Root/SplashScreen.fmt
index 42005568..4a851dc1 100644
--- a/Boot/Sources/Root/SplashScreen.fmt
+++ b/Boot/Sources/Root/SplashScreen.fmt
@@ -1,7 +1,7 @@
 ==================================================================
-Welcome to NeWS.
+Welcome to Zeta.
 Brought to you by: Amlal EL Mahrouss.
 * newosldr, newoskrnl: Amlal EL Mahrouss.
-This copy can boot directly to newoskrnl (Unified System).
-Copyright SoftwareLabs, all rights reserved.
+
+Copyright Zeta Electronics Corporation, all rights reserved.
 ==================================================================