diff options
Diffstat (limited to 'dev/ZBAKit')
| -rw-r--r-- | dev/ZBAKit/BootKit/BootKit.h | 10 | ||||
| -rw-r--r-- | dev/ZBAKit/Modules/NetBoot/Boot.S | 2 | ||||
| -rw-r--r-- | dev/ZBAKit/Modules/SysChk/Boot.S | 2 | ||||
| -rw-r--r-- | dev/ZBAKit/amd64-efi.make | 2 | ||||
| -rw-r--r-- | dev/ZBAKit/src/HEL/AMD64/BootMain.cc | 12 | ||||
| -rw-r--r-- | dev/ZBAKit/src/HEL/AMD64/BootSATA.cc (renamed from dev/ZBAKit/src/HEL/AMD64/BootAHCI.cc) | 0 |
6 files changed, 15 insertions, 13 deletions
diff --git a/dev/ZBAKit/BootKit/BootKit.h b/dev/ZBAKit/BootKit/BootKit.h index 3d2e3c0f..e1825570 100644 --- a/dev/ZBAKit/BootKit/BootKit.h +++ b/dev/ZBAKit/BootKit/BootKit.h @@ -209,10 +209,10 @@ namespace Boot ZKA_COPY_DELETE(BDiskFormatFactory); - /// @brief Format disk. - /// @param Partition Name - /// @param Blobs. - /// @param Number of blobs. + /// @brief Format disk using partition name and fileBlobs. + /// @param Partition partName the target partition name. + /// @param fileBlobs blobs array. + /// @param blobCount blobs array count. /// @retval True disk has been formatted. /// @retval False failed to format. Boolean Format(const Char* partName, BFileDescriptor* fileBlobs, SizeT blobCount); @@ -377,7 +377,7 @@ namespace Boot } else { - EFI::ThrowError(L"Filesystem-Failure-Part", L"Filesystem couldn't be partitioned."); + EFI::ThrowError(L"Filesystem-Failure-Part", L"Filesystem couldn't be partitioned, this drive cannot be formatted as an explicit partition map."); } return false; diff --git a/dev/ZBAKit/Modules/NetBoot/Boot.S b/dev/ZBAKit/Modules/NetBoot/Boot.S index ec17f347..1c4a8f69 100644 --- a/dev/ZBAKit/Modules/NetBoot/Boot.S +++ b/dev/ZBAKit/Modules/NetBoot/Boot.S @@ -1,7 +1,7 @@ ;; /* ;; * ======================================================== ;; * -;; * ZKA +;; * ZBA ;; * Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved., all rights reserved. ;; * ;; * ======================================================== diff --git a/dev/ZBAKit/Modules/SysChk/Boot.S b/dev/ZBAKit/Modules/SysChk/Boot.S index 08bd332a..b7df05a9 100644 --- a/dev/ZBAKit/Modules/SysChk/Boot.S +++ b/dev/ZBAKit/Modules/SysChk/Boot.S @@ -1,7 +1,7 @@ ;; /* ;; * ======================================================== ;; * -;; * ZKA +;; * ZBA ;; * Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved., all rights reserved. ;; * ;; * ======================================================== diff --git a/dev/ZBAKit/amd64-efi.make b/dev/ZBAKit/amd64-efi.make index 4c14da25..1121060f 100644 --- a/dev/ZBAKit/amd64-efi.make +++ b/dev/ZBAKit/amd64-efi.make @@ -53,6 +53,7 @@ BOOTLOADER=zbaosldr.exe KERNEL=minoskrnl.exe SYSCHK=syschk.sys STARTUP=startup.sys +SCIKIT=SCIKit.dylib .PHONY: invalid-recipe invalid-recipe: @@ -67,6 +68,7 @@ all: compile-amd64 $(COPY) src/$(BOOTLOADER) src/Root/EFI/BOOT/ZBAOSLDR.EFI $(COPY) ../ZKAKit/$(KERNEL) src/Root/$(KERNEL) $(COPY) ./Modules/SysChk/$(SYSCHK) src/Root/$(SYSCHK) + $(COPY) ../SCIKit/$(SCIKIT) src/Root/$(SCIKIT) $(COPY) src/$(BOOTLOADER) src/Root/$(BOOTLOADER) ifneq ($(DEBUG_SUPPORT), ) diff --git a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc index ac06ee71..7bd861b1 100644 --- a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc +++ b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc @@ -173,7 +173,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, #ifdef ZKA_AUTO_FORMAT if (!partition_factory.IsPartitionValid()) { - CGDrawString("FORMATTING EPM DISK...", 20, 10, RGB(0xFF, 0xFF, 0xFF)); + CGDrawString("Formatting EPM disk...", 20, 10, RGB(0xFF, 0xFF, 0xFF)); Boot::BDiskFormatFactory<BootDeviceATA>::BFileDescriptor root; root.fFileName[0] = kNeFSRoot[0]; @@ -187,7 +187,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, } else { - CGDrawString("BOOTING FROM EPM DISK...", 20, 10, RGB(0xFF, 0xFF, 0xFF)); + CGDrawString("Booting from EPM disk...", 20, 10, RGB(0xFF, 0xFF, 0xFF)); } #endif // ZKA_AUTO_FORMAT @@ -243,7 +243,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, if (reader_syschk.Blob()) { syschk_thread = new Boot::BThread(reader_syschk.Blob()); - syschk_thread->SetName("System Check (ZBA Driver)"); + syschk_thread->SetName("System Check (ZBA EFI Driver)"); } syschk_thread->Start(handover_hdr); @@ -287,7 +287,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, else { #ifdef ZBA_USE_FB - CGDrawString("ZBA: PLEASE RECOVER YOUR KERNEL IMAGE.", 30, 10, RGB(0xFF, 0xFF, 0xFF)); + CGDrawString("ZBA: Please recover your kernel image.", 30, 10, RGB(0xFF, 0xFF, 0xFF)); #endif // ZBA_USE_FB EFI::Stop(); @@ -312,7 +312,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, else { #ifdef ZBA_USE_FB - CGDrawString("ZBA: ONE OR MORE SYSTEM COMPONENTS ARE MISSING, PLEASE REINSTALL THE OS.", 30, 10, RGB(0xFF, 0xFF, 0xFF)); + CGDrawString("ZBA: OS resources are not present, please reinstall the OS.", 30, 10, RGB(0xFF, 0xFF, 0xFF)); #endif // ZBA_USE_FB EFI::Stop(); @@ -321,7 +321,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, EFI::ExitBootServices(map_key, ImageHandle); // ---------------------------------------------------- // - // Finally load the operating system kernel. + // Finally load the OS kernel. // ---------------------------------------------------- // kernel_thread->Start(handover_hdr); diff --git a/dev/ZBAKit/src/HEL/AMD64/BootAHCI.cc b/dev/ZBAKit/src/HEL/AMD64/BootSATA.cc index 765870b0..765870b0 100644 --- a/dev/ZBAKit/src/HEL/AMD64/BootAHCI.cc +++ b/dev/ZBAKit/src/HEL/AMD64/BootSATA.cc |