diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-11-21 10:19:17 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-11-21 10:19:17 +0100 |
| commit | dc008570233d0dbfac32eb87367b7e4a08302e32 (patch) | |
| tree | 37e3282f17e41297f35d0de9b8248120e3a4e855 /dev/ZBAKit | |
| parent | 6ed8a39c1bd3083297b41e981a2bf4bdbe2abd1f (diff) | |
META: 10:00 AM bump.
Diffstat (limited to 'dev/ZBAKit')
| -rw-r--r-- | dev/ZBAKit/BootKit/Thread.h | 4 | ||||
| -rw-r--r-- | dev/ZBAKit/Modules/NetBoot/Module.cc | 2 | ||||
| -rw-r--r-- | dev/ZBAKit/Modules/SysChk/Module.cc | 2 | ||||
| -rw-r--r-- | dev/ZBAKit/src/BootThread.cc | 6 | ||||
| -rw-r--r-- | dev/ZBAKit/src/HEL/AMD64/BootMain.cc | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/dev/ZBAKit/BootKit/Thread.h b/dev/ZBAKit/BootKit/Thread.h index e7c6763f..4517e600 100644 --- a/dev/ZBAKit/BootKit/Thread.h +++ b/dev/ZBAKit/BootKit/Thread.h @@ -29,7 +29,7 @@ namespace Boot BThread& operator=(const BThread&) = default; BThread(const BThread&) = default; - void Start(HEL::HANDOVER_INFO_HEADER* handover, BOOL is_own_stack); + void Start(HEL::BootInfoHeader* handover, BOOL is_own_stack); void SetName(const char* name); const char* GetName(); bool IsValid(); @@ -39,6 +39,6 @@ namespace Boot VoidPtr fStartAddress{nullptr}; VoidPtr fBlob{nullptr}; UInt8* fStack{nullptr}; - HEL::HANDOVER_INFO_HEADER* fHandover{nullptr}; + HEL::BootInfoHeader* fHandover{nullptr}; }; } // namespace Boot diff --git a/dev/ZBAKit/Modules/NetBoot/Module.cc b/dev/ZBAKit/Modules/NetBoot/Module.cc index 0d6f8c2d..90c893a7 100644 --- a/dev/ZBAKit/Modules/NetBoot/Module.cc +++ b/dev/ZBAKit/Modules/NetBoot/Module.cc @@ -10,7 +10,7 @@ #include <NetBoot.h> #include <BootKit/BootKit.h> -EXTERN_C Int32 main(Kernel::HEL::HANDOVER_INFO_HEADER* Handover) +EXTERN_C Int32 main(Kernel::HEL::BootInfoHeader* Handover) { return kEfiOk; } diff --git a/dev/ZBAKit/Modules/SysChk/Module.cc b/dev/ZBAKit/Modules/SysChk/Module.cc index 413d936e..d5607cbb 100644 --- a/dev/ZBAKit/Modules/SysChk/Module.cc +++ b/dev/ZBAKit/Modules/SysChk/Module.cc @@ -9,7 +9,7 @@ #include <BootKit/BootKit.h> -EXTERN_C Int32 ModuleMain(Kernel::HEL::HANDOVER_INFO_HEADER* Handover) +EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* Handover) { EfiSystemTable* system_table = (EfiSystemTable*)Handover->f_FirmwareCustomTables[1]; diff --git a/dev/ZBAKit/src/BootThread.cc b/dev/ZBAKit/src/BootThread.cc index 6ce14877..3f74c376 100644 --- a/dev/ZBAKit/src/BootThread.cc +++ b/dev/ZBAKit/src/BootThread.cc @@ -22,7 +22,7 @@ EXTERN EfiBootServices* BS; namespace Boot { - EXTERN_C Void rt_jump_to_address(VoidPtr code, HEL::HANDOVER_INFO_HEADER* handover, UInt8* stack); + EXTERN_C Void rt_jump_to_address(VoidPtr code, HEL::BootInfoHeader* handover, UInt8* stack); BThread::BThread(VoidPtr blob) : fBlob(blob), fStartAddress(nullptr) @@ -167,9 +167,9 @@ namespace Boot } /// @note handover header has to be valid! - Void BThread::Start(HEL::HANDOVER_INFO_HEADER* handover, Bool own_stack) + Void BThread::Start(HEL::BootInfoHeader* handover, Bool own_stack) { - HEL::HandoverProc err_fn = [](HEL::HANDOVER_INFO_HEADER* rcx) -> void { + HEL::HandoverProc err_fn = [](HEL::BootInfoHeader* rcx) -> void { CGDrawString("ZBA: INVALID IMAGE! ABORTING...", 50, 10, RGB(0xFF, 0xFF, 0xFF)); ::EFI::Stop(); }; diff --git a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc index 404d8e3b..9d3da690 100644 --- a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc +++ b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc @@ -86,8 +86,8 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, { InitEFI(SystemTable); ///! Init the EFI library. - HEL::HANDOVER_INFO_HEADER* handover_hdr = - new HEL::HANDOVER_INFO_HEADER(); + HEL::BootInfoHeader* handover_hdr = + new HEL::BootInfoHeader(); UInt32 map_key = 0; UInt32 size_struct_ptr = sizeof(EfiMemoryDescriptor); |