From e2bbec91d70847cc5a2ff67eb84ca4a3c2d03e85 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlalelmahrouss@icloud.com>
Date: Sun, 4 Feb 2024 10:59:24 +0100
Subject: Kernel: Depend less on NewFS, add support for FileSystem protocol in
 NewBoot.

Signed-off-by: Amlal El Mahrouss <amlalelmahrouss@icloud.com>
---
 Private/NewBoot/BootKit/Arch/AHCI.hxx | 10 +---------
 Private/NewBoot/BootKit/BootKit.hxx   |  5 +++--
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'Private/NewBoot/BootKit')

diff --git a/Private/NewBoot/BootKit/Arch/AHCI.hxx b/Private/NewBoot/BootKit/Arch/AHCI.hxx
index 0735baad..1f36ca00 100644
--- a/Private/NewBoot/BootKit/Arch/AHCI.hxx
+++ b/Private/NewBoot/BootKit/Arch/AHCI.hxx
@@ -38,12 +38,4 @@ class BDeviceAHCI final {
   AHCITraits mTraits;
 };
 
-enum {
-  kATADevicePATA,
-  kATADeviceSATA,
-  kATADevicePATA_PI,
-  kATADeviceSATA_PI,
-  kATADeviceCount,
-};
-
-#define kATASectorSz 512
+#define kAHCISectorSz 512
diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx
index 45f54cb4..6fec1724 100644
--- a/Private/NewBoot/BootKit/BootKit.hxx
+++ b/Private/NewBoot/BootKit/BootKit.hxx
@@ -62,9 +62,9 @@ HCore::SizeT BSetMem(CharacterType *src, const CharacterType byte,
 class BFileReader final {
  public:
   explicit BFileReader(const CharacterType *path);
-  ~BFileReader() = default;
+  ~BFileReader();
 
-  HCore::VoidPtr Fetch(SizeT &size);
+  HCore::VoidPtr Fetch(EfiHandlePtr ImageHandle);
 
   enum {
     kOperationOkay,
@@ -83,6 +83,7 @@ class BFileReader final {
 
  private:
   Int32 mErrorCode{kOperationOkay};
+  VoidPtr mBlob{nullptr};
   CharacterType mPath[kPathLen];
   BTextWriter mWriter;
   BDeviceATA mDevice;
-- 
cgit v1.2.3