diff options
Diffstat (limited to 'dev/boot/modules/SysChk')
| -rw-r--r-- | dev/boot/modules/SysChk/SysChk.cc | 7 | ||||
| -rw-r--r-- | dev/boot/modules/SysChk/amd64-ahci-epm.json | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/dev/boot/modules/SysChk/SysChk.cc b/dev/boot/modules/SysChk/SysChk.cc index c93ef83b..ea3b1d6f 100644 --- a/dev/boot/modules/SysChk/SysChk.cc +++ b/dev/boot/modules/SysChk/SysChk.cc @@ -16,8 +16,8 @@ #include <KernelKit/MSDOS.h> #include <KernelKit/PE.h> #include <KernelKit/PEF.h> -#include <NewKit/Macros.h> -#include <NewKit/Ref.h> +#include <NeKit/Macros.h> +#include <NeKit/Ref.h> #include <modules/CoreGfx/CoreGfx.h> #include <modules/CoreGfx/TextGfx.h> @@ -27,13 +27,14 @@ #endif // !kMachineModel EXTERN_C Int32 SysChkModuleMain(Kernel::HEL::BootInfoHeader* handover) { - fw_init_efi((EfiSystemTable*) handover->f_FirmwareCustomTables[1]); + fw_init_efi((EfiSystemTable*) handover->f_FirmwareCustomTables[Kernel::HEL::kHandoverTableST]); #if defined(__ATA_PIO__) Boot::BDiskFormatFactory<BootDeviceATA> partition_factory; #elif defined(__AHCI__) Boot::BDiskFormatFactory<BootDeviceSATA> partition_factory; #endif + if (partition_factory.IsPartitionValid()) return kEfiOk; return partition_factory.Format(kMachineModel); diff --git a/dev/boot/modules/SysChk/amd64-ahci-epm.json b/dev/boot/modules/SysChk/amd64-ahci-epm.json index 91c95941..8ce9bfd8 100644 --- a/dev/boot/modules/SysChk/amd64-ahci-epm.json +++ b/dev/boot/modules/SysChk/amd64-ahci-epm.json @@ -14,6 +14,7 @@ "../../../kernel/HALKit/AMD64/PCI/*.cc", "../../../kernel/HALKit/AMD64/Storage/*.cc", "../../../kernel/src/Storage/*.cc", + "../../../kernel/src/Network/*.cc", "../../../kernel/HALKit/AMD64/*.cc", "../../../kernel/HALKit/AMD64/*.s", "../../../kernel/src/*.cc" |