From bb1d9fa4b7b2c680ed3c0ca16c060dd991bda16f Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Tue, 22 Apr 2025 22:39:01 +0200 Subject: dev, boot: fixed nasty bugs inside bootloader. Signed-off-by: Amlal El Mahrouss --- dev/boot/modules/SysChk/SysChk.cc | 6 +----- dev/boot/modules/SysChk/amd64-ahci-epm.json | 11 ++++++++++- dev/boot/modules/SysChk/amd64-ahci-gpt.json | 11 ++++++++++- dev/boot/modules/SysChk/amd64-pio-epm.json | 11 ++++++++++- dev/boot/modules/SysChk/amd64-pio-gpt.json | 21 ++++++++++++++++++--- 5 files changed, 49 insertions(+), 11 deletions(-) (limited to 'dev/boot/modules') diff --git a/dev/boot/modules/SysChk/SysChk.cc b/dev/boot/modules/SysChk/SysChk.cc index 9bdeb38d..16684666 100644 --- a/dev/boot/modules/SysChk/SysChk.cc +++ b/dev/boot/modules/SysChk/SysChk.cc @@ -33,12 +33,10 @@ EXTERN_C Int32 SysChkModuleMain(Kernel::HEL::BootInfoHeader* handover) #if defined(__ATA_PIO__) fw_init_efi((EfiSystemTable*)handover->f_FirmwareCustomTables[1]); - Boot::BootTextWriter writer; - Boot::BDiskFormatFactory partition_factory; if (partition_factory.IsPartitionValid()) - return kEfiOk; + return kEfiFail; Boot::BDiskFormatFactory::BFileDescriptor desc{}; @@ -48,8 +46,6 @@ EXTERN_C Int32 SysChkModuleMain(Kernel::HEL::BootInfoHeader* handover) partition_factory.Format(kMachineModel, &desc, 1); - writer.Write(L"BootZ: Partition formatted.\r"); - if (partition_factory.IsPartitionValid()) return kEfiOk; diff --git a/dev/boot/modules/SysChk/amd64-ahci-epm.json b/dev/boot/modules/SysChk/amd64-ahci-epm.json index 5cff74de..1a82cf55 100644 --- a/dev/boot/modules/SysChk/amd64-ahci-epm.json +++ b/dev/boot/modules/SysChk/amd64-ahci-epm.json @@ -2,7 +2,16 @@ "compiler_path": "x86_64-w64-mingw32-g++", "compiler_std": "c++20", "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], - "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"], + "sources_path": [ + "*.cc", + "*.S", + "../../src/HEL/AMD64/BootSATA.cc", + "../../src/HEL/AMD64/BootPlatform.cc", + "../../src/HEL/AMD64/BootAPI.S", + "../../src/BootTextWriter.cc", + "../../src/BootSupport.cc", + "../../src/New+Delete.cc" + ], "output_name": "chk.efi", "compiler_flags": [ "-nostdlib", diff --git a/dev/boot/modules/SysChk/amd64-ahci-gpt.json b/dev/boot/modules/SysChk/amd64-ahci-gpt.json index 6a204a25..cb538eed 100644 --- a/dev/boot/modules/SysChk/amd64-ahci-gpt.json +++ b/dev/boot/modules/SysChk/amd64-ahci-gpt.json @@ -2,7 +2,16 @@ "compiler_path": "x86_64-w64-mingw32-g++", "compiler_std": "c++20", "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], - "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"], + "sources_path": [ + "*.cc", + "*.S", + "../../src/HEL/AMD64/BootSATA.cc", + "../../src/HEL/AMD64/BootPlatform.cc", + "../../src/HEL/AMD64/BootAPI.S", + "../../src/BootTextWriter.cc", + "../../src/BootSupport.cc", + "../../src/New+Delete.cc" + ], "output_name": "chk.efi", "compiler_flags": [ "-nostdlib", diff --git a/dev/boot/modules/SysChk/amd64-pio-epm.json b/dev/boot/modules/SysChk/amd64-pio-epm.json index 3848a611..ccbb7d04 100644 --- a/dev/boot/modules/SysChk/amd64-pio-epm.json +++ b/dev/boot/modules/SysChk/amd64-pio-epm.json @@ -2,7 +2,16 @@ "compiler_path": "x86_64-w64-mingw32-g++", "compiler_std": "c++20", "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], - "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"], + "sources_path": [ + "*.cc", + "*.S", + "../../src/HEL/AMD64/BootATA.cc", + "../../src/HEL/AMD64/BootPlatform.cc", + "../../src/HEL/AMD64/BootAPI.S", + "../../src/BootTextWriter.cc", + "../../src/BootSupport.cc", + "../../src/New+Delete.cc" + ], "output_name": "chk.efi", "compiler_flags": [ "-nostdlib", diff --git a/dev/boot/modules/SysChk/amd64-pio-gpt.json b/dev/boot/modules/SysChk/amd64-pio-gpt.json index 4fe9d986..21c81667 100644 --- a/dev/boot/modules/SysChk/amd64-pio-gpt.json +++ b/dev/boot/modules/SysChk/amd64-pio-gpt.json @@ -1,8 +1,23 @@ { "compiler_path": "x86_64-w64-mingw32-g++", "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], - "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"], + "headers_path": [ + "../", + "../../", + "../../../kernel", + "../../../", + "./" + ], + "sources_path": [ + "*.cc", + "*.S", + "../../src/HEL/AMD64/BootATA.cc", + "../../src/HEL/AMD64/BootPlatform.cc", + "../../src/HEL/AMD64/BootAPI.S", + "../../src/BootTextWriter.cc", + "../../src/BootSupport.cc", + "../../src/New+Delete.cc" + ], "output_name": "chk.efi", "compiler_flags": [ "-nostdlib", @@ -23,4 +38,4 @@ "kChkVersionLowest=0x0100", "kChkVersion=0x0100" ] -} +} \ No newline at end of file -- cgit v1.2.3