From 9784f940cf71aef91ccbeb1a11651a83a3eff213 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Mon, 24 Jun 2024 14:33:40 +0200
Subject: IMP: UIAccessibilty class, work in progress Core CoreGraphics (GPU/FB
 SDK).

REFACTOR: Moved Builtins to Modules/

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Boot/BootKit/BootKit.hxx            | 6 +++---
 Boot/BootKit/Device.hxx             | 2 +-
 Boot/BootKit/HW/ATA.hxx             | 2 +-
 Boot/BootKit/HW/SATA.hxx            | 2 +-
 Boot/BootKit/Vendor/Qr.hxx          | 2 +-
 Boot/Sources/HEL/AMD64/BootMain.cxx | 7 ++++---
 6 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'Boot')

diff --git a/Boot/BootKit/BootKit.hxx b/Boot/BootKit/BootKit.hxx
index f24f75b2..a253f137 100644
--- a/Boot/BootKit/BootKit.hxx
+++ b/Boot/BootKit/BootKit.hxx
@@ -26,7 +26,7 @@
 /***********************************************************************************/
 
 #include <NewKit/Defines.hpp>
-#include <Builtins/ATA/ATA.hxx>
+#include <Modules/ATA/ATA.hxx>
 
 #include <FirmwareKit/EFI.hxx>
 
@@ -365,7 +365,7 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const char*							partName,
 
 		BootBlockType* epmBoot = (BootBlockType*)buf;
 
-		constexpr auto cFsName = "NewFS";
+		constexpr auto cFsName	  = "NewFS";
 		constexpr auto cBlockName = "Zeta:";
 
 		CopyMem(reinterpret_cast<VoidPtr>(const_cast<Char*>(cFsName)), epmBoot->Fs, StrLen(cFsName));
@@ -385,7 +385,7 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const char*							partName,
 		fDiskDev.Leak().mSize = sectorSz;
 
 		fDiskDev.Write(buf, sectorSz);
-		
+
 		return true;
 	}
 	else
diff --git a/Boot/BootKit/Device.hxx b/Boot/BootKit/Device.hxx
index d7ac7a74..ca427dc7 100644
--- a/Boot/BootKit/Device.hxx
+++ b/Boot/BootKit/Device.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Builtins/ATA/ATA.hxx>
+#include <Modules/ATA/ATA.hxx>
 
 using namespace NewOS;
 
diff --git a/Boot/BootKit/HW/ATA.hxx b/Boot/BootKit/HW/ATA.hxx
index 6d7c0894..e789a48f 100644
--- a/Boot/BootKit/HW/ATA.hxx
+++ b/Boot/BootKit/HW/ATA.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Builtins/ATA/ATA.hxx>
+#include <Modules/ATA/ATA.hxx>
 #include <BootKit/Device.hxx>
 
 using namespace NewOS;
diff --git a/Boot/BootKit/HW/SATA.hxx b/Boot/BootKit/HW/SATA.hxx
index c4dca4c0..f41879cc 100644
--- a/Boot/BootKit/HW/SATA.hxx
+++ b/Boot/BootKit/HW/SATA.hxx
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <CompilerKit/CompilerKit.hxx>
-#include <Builtins/AHCI/AHCI.hxx>
+#include <Modules/AHCI/AHCI.hxx>
 
 class BootDeviceSATA final
 {
diff --git a/Boot/BootKit/Vendor/Qr.hxx b/Boot/BootKit/Vendor/Qr.hxx
index 7e1e85ed..1cfc214e 100644
--- a/Boot/BootKit/Vendor/Qr.hxx
+++ b/Boot/BootKit/Vendor/Qr.hxx
@@ -9,7 +9,7 @@
 #include <BootKit/Vendor/Shared/bit.h>
 
 #include <BootKit/Vendor/QrPrelude.hxx>
-#include <Builtins/GX/GX>
+#include <Modules/CoreCG/CoreCG.hxx>
 #include <BootKit/Vendor/Support.hxx>
 #include <CompilerKit/Detail.hxx>
 
diff --git a/Boot/Sources/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx
index 6591f61e..c786c16d 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 <Builtins/GX/GX>
+#include <Modules/CoreCG/CoreCG.hxx>
 #include <FirmwareKit/EFI.hxx>
 #include <FirmwareKit/EFI/API.hxx>
 #include <FirmwareKit/Handover.hxx>
@@ -89,10 +89,11 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	/// Splash screen stuff
 
 	writer.Write(L"Zeta Electronics Corporation (R) newosldr: ")
-		.Write(BVersionString::The()).Write("\r");
+		.Write(BVersionString::The())
+		.Write("\r");
 
 #ifndef __DEBUG__
-    writer.Write(L"\rnewosldr: AMD64 is only supported in debug mode.\r");
+	writer.Write(L"\rnewosldr: AMD64 is only supported in debug mode.\r");
 
 	EFI::Stop();
 
-- 
cgit v1.2.3