diff options
| author | Amlal <amlal.elmahrouss@icloud.com> | 2024-10-26 19:49:02 +0200 |
|---|---|---|
| committer | Amlal <amlal.elmahrouss@icloud.com> | 2024-10-26 19:49:02 +0200 |
| commit | 6dcf5b87da65de2254d6102f567183eaeca03088 (patch) | |
| tree | b281ecd4cf0bcd60eaa476979f4f2183b0f4d04d /dev/zba | |
| parent | 88b5be35623fb573cfa0d53cfc407ae1005ccad9 (diff) | |
IMP: This commit contains fixes and improvements regarding the kernel, a next one will be done soon.
Signed-off-by: Amlal <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/zba')
| -rw-r--r-- | dev/zba/Modules/SysChk/build.json | 2 | ||||
| -rw-r--r-- | dev/zba/amd64-efi.make | 2 | ||||
| -rw-r--r-- | dev/zba/src/HEL/AMD64/BootMain.cc | 27 |
3 files changed, 13 insertions, 18 deletions
diff --git a/dev/zba/Modules/SysChk/build.json b/dev/zba/Modules/SysChk/build.json index 7587d0a2..299b0acf 100644 --- a/dev/zba/Modules/SysChk/build.json +++ b/dev/zba/Modules/SysChk/build.json @@ -2,7 +2,7 @@ "compiler_path": "x86_64-w64-mingw32-g++", "compiler_std": "c++20", "headers_path": ["../", "../../", "../../../zka", "../../../", "./"], - "sources_path": [".cc", "*.S"], + "sources_path": ["*.cc", "*.S"], "output_name": "syschk.sys", "compiler_flags": [ "-ffreestanding", diff --git a/dev/zba/amd64-efi.make b/dev/zba/amd64-efi.make index 4c3e56dc..21ee5f96 100644 --- a/dev/zba/amd64-efi.make +++ b/dev/zba/amd64-efi.make @@ -66,8 +66,6 @@ all: compile-amd64 $(COPY) src/$(BOOTLOADER) src/Root/EFI/BOOT/ZBAOSLDR.EFI $(COPY) ../zka/$(KERNEL) src/Root/$(KERNEL) $(COPY) ./Modules/SysChk/$(SYSCHK) src/Root/$(SYSCHK) - $(COPY) ./Modules/SysChk/$(STARTUP) src/Root/zka/$(STARTUP) - $(COPY) ../crt/$(CRT) src/Root/$(CRT) $(COPY) src/$(BOOTLOADER) src/Root/$(BOOTLOADER) ifneq ($(DEBUG_SUPPORT), ) diff --git a/dev/zba/src/HEL/AMD64/BootMain.cc b/dev/zba/src/HEL/AMD64/BootMain.cc index 9924450e..8666353e 100644 --- a/dev/zba/src/HEL/AMD64/BootMain.cc +++ b/dev/zba/src/HEL/AMD64/BootMain.cc @@ -167,6 +167,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, // format the disk. // ---------------------------------------------------- // +#ifdef __ZKA_AUTO_FORMAT__ if (!partition_factory.IsPartitionValid()) { Boot::BDiskFormatFactory<BootDeviceATA>::BFileDescriptor root; @@ -179,6 +180,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, rt_reset_hardware(); } +#endif // __ZKA_AUTO_FORMAT__ BS->GetMemoryMap(&size_struct_ptr, struct_ptr, &map_key, &sz_desc, &rev_desc); @@ -280,26 +282,21 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, #endif // __ZKA_USE_FB__ } - Boot::BFileReader chimeWav(L"zka\\startup.wav", ImageHandle); - Boot::BFileReader readerSysDrv(L"zka\\startup.sys", ImageHandle); - Boot::BFileReader urbanistTTF(L"zka\\urbanist.ttf", ImageHandle); + Boot::BFileReader chime_wav(L"zka\\startup.wav", ImageHandle); + Boot::BFileReader ttf_font(L"zka\\urbanist.ttf", ImageHandle); - readerSysDrv.ReadAll(0); - chimeWav.ReadAll(0); - urbanistTTF.ReadAll(0); + chime_wav.ReadAll(0); + ttf_font.ReadAll(0); - if (readerSysDrv.Blob() && - chimeWav.Blob() && - urbanistTTF.Blob()) + if (chime_wav.Blob() && + ttf_font.Blob()) { - handover_hdr->f_StartupChime = chimeWav.Blob(); - handover_hdr->f_ChimeSz = chimeWav.Size(); - handover_hdr->f_StartupImage = readerSysDrv.Blob(); - handover_hdr->f_StartupSz = readerSysDrv.Size(); + handover_hdr->f_StartupChime = chime_wav.Blob(); + handover_hdr->f_ChimeSz = chime_wav.Size(); handover_hdr->f_KernelImage = reader_kernel.Blob(); handover_hdr->f_KernelSz = reader_kernel.Size(); - handover_hdr->f_TTFallbackFont = urbanistTTF.Blob(); - handover_hdr->f_FontSz = urbanistTTF.Size(); + handover_hdr->f_TTFallbackFont = ttf_font.Blob(); + handover_hdr->f_FontSz = ttf_font.Size(); } else { |