diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-12-08 04:01:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-08 04:01:32 -0500 |
| commit | f78c535aec66e02584e1b02995dc12c9e1bcb64c (patch) | |
| tree | 8fd8793369c30ddbfb61366407db3d464a95ad6b /src/boot | |
| parent | 1a20507a6ecaa084b61d9b9d686d2e186b683e35 (diff) | |
| parent | e6768dc3b6c7864166211fd6e2f67ff4e5a2cbe5 (diff) | |
Merge pull request #114 from nekernel-org/new-scripts
chore: use `enum struct` instead of `enum class`.
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/src/HEL/AMD64/BootEFI.cc | 12 | ||||
| -rw-r--r-- | src/boot/src/HEL/ARM64/BootEFI.cc | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/boot/src/HEL/AMD64/BootEFI.cc b/src/boot/src/HEL/AMD64/BootEFI.cc index 7558ec62..c043bbb9 100644 --- a/src/boot/src/HEL/AMD64/BootEFI.cc +++ b/src/boot/src/HEL/AMD64/BootEFI.cc @@ -131,18 +131,18 @@ EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr image_handle, EfiSystemTa kHandoverHeader->f_BitMapStart = nullptr; /* Start of bitmap. */ kHandoverHeader->f_BitMapSize = kHandoverBitMapSz; /* Size of bitmap in bytes. */ - UInt16 trials = 5; + UInt16 trials = 15; 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"); + if (trials) { + writer.Write("BootZ: Unable to allocate sufficient memory, trying again...\r"); - trials = 3; - - kHandoverHeader->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */ + if (kHandoverHeader->f_BitMapSize > 0) + kHandoverHeader->f_BitMapSize = + kHandoverHeader->f_BitMapSize / 2; /* Size of bitmap in bytes. */ while (BS->AllocatePool(EfiLoaderData, kHandoverHeader->f_BitMapSize, &kHandoverHeader->f_BitMapStart) != kEfiOk) { diff --git a/src/boot/src/HEL/ARM64/BootEFI.cc b/src/boot/src/HEL/ARM64/BootEFI.cc index 7f4b152c..bdef6549 100644 --- a/src/boot/src/HEL/ARM64/BootEFI.cc +++ b/src/boot/src/HEL/ARM64/BootEFI.cc @@ -130,18 +130,18 @@ EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr image_handle, EfiSystemTa kHandoverHeader->f_BitMapStart = nullptr; /* Start of bitmap. */ kHandoverHeader->f_BitMapSize = kHandoverBitMapSz; /* Size of bitmap in bytes. */ - UInt16 trials = 5; + UInt16 trials = 15; 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"); + if (trials) { + writer.Write("BootZ: Unable to allocate sufficient memory, trying again...\r"); - trials = 3; - - kHandoverHeader->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */ + if (kHandoverHeader->f_BitMapSize > 0) + kHandoverHeader->f_BitMapSize = + kHandoverHeader->f_BitMapSize / 2; /* Size of bitmap in bytes. */ while (BS->AllocatePool(EfiLoaderData, kHandoverHeader->f_BitMapSize, &kHandoverHeader->f_BitMapStart) != kEfiOk) { |