summaryrefslogtreecommitdiffhomepage
path: root/dev/Kernel
diff options
context:
space:
mode:
Diffstat (limited to 'dev/Kernel')
-rw-r--r--dev/Kernel/FSKit/NeFS.h4
-rw-r--r--dev/Kernel/FirmwareKit/EFI/API.h2
-rw-r--r--dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc2
-rw-r--r--dev/Kernel/HALKit/AMD64/HalAPICController.cc2
-rw-r--r--dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc4
-rw-r--r--dev/Kernel/HALKit/AMD64/HalKernelMain.cc4
-rw-r--r--dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc2
-rw-r--r--dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc2
-rw-r--r--dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc4
-rw-r--r--dev/Kernel/HALKit/AMD64/Storage/ATA-DMA.cc2
-rw-r--r--dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc2
-rw-r--r--dev/Kernel/HALKit/ARM64/APM/APM.cc2
-rw-r--r--dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc4
-rw-r--r--dev/Kernel/HALKit/ARM64/HalCoreMPScheduler.cc2
-rw-r--r--dev/Kernel/HALKit/ARM64/HalKernelMain.cc4
-rw-r--r--dev/Kernel/KernelKit/FileMgr.h2
-rw-r--r--dev/Kernel/KernelKit/Heap.h2
-rw-r--r--dev/Kernel/KernelKit/LoaderInterface.h2
-rw-r--r--dev/Kernel/NetworkKit/IPC.h3
-rw-r--r--dev/Kernel/NewKit/SwapMgr.h14
-rw-r--r--dev/Kernel/StorageKit/SCSI.h2
-rw-r--r--dev/Kernel/src/ACPIFactoryInterface.cc2
-rw-r--r--dev/Kernel/src/DriveMgr.cc6
-rw-r--r--dev/Kernel/src/FS/HPFS.cc6
-rw-r--r--dev/Kernel/src/FS/NeFS.cc6
-rw-r--r--dev/Kernel/src/KernelPanic.cc4
26 files changed, 50 insertions, 41 deletions
diff --git a/dev/Kernel/FSKit/NeFS.h b/dev/Kernel/FSKit/NeFS.h
index 5c62f0c2..9a804927 100644
--- a/dev/Kernel/FSKit/NeFS.h
+++ b/dev/Kernel/FSKit/NeFS.h
@@ -17,7 +17,7 @@ default.
#pragma once
#include <CompilerKit/CompilerKit.h>
-#include <HintKit/CompilerHint.h>
+#include <Hints/CompilerHint.h>
#include <KernelKit/DriveMgr.h>
#include <NewKit/Defines.h>
#include <NewKit/KString.h>
@@ -376,7 +376,7 @@ namespace Kernel
}
private:
- Char mStamp[255] = { "/System/FileSystemStamp.jrnl" };
+ Char mStamp[255] = { "/Boot/Journal" kNeFSJournalExt };
};
diff --git a/dev/Kernel/FirmwareKit/EFI/API.h b/dev/Kernel/FirmwareKit/EFI/API.h
index 218ca85a..24d21fd2 100644
--- a/dev/Kernel/FirmwareKit/EFI/API.h
+++ b/dev/Kernel/FirmwareKit/EFI/API.h
@@ -21,7 +21,7 @@ class BTextWriter;
#define __BOOTKIT_NO_INCLUDE__ 1
#include <BootKit/BootKit.h>
-#include <Modules/GfxMgr/FBMgr.h>
+#include <Mod/GfxMgr/FBMgr.h>
#endif // ifdef __ZBAOSLDR__
inline EfiSystemTable* ST = nullptr;
diff --git a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc b/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
index 1a1d50a3..521ad2f4 100644
--- a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
+++ b/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
@@ -4,7 +4,7 @@
------------------------------------------- */
-#include <Modules/ACPI/ACPIFactoryInterface.h>
+#include <Mod/ACPI/ACPIFactoryInterface.h>
#include <HALKit/AMD64/Processor.h>
#include <NewKit/KString.h>
#include <ArchKit/ArchKit.h>
diff --git a/dev/Kernel/HALKit/AMD64/HalAPICController.cc b/dev/Kernel/HALKit/AMD64/HalAPICController.cc
index cebbc41b..b20bd524 100644
--- a/dev/Kernel/HALKit/AMD64/HalAPICController.cc
+++ b/dev/Kernel/HALKit/AMD64/HalAPICController.cc
@@ -4,7 +4,7 @@
------------------------------------------- */
-#include <Modules/ACPI/ACPIFactoryInterface.h>
+#include <Mod/ACPI/ACPIFactoryInterface.h>
#include <HALKit/AMD64/Processor.h>
#define cIOAPICRegVal (4)
diff --git a/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc b/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc
index ac103d0d..3cdbd313 100644
--- a/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc
+++ b/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc
@@ -4,14 +4,14 @@
------------------------------------------- */
-#include <Modules/ACPI/ACPIFactoryInterface.h>
+#include <Mod/ACPI/ACPIFactoryInterface.h>
#include <KernelKit/UserProcessScheduler.h>
#include <HALKit/AMD64/Processor.h>
#include <ArchKit/ArchKit.h>
#include <KernelKit/Semaphore.h>
#include <KernelKit/UserProcessScheduler.h>
#include <KernelKit/Timer.h>
-#include <Modules/GfxMgr/TextMgr.h>
+#include <Mod/GfxMgr/TextMgr.h>
#include <NewKit/KernelPanic.h>
// Needed for SMP.
diff --git a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
index 690ece70..b78397fe 100644
--- a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
@@ -8,10 +8,10 @@
#include <KernelKit/UserProcessScheduler.h>
#include <KernelKit/HardwareThreadScheduler.h>
#include <KernelKit/CodeMgr.h>
-#include <Modules/ACPI/ACPIFactoryInterface.h>
+#include <Mod/ACPI/ACPIFactoryInterface.h>
#include <NetworkKit/IPC.h>
#include <CFKit/Property.h>
-#include <Modules/GfxMgr/TextMgr.h>
+#include <Mod/GfxMgr/TextMgr.h>
EXTERN_C Kernel::VoidPtr kInterruptVectorTable[];
EXTERN_C Kernel::VoidPtr mp_user_switch_proc;
diff --git a/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc b/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc
index 9e42fe3f..82d491ad 100644
--- a/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc
+++ b/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc
@@ -11,7 +11,7 @@
------------------------------------------- */
-#include <Modules/ACPI/ACPIFactoryInterface.h>
+#include <Mod/ACPI/ACPIFactoryInterface.h>
#include <ArchKit/ArchKit.h>
#include <KernelKit/Timer.h>
diff --git a/dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc b/dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc
index b7948bcb..6680c40f 100644
--- a/dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc
+++ b/dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc
@@ -4,4 +4,4 @@
------------------------------------------- */
-#include <Modules/MBCI/MBCI.h>
+#include <Mod/MBCI/MBCI.h>
diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc
index 7903af63..fd21bbca 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc
+++ b/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc
@@ -18,8 +18,8 @@
#include <KernelKit/UserProcessScheduler.h>
#include <KernelKit/LPC.h>
-#include <Modules/ATA/ATA.h>
-#include <Modules/AHCI/AHCI.h>
+#include <Mod/ATA/ATA.h>
+#include <Mod/AHCI/AHCI.h>
#include <KernelKit/PCI/Iterator.h>
#include <NewKit/Utils.h>
#include <KernelKit/LockDelegate.h>
diff --git a/dev/Kernel/HALKit/AMD64/Storage/ATA-DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/ATA-DMA.cc
index 6bb90156..ff51a398 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/ATA-DMA.cc
+++ b/dev/Kernel/HALKit/AMD64/Storage/ATA-DMA.cc
@@ -17,7 +17,7 @@
#include <StorageKit/PRDT.h>
-#include <Modules/ATA/ATA.h>
+#include <Mod/ATA/ATA.h>
#include <ArchKit/ArchKit.h>
using namespace Kernel;
diff --git a/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc b/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc
index 835035fb..3a3ba8eb 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc
+++ b/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc
@@ -15,7 +15,7 @@
*
*/
-#include <Modules/ATA/ATA.h>
+#include <Mod/ATA/ATA.h>
#include <ArchKit/ArchKit.h>
#ifdef __ATA_PIO__
diff --git a/dev/Kernel/HALKit/ARM64/APM/APM.cc b/dev/Kernel/HALKit/ARM64/APM/APM.cc
index 80cd4b8d..55cd26cc 100644
--- a/dev/Kernel/HALKit/ARM64/APM/APM.cc
+++ b/dev/Kernel/HALKit/ARM64/APM/APM.cc
@@ -4,7 +4,7 @@
------------------------------------------- */
-#include <Modules/APM/APM.h>
+#include <Mod/APM/APM.h>
#include <KernelKit/LPC.h>
using namespace Kernel;
diff --git a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc b/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc
index f8c8ffd8..94b10c09 100644
--- a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc
+++ b/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc
@@ -4,11 +4,11 @@
------------------------------------------- */
-#include <Modules/ACPI/ACPIFactoryInterface.h>
+#include <Mod/ACPI/ACPIFactoryInterface.h>
#include <NewKit/KString.h>
#include <ArchKit/ArchKit.h>
#include <KernelKit/Heap.h>
-#include <Modules/APM/APM.h>
+#include <Mod/APM/APM.h>
namespace Kernel
{
diff --git a/dev/Kernel/HALKit/ARM64/HalCoreMPScheduler.cc b/dev/Kernel/HALKit/ARM64/HalCoreMPScheduler.cc
index 75f8283c..eab88384 100644
--- a/dev/Kernel/HALKit/ARM64/HalCoreMPScheduler.cc
+++ b/dev/Kernel/HALKit/ARM64/HalCoreMPScheduler.cc
@@ -4,7 +4,7 @@
------------------------------------------- */
-#include <Modules/ACPI/ACPIFactoryInterface.h>
+#include <Mod/ACPI/ACPIFactoryInterface.h>
#include <KernelKit/UserProcessScheduler.h>
using namespace Kernel;
diff --git a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc
index 4a81fa64..03532270 100644
--- a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc
+++ b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc
@@ -5,7 +5,7 @@
------------------------------------------- */
#include <ArchKit/ArchKit.h>
-#include <Modules/GfxMgr/FBMgr.h>
+#include <Mod/GfxMgr/FBMgr.h>
#include <FirmwareKit/Handover.h>
#include <KernelKit/FileMgr.h>
#include <KernelKit/Heap.h>
@@ -13,7 +13,7 @@
#include <KernelKit/UserProcessScheduler.h>
#include <NewKit/Json.h>
#include <KernelKit/CodeMgr.h>
-#include <Modules/ACPI/ACPIFactoryInterface.h>
+#include <Mod/ACPI/ACPIFactoryInterface.h>
#include <NetworkKit/IPC.h>
#include <CFKit/Property.h>
diff --git a/dev/Kernel/KernelKit/FileMgr.h b/dev/Kernel/KernelKit/FileMgr.h
index 10aef681..c448519e 100644
--- a/dev/Kernel/KernelKit/FileMgr.h
+++ b/dev/Kernel/KernelKit/FileMgr.h
@@ -29,7 +29,7 @@
#endif // __FSKIT_INCLUDES_HPFS__
#include <CompilerKit/CompilerKit.h>
-#include <HintKit/CompilerHint.h>
+#include <Hints/CompilerHint.h>
#include <KernelKit/LPC.h>
#include <KernelKit/DebugOutput.h>
#include <NewKit/Stream.h>
diff --git a/dev/Kernel/KernelKit/Heap.h b/dev/Kernel/KernelKit/Heap.h
index 90ed6266..834b8f17 100644
--- a/dev/Kernel/KernelKit/Heap.h
+++ b/dev/Kernel/KernelKit/Heap.h
@@ -13,7 +13,7 @@
#include <NewKit/KernelPanic.h>
#include <KernelKit/LPC.h>
-#include <HintKit/CompilerHint.h>
+#include <Hints/CompilerHint.h>
namespace Kernel
{
diff --git a/dev/Kernel/KernelKit/LoaderInterface.h b/dev/Kernel/KernelKit/LoaderInterface.h
index b9a624bb..37bb61d6 100644
--- a/dev/Kernel/KernelKit/LoaderInterface.h
+++ b/dev/Kernel/KernelKit/LoaderInterface.h
@@ -7,7 +7,7 @@
#pragma once
#include <CompilerKit/CompilerKit.h>
-#include <HintKit/CompilerHint.h>
+#include <Hints/CompilerHint.h>
#include <NewKit/Defines.h>
#include <NewKit/ErrorOr.h>
diff --git a/dev/Kernel/NetworkKit/IPC.h b/dev/Kernel/NetworkKit/IPC.h
index 0e50c266..4bc293c4 100644
--- a/dev/Kernel/NetworkKit/IPC.h
+++ b/dev/Kernel/NetworkKit/IPC.h
@@ -12,8 +12,7 @@
#include <NewKit/Defines.h>
#include <NewKit/KString.h>
-#include <HintKit/CompilerHint.h>
-#include <CompressKit/API.h>
+#include <Hints/CompilerHint.h>
/// @file IPC.h
/// @brief IPC comm. protocol.
diff --git a/dev/Kernel/NewKit/SwapMgr.h b/dev/Kernel/NewKit/SwapMgr.h
index 822a1565..42df9ca6 100644
--- a/dev/Kernel/NewKit/SwapMgr.h
+++ b/dev/Kernel/NewKit/SwapMgr.h
@@ -12,10 +12,20 @@
#define kSwapMgrBlockMaxSize mib_cast(16)
#define KSwapMgrBlockMagic "SWEP "
+#define kSwapMgrPageFile "/System/pagefile.sys"
+
/// @file SwapMgr.h
-/// @brief Virtual memory swap API.
+/// @brief Virtual memory swap manager.
namespace Kernel
{
- class UserSwapProcess;
+ class SwapMgrDisk;
+
+ class SwapMgrDisk
+ {
+ static BOOL DumpToDisk(const Char* fork_name, SizeT fork_name_len = 0)
+ {
+ return YES;
+ }
+ }
} \ No newline at end of file
diff --git a/dev/Kernel/StorageKit/SCSI.h b/dev/Kernel/StorageKit/SCSI.h
index 0cbb780a..e56569c8 100644
--- a/dev/Kernel/StorageKit/SCSI.h
+++ b/dev/Kernel/StorageKit/SCSI.h
@@ -6,6 +6,6 @@
#pragma once
-#include <Modules/SCSI/SCSI.h>
+#include <Mod/SCSI/SCSI.h>
extern const scsi_packet_type<12> kCDRomPacketTemplate;
diff --git a/dev/Kernel/src/ACPIFactoryInterface.cc b/dev/Kernel/src/ACPIFactoryInterface.cc
index 83890220..716f691b 100644
--- a/dev/Kernel/src/ACPIFactoryInterface.cc
+++ b/dev/Kernel/src/ACPIFactoryInterface.cc
@@ -4,7 +4,7 @@
------------------------------------------- */
-#include <Modules/ACPI/ACPIFactoryInterface.h>
+#include <Mod/ACPI/ACPIFactoryInterface.h>
#include <NewKit/KString.h>
#include <ArchKit/ArchKit.h>
#include <KernelKit/Heap.h>
diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/Kernel/src/DriveMgr.cc
index 036997cb..cb83bf37 100644
--- a/dev/Kernel/src/DriveMgr.cc
+++ b/dev/Kernel/src/DriveMgr.cc
@@ -8,9 +8,9 @@
#include <KernelKit/DriveMgr.h>
#include <NewKit/Utils.h>
#include <FirmwareKit/EPM.h>
-#include <Modules/ATA/ATA.h>
-#include <Modules/AHCI/AHCI.h>
-#include <Modules/NVME/NVME.h>
+#include <Mod/ATA/ATA.h>
+#include <Mod/AHCI/AHCI.h>
+#include <Mod/NVME/NVME.h>
/***********************************************************************************/
/// @file DriveMgr.cc
diff --git a/dev/Kernel/src/FS/HPFS.cc b/dev/Kernel/src/FS/HPFS.cc
index 98c41f23..3093d6f6 100644
--- a/dev/Kernel/src/FS/HPFS.cc
+++ b/dev/Kernel/src/FS/HPFS.cc
@@ -6,9 +6,9 @@
#ifdef __FSKIT_INCLUDES_HPFS__
-#include <Modules/AHCI/AHCI.h>
-#include <Modules/ATA/ATA.h>
-#include <Modules/Flash/Flash.h>
+#include <Mod/AHCI/AHCI.h>
+#include <Mod/ATA/ATA.h>
+#include <Mod/Flash/Flash.h>
#include <FSKit/HPFS.h>
#include <KernelKit/LPC.h>
#include <NewKit/Crc32.h>
diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc
index 650d42c3..5484efc7 100644
--- a/dev/Kernel/src/FS/NeFS.cc
+++ b/dev/Kernel/src/FS/NeFS.cc
@@ -9,9 +9,9 @@
#include <FSKit/NeFS.h>
#include <FirmwareKit/EPM.h>
-#include <Modules/AHCI/AHCI.h>
-#include <Modules/ATA/ATA.h>
-#include <Modules/Flash/Flash.h>
+#include <Mod/AHCI/AHCI.h>
+#include <Mod/ATA/ATA.h>
+#include <Mod/Flash/Flash.h>
#include <KernelKit/LPC.h>
#include <NewKit/Crc32.h>
#include <NewKit/KernelPanic.h>
diff --git a/dev/Kernel/src/KernelPanic.cc b/dev/Kernel/src/KernelPanic.cc
index 0fd2ec64..9b200336 100644
--- a/dev/Kernel/src/KernelPanic.cc
+++ b/dev/Kernel/src/KernelPanic.cc
@@ -11,8 +11,8 @@
#include <NewKit/KString.h>
#include <FirmwareKit/Handover.h>
#include <KernelKit/FileMgr.h>
-#include <Modules/GfxMgr/FBMgr.h>
-#include <Modules/GfxMgr/TextMgr.h>
+#include <Mod/GfxMgr/FBMgr.h>
+#include <Mod/GfxMgr/TextMgr.h>
#define kWebsiteURL "https://el-mahrouss-logic.com/products/help/"