From 2c4b02249ec4355a73b826909ab1889e45871faf Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 31 Aug 2024 10:47:14 +0200 Subject: Saving progress on User scheduler implementation. + Working on RISC-V, ARM64, POWER64 HALs, to be able to distribute mulitple versions of the product. Signed-off-by: Amlal El Mahrouss --- dev/ZBA/Sources/HEL/64X000/Boot64x0.S | 2 +- dev/ZBA/Sources/HEL/AMD64/BootFileReader.cxx | 6 +++--- dev/ZBA/Sources/HEL/AMD64/BootMain.cxx | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'dev/ZBA/Sources') diff --git a/dev/ZBA/Sources/HEL/64X000/Boot64x0.S b/dev/ZBA/Sources/HEL/64X000/Boot64x0.S index 271a3f28..cd9662f2 100644 --- a/dev/ZBA/Sources/HEL/64X000/Boot64x0.S +++ b/dev/ZBA/Sources/HEL/64X000/Boot64x0.S @@ -7,7 +7,7 @@ .section .boot_hdr .align 4 -/* NewBoot boot header begin for a 64x000 kernel. */ +/* NewBoot boot header begin for a 64x000 Kernel. */ boot_hdr_mag: .ascii "CB" diff --git a/dev/ZBA/Sources/HEL/AMD64/BootFileReader.cxx b/dev/ZBA/Sources/HEL/AMD64/BootFileReader.cxx index 5686318b..c8e0bb4e 100644 --- a/dev/ZBA/Sources/HEL/AMD64/BootFileReader.cxx +++ b/dev/ZBA/Sources/HEL/AMD64/BootFileReader.cxx @@ -75,9 +75,9 @@ BFileReader::BFileReader(const CharacterTypeUTF16* path, return; } - EfiFileProtocol* kernelFile = nullptr; + EfiFileProtocol* KernelFile = nullptr; - if (mRootFs->Open(mRootFs, &kernelFile, mPath, kEFIFileRead, kEFIReadOnly) != + if (mRootFs->Open(mRootFs, &KernelFile, mPath, kEFIFileRead, kEFIReadOnly) != kEfiOk) { mWriter.Write(L"newosldr: Fetch-Protocol: No-Such-Path: ") @@ -91,7 +91,7 @@ BFileReader::BFileReader(const CharacterTypeUTF16* path, } mSizeFile = 0; - mFile = kernelFile; + mFile = KernelFile; mErrorCode = kOperationOkay; } diff --git a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx index 824cee06..330dc96a 100644 --- a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx +++ b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx @@ -189,9 +189,9 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, handoverHdrPtr->f_VirtualStart = (VoidPtr)Descriptor[cDefaultMemoryMap].VirtualStart; - handoverHdrPtr->f_HeapStart = nullptr; + handoverHdrPtr->f_HeapStart = 0; - while (BS->AllocatePool(EfiLoaderCode, kHandoverHeapSz, &handoverHdrPtr->f_HeapStart) != kEfiOk) + while (BS->AllocatePool(EfiRuntimeServicesCode, kHandoverHeapSz, &handoverHdrPtr->f_HeapStart) != kEfiOk) ; handoverHdrPtr->f_VirtualSize = @@ -268,7 +268,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, EFI::ExitBootServices(MapKey, ImageHandle); // ---------------------------------------------------- // - // finally load kernel. + // finally load Kernel. // ---------------------------------------------------- // loader->Start(handoverHdrPtr); -- cgit v1.2.3