Revision of Handover: Remove bootloader field.

Signed-off-by: amlal <amlal@el-mahrouss-logic.com>

2 files changed, 8 insertions, 9 deletions

diff --git a/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx b/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
index d59251e6..36702198 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
@@ -18,7 +18,7 @@ Void boot_try_write_partition_map(const Char* namePart, SizeT namePartLength,
   if (namePartLength > kEPMNameLength || !namePart) return;
   if (!ataInterface) return;
 
-  ataInterface->Leak().mBase = kEPMStartPartition;
+  ataInterface->Leak().mBase = 0;
   ataInterface->Leak().mSize = 512;
 
   Char buf[512] = {0};
@@ -27,11 +27,11 @@ Void boot_try_write_partition_map(const Char* namePart, SizeT namePartLength,
 
   BTextWriter writer;
 
-  writer.Write(L"NewBoot.exe: Reading EPM boot block...\r\n");
+  writer.Write(L"NewBoot.exe: Checking for an EPM BootBlock...\r\n");
 
   for (SizeT i = 0; i < kEPMMagicLength; i++) {
     if (buf[i] != kEPMMagic[i]) {
-      writer.Write(L"NewBoot.exe: Writing EPM boot block...\r\n");
+      writer.Write(L"NewBoot.exe: Writing an EPM BootBlock...\r\n");
 
       BootBlockType* bootBlock = (BootBlockType*)buf;
 
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
index 663c33d9..1f0bbc9b 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
@@ -157,10 +157,9 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
 
     if (isIniNotFound) {
       handoverHdrPtr->f_Magic = kHandoverMagic;
-      handoverHdrPtr->f_Version = 0x1011;
-      handoverHdrPtr->f_Bootloader = 0x11;  // Installer
+      handoverHdrPtr->f_Version = kHandoverVersion;
 
-      writer.Write(L"NewBoot.exe: Installing NewKernel and it's components...\r\n");
+      writer.Write(L"NewBoot.exe: Setting up OS...\r\n");
 
       ST->ConOut->ClearScreen(ST->ConOut);
 
@@ -169,15 +168,15 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
       Main(handoverHdrPtr);
     } else {
       handoverHdrPtr->f_Magic = kHandoverMagic;
-      handoverHdrPtr->f_Version = 0x1011;
-      handoverHdrPtr->f_Bootloader = 0xDD;  // System present
+      handoverHdrPtr->f_Version = kHandoverVersion;
 
-      writer.Write(L"NewBoot.exe: Running NewKernel...\r\n");
+      writer.Write(L"NewBoot.exe: Running OS...\r\n");
 
       ST->ConOut->ClearScreen(ST->ConOut);
 
       EFI::ExitBootServices(MapKey, ImageHandle);
 
+      /// TODO: Read catalog and read NewKernel.exe
     }
 
     EFI::Stop();