From e61444f10333631acaebd241b7c7bc35fa7cb2f2 Mon Sep 17 00:00:00 2001
From: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>
Date: Sat, 3 Aug 2024 14:31:58 +0200
Subject: [unstable] [CG] [WIP] text printing.

Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>
---
 Boot/BootKit/Vendor/Qr.hxx          | 2 +-
 Boot/Sources/HEL/AMD64/BootMain.cxx | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'Boot')

diff --git a/Boot/BootKit/Vendor/Qr.hxx b/Boot/BootKit/Vendor/Qr.hxx
index 8799d824..365cd7d1 100644
--- a/Boot/BootKit/Vendor/Qr.hxx
+++ b/Boot/BootKit/Vendor/Qr.hxx
@@ -11,7 +11,7 @@ extern "C" {
 #include <BootKit/Vendor/Shared/bit.h>
 
 #include <BootKit/Vendor/QrPrelude.hxx>
-#include <Modules/CoreCG/CoreCG.hxx>
+#include <Modules/CoreCG/FbRenderer.hxx>
 #include <BootKit/Support.hxx>
 #include <CompilerKit/Detail.hxx>
 
diff --git a/Boot/Sources/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx
index 35565256..efd18ef5 100644
--- a/Boot/Sources/HEL/AMD64/BootMain.cxx
+++ b/Boot/Sources/HEL/AMD64/BootMain.cxx
@@ -6,7 +6,7 @@
 
 #include <BootKit/BootKit.hxx>
 #include <BootKit/Rsrc/NewBoot.rsrc>
-#include <Modules/CoreCG/CoreCG.hxx>
+#include <Modules/CoreCG/FbRenderer.hxx>
 #include <FirmwareKit/EFI.hxx>
 #include <FirmwareKit/EFI/API.hxx>
 #include <FirmwareKit/Handover.hxx>
@@ -16,6 +16,7 @@
 #include <NewKit/Macros.hxx>
 #include <NewKit/Ref.hxx>
 #include <BootKit/ProgramLoader.hxx>
+#include <Modules/CoreCG/TextRenderer.hxx>
 #include <cstring>
 
 // make the compiler shut up.
@@ -202,7 +203,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	// ------------------------------------------ //
 
 	CGInit();
-	CGDrawInRegion(CGColor(0xaa, 0x00, 0x00), handoverHdrPtr->f_GOP.f_Height, handoverHdrPtr->f_GOP.f_Width, 0, 0);
+	CGDrawInRegion(CGColor(0xFF, 0xFF, 0xFF), handoverHdrPtr->f_GOP.f_Height, handoverHdrPtr->f_GOP.f_Width, 0, 0);
 	CGFini();
 
 	// ---------------------------------------------------- //
@@ -240,7 +241,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	if (readerKernel.Blob())
 	{
 		loader = new Boot::ProgramLoader(readerKernel.Blob());
-		loader->SetName("\"newoskrnl.exe\" (64-bit MP)");
+		loader->SetName("\"newoskrnl.exe\" (64-bit SMP)");
 	}
 
 	writer.Write("newosldr: Running: ").Write(loader->GetName()).Write("\r");
@@ -253,6 +254,8 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	// Call kernel.
 	// ---------------------------------------------------- //
 
+	cg_write_text((UInt8*)"NEWOSKRNL", 0, 0, RGB(0x10, 0x10, 0x10));
+
 	loader->Start(handoverHdrPtr);
 
 	EFI::Stop();
-- 
cgit v1.2.3