fix: better allocation system in BootZ (aarch, amd64)

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

1 files changed, 10 insertions, 10 deletions

diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc
index 166e0169..24bee2dd 100644
--- a/dev/boot/src/HEL/AMD64/BootEFI.cc
+++ b/dev/boot/src/HEL/AMD64/BootEFI.cc
@@ -128,28 +128,28 @@ EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr image_handle, EfiSystemTa
   handover_hdr->f_BitMapStart = nullptr;           /* Start of bitmap. */
   handover_hdr->f_BitMapSize  = kHandoverBitMapSz; /* Size of bitmap in bytes. */
 
-  Int32 trials = 5 * 10000000;
+  kHandoverHeader->f_BitMapStart = nullptr;           /* Start of bitmap. */
+  kHandoverHeader->f_BitMapSize  = kHandoverBitMapSz; /* Size of bitmap in bytes. */
 
-  writer.Write("BootZ: Welcome to BootZ.\r");
-  writer.Write("BootZ: Allocating sufficient memory, trying 4GB...\r");
+  UInt16 trials = 5;
 
-  while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize,
-                          &handover_hdr->f_BitMapStart) != kEfiOk) {
+  while (BS->AllocatePool(EfiLoaderData, kHandoverHeader->f_BitMapSize,
+                          &kHandoverHeader->f_BitMapStart) != kEfiOk) {
     --trials;
 
     if (!trials) {
       writer.Write("BootZ: Unable to allocate sufficient memory, trying again with 2GB...\r");
 
-      trials = 3 * 10000000;
+      trials = 3;
 
-      handover_hdr->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */
+      kHandoverHeader->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */
 
-      while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize,
-                              &handover_hdr->f_BitMapStart) != kEfiOk) {
+      while (BS->AllocatePool(EfiLoaderData, kHandoverHeader->f_BitMapSize,
+                              &kHandoverHeader->f_BitMapStart) != kEfiOk) {
         --trials;
 
         if (!trials) {
-          writer.Write("BootZ: Unable to allocate sufficent memory, aborting...\r");
+          writer.Write("BootZ: Unable to allocate sufficient memory, aborting...\r");
           Boot::Stop();
         }
       }