From 97f5407670a796ba41e107175f8242abba0c81cc Mon Sep 17 00:00:00 2001 From: Amlal Date: Fri, 25 Apr 2025 08:37:12 +0200 Subject: dev, boot, kernel: improvements, and fixing the VEPM formatter. Signed-off-by: Amlal --- dev/boot/modules/SysChk/SysChk.cc | 17 +++-------------- dev/boot/modules/SysChk/amd64-pio-epm.json | 10 ++++++++-- 2 files changed, 11 insertions(+), 16 deletions(-) (limited to 'dev/boot/modules') diff --git a/dev/boot/modules/SysChk/SysChk.cc b/dev/boot/modules/SysChk/SysChk.cc index 16684666..032c031d 100644 --- a/dev/boot/modules/SysChk/SysChk.cc +++ b/dev/boot/modules/SysChk/SysChk.cc @@ -28,29 +28,18 @@ EXTERN_C Int32 SysChkModuleMain(Kernel::HEL::BootInfoHeader* handover) { - NE_UNUSED(handover); - #if defined(__ATA_PIO__) fw_init_efi((EfiSystemTable*)handover->f_FirmwareCustomTables[1]); Boot::BDiskFormatFactory partition_factory; - if (partition_factory.IsPartitionValid()) - return kEfiFail; - - Boot::BDiskFormatFactory::BFileDescriptor desc{}; - - desc.fFileName[0] = '/'; - desc.fFileName[1] = 0; - desc.fKind = kNeFSCatalogKindDir; - - partition_factory.Format(kMachineModel, &desc, 1); - if (partition_factory.IsPartitionValid()) return kEfiOk; - return kEfiFail; + return partition_factory.Format(kMachineModel) == YES; #else + NE_UNUSED(handover); + return kEfiOk; #endif } diff --git a/dev/boot/modules/SysChk/amd64-pio-epm.json b/dev/boot/modules/SysChk/amd64-pio-epm.json index ccbb7d04..14a804d0 100644 --- a/dev/boot/modules/SysChk/amd64-pio-epm.json +++ b/dev/boot/modules/SysChk/amd64-pio-epm.json @@ -1,7 +1,13 @@ { "compiler_path": "x86_64-w64-mingw32-g++", "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], + "headers_path": [ + "../", + "../../", + "../../../kernel", + "../../../", + "./" + ], "sources_path": [ "*.cc", "*.S", @@ -31,4 +37,4 @@ "kChkVersionLowest=0x0100", "kChkVersion=0x0100" ] -} +} \ No newline at end of file -- cgit v1.2.3