From e50f871e6852beacb53986f930ed2d5dead84838 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal@nekernel.org>
Date: Thu, 10 Apr 2025 09:41:33 +0200
Subject: kernel, boot: a lot of improvements regarding memory probing.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
---
 dev/boot/modules/SysChk/SysChk.cc       |  6 +++---
 dev/boot/modules/SysChk/amd64-ahci.json | 25 +++++++++++++++++++++++++
 dev/boot/modules/SysChk/amd64-pio.json  | 25 +++++++++++++++++++++++++
 dev/boot/modules/SysChk/amd64.json      | 24 ------------------------
 4 files changed, 53 insertions(+), 27 deletions(-)
 create mode 100644 dev/boot/modules/SysChk/amd64-ahci.json
 create mode 100644 dev/boot/modules/SysChk/amd64-pio.json
 delete mode 100644 dev/boot/modules/SysChk/amd64.json

(limited to 'dev/boot/modules/SysChk')

diff --git a/dev/boot/modules/SysChk/SysChk.cc b/dev/boot/modules/SysChk/SysChk.cc
index ed14d2cd..3086cdc6 100644
--- a/dev/boot/modules/SysChk/SysChk.cc
+++ b/dev/boot/modules/SysChk/SysChk.cc
@@ -23,12 +23,12 @@
 
 // Makes the compiler shut up.
 #ifndef kMachineModel
-#define kMachineModel "NeKrnl"
+#define kMachineModel "Ne"
 #endif // !kMachineModel
 
 EXTERN_C Int32 SysChkModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
-#ifdef __NE_AMD64__
+#ifdef __ATA_PIO__
 	Boot::BDiskFormatFactory<BootDeviceATA> partition_factory;
 
 	if (partition_factory.IsPartitionValid())
@@ -40,7 +40,7 @@ EXTERN_C Int32 SysChkModuleMain(Kernel::HEL::BootInfoHeader* handover)
 	desc.fFileName[1] = 0;
 	desc.fKind		  = kNeFSCatalogKindDir;
 
-	partition_factory.Format(kMachineModel, &desc, sizeof(Boot::BDiskFormatFactory<BootDeviceATA>::BFileDescriptor));
+	partition_factory.Format(kMachineModel, &desc, 1);
 
 	if (partition_factory.IsPartitionValid())
 		return kEfiOk;
diff --git a/dev/boot/modules/SysChk/amd64-ahci.json b/dev/boot/modules/SysChk/amd64-ahci.json
new file mode 100644
index 00000000..527e79f9
--- /dev/null
+++ b/dev/boot/modules/SysChk/amd64-ahci.json
@@ -0,0 +1,25 @@
+{
+  "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"],
+  "output_name": "chk.efi",
+  "compiler_flags": [
+    "-nostdlib",
+    "-std=c++20",
+    "-fPIC",
+    "-fno-rtti",
+    "-fno-exceptions",
+    "-Wl,--subsystem=17,--image-base,0x10000000,-e,SysChkModuleMain"
+  ],
+  "cpp_macros": [
+    "__NEOSKRNL__",
+    "__BOOTZ__",
+    "__BOOTZ_STANDALONE__",
+    "__NE_AMD64__",
+    "__AHCI__",
+    "kChkVersionHighest=0x0100",
+    "kChkVersionLowest=0x0100",
+    "kChkVersion=0x0100"
+  ]
+}
diff --git a/dev/boot/modules/SysChk/amd64-pio.json b/dev/boot/modules/SysChk/amd64-pio.json
new file mode 100644
index 00000000..de3195ce
--- /dev/null
+++ b/dev/boot/modules/SysChk/amd64-pio.json
@@ -0,0 +1,25 @@
+{
+  "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"],
+  "output_name": "chk.efi",
+  "compiler_flags": [
+    "-nostdlib",
+    "-std=c++20",
+    "-fPIC",
+    "-fno-rtti",
+    "-fno-exceptions",
+    "-Wl,--subsystem=17,--image-base,0x10000000,-e,SysChkModuleMain"
+  ],
+  "cpp_macros": [
+    "__NEOSKRNL__",
+    "__BOOTZ__",
+    "__BOOTZ_STANDALONE__",
+    "__NE_AMD64__",
+    "__ATA_PIO__",
+    "kChkVersionHighest=0x0100",
+    "kChkVersionLowest=0x0100",
+    "kChkVersion=0x0100"
+  ]
+}
diff --git a/dev/boot/modules/SysChk/amd64.json b/dev/boot/modules/SysChk/amd64.json
deleted file mode 100644
index 3b5bab6f..00000000
--- a/dev/boot/modules/SysChk/amd64.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "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"],
-  "output_name": "chk.efi",
-  "compiler_flags": [
-    "-nostdlib",
-    "-std=c++20",
-    "-fPIC",
-    "-fno-rtti",
-    "-fno-exceptions",
-    "-Wl,--subsystem=17,--image-base,0x1000000,-e,SysChkModuleMain"
-  ],
-  "cpp_macros": [
-    "__NEOSKRNL__",
-    "__BOOTZ__",
-    "__BOOTZ_STANDALONE__",
-    "__NE_AMD64__",
-    "kChkVersionHighest=0x0100",
-    "kChkVersionLowest=0x0100",
-    "kChkVersion=0x0100"
-  ]
-}
-- 
cgit v1.2.3