From 76835f023db03aef20c74541fb2a8a9485206cf7 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 1 Sep 2024 15:38:05 +0200 Subject: Added new fields for the OS inside handover header. Signed-off-by: Amlal El Mahrouss --- dev/ZBA/Sources/HEL/AMD64/BootMain.cxx | 42 +++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-) (limited to 'dev/ZBA/Sources/HEL') diff --git a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx index 67b2a478..382cbcd6 100644 --- a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx +++ b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx @@ -149,7 +149,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, CGDrawString("NEWOSLDR (C) ZKA TECHNOLOGIES.", 10, 10, RGB(0xFF, 0xFF, 0xFF)); CGDrawString((cnt_enabled > 1) ? "MULTIPROCESSOR SYSTEM." : "UNIPROCESSOR SYSTEM.", 20, 10, RGB(0xFF, 0xFF, 0xFF)); - handoverHdrPtr->f_MultiProcessingEnabled = cnt_enabled > 1 + handoverHdrPtr->f_HardwareTables.f_MultiProcessingEnabled = cnt_enabled > 1 ; // Fill handover header now. @@ -233,10 +233,13 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, // format the disk. // ---------------------------------------------------- // + handoverHdrPtr->f_FirmwareCustomTables[0] = (VoidPtr)BS; + handoverHdrPtr->f_FirmwareCustomTables[1] = (VoidPtr)ST; + BFileReader readerSysChk(L"syschk.sys", ImageHandle); readerSysChk.ReadAll(0); - Boot::BThread* loaderBootScr = nullptr; + Boot::BThread* loaderSysChk = nullptr; // ------------------------------------------ // // If we succeed in reading the blob, then execute it. @@ -244,11 +247,16 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, if (readerSysChk.Blob()) { - loaderBootScr = new Boot::BThread(readerSysChk.Blob()); - loaderBootScr->SetName("64-bit System Check DLL."); + loaderSysChk = new Boot::BThread(readerSysChk.Blob()); + loaderSysChk->SetName("64-bit System Check DLL."); } - loaderBootScr->Start(handoverHdrPtr); + loaderSysChk->Start(handoverHdrPtr); + + // nullify these fields, to avoid being reused later. + + handoverHdrPtr->f_FirmwareCustomTables[0] = nullptr; + handoverHdrPtr->f_FirmwareCustomTables[1] = nullptr; BFileReader readerKernel(L"newoskrnl.dll", ImageHandle); @@ -264,10 +272,32 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, { loader = new Boot::BThread(readerKernel.Blob()); loader->SetName("64-bit Kernel DLL."); + + handoverHdrPtr->f_KernelImage = readerKernel.Blob(); + } + else + { + CGDrawString("NEWOSLDR: PLEASE RECOVER YOUR NEWOSKRNL KERNEL DLL.", 30, 10, RGB(0xFF, 0xFF, 0xFF)); + } + + BFileReader chimeWav(L"ZKA\\startup.wav", ImageHandle); + BFileReader readerSysDrv(L"ZKA\\startup.sys", ImageHandle); + BFileReader urbanistTTF(L"ZKA\\urbanist.ttf", ImageHandle); + + readerSysDrv.ReadAll(0); + chimeWav.ReadAll(0); + urbanistTTF.ReadAll(0); + + if (readerSysDrv.Blob() && + chimeWav.Blob()) + { + handoverHdrPtr->f_StartupChime = chimeWav.Blob(); + handoverHdrPtr->f_StartupImage = readerKernel.Blob(); + handoverHdrPtr->f_TTFallbackFont = urbanistTTF.Blob(); } else { - CGDrawString("NEWOSLDR: PLEASE RECOVER YOUR NEWOSKRNL INSTALL.", 40, 10, RGB(0xFF, 0xFF, 0xFF)); + CGDrawString("NEWOSLDR: ONE OR MORE SYSTEM COMPONENTS ARE MISSING, PLEASE REINSTALL THE OS.", 30, 10, RGB(0xFF, 0xFF, 0xFF)); } EFI::ExitBootServices(MapKey, ImageHandle); -- cgit v1.2.3