From 460999b964114f98b219ec3488bd32ad9236332b Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 6 Apr 2025 08:03:27 +0200 Subject: adding an align function designed for AHCI's needs and drivemgr's AHCI detection system. Signed-off-by: Amlal El Mahrouss --- dev/boot/amd64-ci.make | 2 +- dev/boot/src/HEL/AMD64/BootEFI.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'dev/boot') diff --git a/dev/boot/amd64-ci.make b/dev/boot/amd64-ci.make index 3c7c6527..bdb4545f 100644 --- a/dev/boot/amd64-ci.make +++ b/dev/boot/amd64-ci.make @@ -49,7 +49,7 @@ DEBUG_MACRO = -D__DEBUG__ endif ifeq ($(shell uname), Darwin) -EMU_FLAGS=-M q35 -smp 4 -m 8G \ +EMU_FLAGS=-M q35 -smp 4 -m 8G \ -bios $(BIOS) -cdrom $(BOOT) -boot d endif diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc index ef9af9ca..2cc71367 100644 --- a/dev/boot/src/HEL/AMD64/BootEFI.cc +++ b/dev/boot/src/HEL/AMD64/BootEFI.cc @@ -220,7 +220,7 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr image_handle, // Update handover file specific table and phyiscal start field. //-------------------------------------------------------------// - handover_hdr->f_BitMapStart = (VoidPtr)struct_ptr[lookup_index].VirtualStart; /* Start of bitmap. */ + handover_hdr->f_BitMapStart = (VoidPtr)(struct_ptr[lookup_index].VirtualStart); /* Start of bitmap. */ handover_hdr->f_BitMapSize = struct_ptr[lookup_index].NumberOfPages * kib_cast(4); /* Size of bitmap in bytes. */ handover_hdr->f_FirmwareCustomTables[0] = (VoidPtr)BS; -- cgit v1.2.3 From 9221d14e2be7f00327325545c0c9aa2f355b8cfe Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Mon, 7 Apr 2025 14:59:52 +0200 Subject: boot/syschk: waive requirement for ATA PIO. Signed-off-by: Amlal El Mahrouss --- dev/boot/src/HEL/AMD64/BootEFI.cc | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'dev/boot') diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc index 2cc71367..bd1c7860 100644 --- a/dev/boot/src/HEL/AMD64/BootEFI.cc +++ b/dev/boot/src/HEL/AMD64/BootEFI.cc @@ -230,7 +230,6 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr image_handle, // If we succeed in reading the blob, then execute it. // ------------------------------------------ // -#if defined(__ATA_PIO__) Boot::BootFileReader reader_syschk(L"chk.efi", image_handle); reader_syschk.ReadAll(0); @@ -241,34 +240,17 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr image_handle, syschk_thread = new Boot::BootThread(reader_syschk.Blob()); syschk_thread->SetName("BootZ: System Check"); - Boot::BDiskFormatFactory partition_factory; - if (syschk_thread->Start(handover_hdr, NO) != kEfiOk) { - if (partition_factory.IsPartitionValid() == NO) - { - Boot::BDiskFormatFactory::BFileDescriptor root{}; - - root.fFileName[0] = kNeFSRoot[0]; - root.fFileName[1] = 0; - - root.fKind = kNeFSCatalogKindDir; - - const auto kFSName = "SSD"; + fb_init(); - partition_factory.Format(kFSName, &root, 1); + FB::fb_clear_video(); - fb_init(); + FBDrawBitMapInRegion(zka_has_disk, NE_HAS_DISK_WIDTH, NE_HAS_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_HAS_DISK_HEIGHT) / 2); - FB::fb_clear_video(); - - FBDrawBitMapInRegion(zka_has_disk, NE_HAS_DISK_WIDTH, NE_HAS_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_HAS_DISK_HEIGHT) / 2); - - fb_clear(); - } + fb_clear(); } } -#endif // ------------------------------------------ // // null these fields, to avoid being reused later. -- cgit v1.2.3 From 90ce590ce04aaeed48fb89d3ae58f2aa741176d4 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Mon, 7 Apr 2025 22:36:12 +0200 Subject: modules, BootNet: comment wrongfully mentioned 'address'. - Mentioned 'packet' instead of 'address' Signed-off-by: Amlal El Mahrouss --- dev/boot/modules/BootNet/BootNet.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dev/boot') diff --git a/dev/boot/modules/BootNet/BootNet.cc b/dev/boot/modules/BootNet/BootNet.cc index 47129d38..284b3442 100644 --- a/dev/boot/modules/BootNet/BootNet.cc +++ b/dev/boot/modules/BootNet/BootNet.cc @@ -23,7 +23,7 @@ EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover) memset(&inet, 0, sizeof(BOOTNET_INTERNET_HEADER)); - /// TODO: Read packet from JSON file 'bootnet.json' + /// TODO: Read address from JSON file 'bootnet.json' if (inet.Length < 1) { -- cgit v1.2.3