diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-04-08 10:19:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-08 10:19:56 +0200 |
| commit | 29828ef52df7a51e22057b4557b8d9a3d5550839 (patch) | |
| tree | 8f809bcf67e1c77beae47bce71877bd546db5146 /dev/boot | |
| parent | b18c5e09961d8bc0b2368176d9fb23789afebb87 (diff) | |
| parent | 1f6dd86d548ec8194c79bd9e2a8b27991061cd9e (diff) | |
Merge pull request #12 from amlel-el-mahrouss/dev
pr/ahci: generic driver improvements.
Diffstat (limited to 'dev/boot')
| -rw-r--r-- | dev/boot/amd64-ci.make | 2 | ||||
| -rw-r--r-- | dev/boot/modules/BootNet/BootNet.cc | 2 | ||||
| -rw-r--r-- | dev/boot/src/HEL/AMD64/BootEFI.cc | 28 |
3 files changed, 7 insertions, 25 deletions
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/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) { diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc index ef9af9ca..bd1c7860 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; @@ -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<BootDeviceATA> partition_factory; - if (syschk_thread->Start(handover_hdr, NO) != kEfiOk) { - if (partition_factory.IsPartitionValid() == NO) - { - Boot::BDiskFormatFactory<BootDeviceATA>::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. |