summaryrefslogtreecommitdiffhomepage
path: root/dev/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'dev/kernel')
-rw-r--r--dev/kernel/FSKit/NeFS.h2
-rw-r--r--dev/kernel/KernelKit/FileMgr.h2
-rw-r--r--dev/kernel/KernelKit/LoaderInterface.h2
-rw-r--r--dev/kernel/KernelKit/MemoryMgr.h2
-rw-r--r--dev/kernel/NetworkKit/IPC.h2
-rw-r--r--dev/kernel/NewKit/Variant.h3
-rw-r--r--dev/kernel/SwapKit/DiskSwap.h (renamed from dev/kernel/SwapKit/SwapDisk.h)0
-rw-r--r--dev/kernel/amd64-ci.make2
-rw-r--r--dev/kernel/amd64-desktop.make2
-rw-r--r--dev/kernel/kernel_rsrc.rsrc (renamed from dev/kernel/KernelRsrc.rsrc)6
-rw-r--r--dev/kernel/src/Swap/DiskSwap.cc (renamed from dev/kernel/src/Swap/SwapDisk.cc)2
11 files changed, 13 insertions, 12 deletions
diff --git a/dev/kernel/FSKit/NeFS.h b/dev/kernel/FSKit/NeFS.h
index b2f7095d..8ff9d9d2 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 <HintsKit/CompilerHint.h>
+#include <HintKit/CompilerHint.h>
#include <KernelKit/DriveMgr.h>
#include <NewKit/Defines.h>
#include <NewKit/KString.h>
diff --git a/dev/kernel/KernelKit/FileMgr.h b/dev/kernel/KernelKit/FileMgr.h
index 59203998..fec83d17 100644
--- a/dev/kernel/KernelKit/FileMgr.h
+++ b/dev/kernel/KernelKit/FileMgr.h
@@ -30,7 +30,7 @@
#endif // __FSKIT_INCLUDES_HeFS__
#include <CompilerKit/CompilerKit.h>
-#include <HintsKit/CompilerHint.h>
+#include <HintKit/CompilerHint.h>
#include <KernelKit/KPC.h>
#include <KernelKit/DebugOutput.h>
#include <NewKit/Stream.h>
diff --git a/dev/kernel/KernelKit/LoaderInterface.h b/dev/kernel/KernelKit/LoaderInterface.h
index 04e197aa..19c21ddb 100644
--- a/dev/kernel/KernelKit/LoaderInterface.h
+++ b/dev/kernel/KernelKit/LoaderInterface.h
@@ -7,7 +7,7 @@
#pragma once
#include <CompilerKit/CompilerKit.h>
-#include <HintsKit/CompilerHint.h>
+#include <HintKit/CompilerHint.h>
#include <NewKit/Defines.h>
#include <NewKit/ErrorOr.h>
diff --git a/dev/kernel/KernelKit/MemoryMgr.h b/dev/kernel/KernelKit/MemoryMgr.h
index 23a4721b..03bd4a2d 100644
--- a/dev/kernel/KernelKit/MemoryMgr.h
+++ b/dev/kernel/KernelKit/MemoryMgr.h
@@ -13,7 +13,7 @@
#include <NewKit/KernelPanic.h>
#include <KernelKit/KPC.h>
-#include <HintsKit/CompilerHint.h>
+#include <HintKit/CompilerHint.h>
namespace NeOS
{
diff --git a/dev/kernel/NetworkKit/IPC.h b/dev/kernel/NetworkKit/IPC.h
index e8f0898f..0d28c080 100644
--- a/dev/kernel/NetworkKit/IPC.h
+++ b/dev/kernel/NetworkKit/IPC.h
@@ -12,7 +12,7 @@
#include <NewKit/Defines.h>
#include <NewKit/KString.h>
-#include <HintsKit/CompilerHint.h>
+#include <HintKit/CompilerHint.h>
/// @file IPC.h
/// @brief IPC comm. protocol.
diff --git a/dev/kernel/NewKit/Variant.h b/dev/kernel/NewKit/Variant.h
index 99768016..3fa04496 100644
--- a/dev/kernel/NewKit/Variant.h
+++ b/dev/kernel/NewKit/Variant.h
@@ -9,7 +9,7 @@
#include <NewKit/Defines.h>
#include <NewKit/KString.h>
#include <NewKit/Json.h>
-#include <SwapKit/SwapDisk.h>
+#include <SwapKit/DiskSwap.h>
namespace NeOS
{
@@ -24,6 +24,7 @@ namespace NeOS
kJson,
kXML,
kSwap,
+ kInvalid,
};
public:
diff --git a/dev/kernel/SwapKit/SwapDisk.h b/dev/kernel/SwapKit/DiskSwap.h
index b9c31a65..b9c31a65 100644
--- a/dev/kernel/SwapKit/SwapDisk.h
+++ b/dev/kernel/SwapKit/DiskSwap.h
diff --git a/dev/kernel/amd64-ci.make b/dev/kernel/amd64-ci.make
index 692b7b54..71f49082 100644
--- a/dev/kernel/amd64-ci.make
+++ b/dev/kernel/amd64-ci.make
@@ -49,7 +49,7 @@ WINDRES=x86_64-w64-mingw32-windres
.PHONY: newos-amd64-epm
newos-amd64-epm: clean
- $(WINDRES) KernelRsrc.rsrc -O coff -o KernelRsrc.obj
+ $(WINDRES) kernel_rsrc.rsrc -O coff -o kernel_rsrc.obj
$(CXX) $(CCFLAGS) $(DISK_DRV) $(DEBUG_MACRO) $(wildcard src/*.cc) $(wildcard HALKit/AMD64/PCI/*.cc) $(wildcard src/Network/*.cc) $(wildcard src/Storage/*.cc) $(wildcard src/FS/*.cc) $(wildcard HALKit/AMD64/Storage/*.cc) $(wildcard HALKit/AMD64/*.cc) $(wildcard src/Swap/*.cc) $(wildcard HALKit/AMD64/*.s)
$(ASM) $(ASMFLAGS) HALKit/AMD64/HalInterruptAPI.asm
$(ASM) $(ASMFLAGS) HALKit/AMD64/HalCommonAPI.asm
diff --git a/dev/kernel/amd64-desktop.make b/dev/kernel/amd64-desktop.make
index 692b7b54..71f49082 100644
--- a/dev/kernel/amd64-desktop.make
+++ b/dev/kernel/amd64-desktop.make
@@ -49,7 +49,7 @@ WINDRES=x86_64-w64-mingw32-windres
.PHONY: newos-amd64-epm
newos-amd64-epm: clean
- $(WINDRES) KernelRsrc.rsrc -O coff -o KernelRsrc.obj
+ $(WINDRES) kernel_rsrc.rsrc -O coff -o kernel_rsrc.obj
$(CXX) $(CCFLAGS) $(DISK_DRV) $(DEBUG_MACRO) $(wildcard src/*.cc) $(wildcard HALKit/AMD64/PCI/*.cc) $(wildcard src/Network/*.cc) $(wildcard src/Storage/*.cc) $(wildcard src/FS/*.cc) $(wildcard HALKit/AMD64/Storage/*.cc) $(wildcard HALKit/AMD64/*.cc) $(wildcard src/Swap/*.cc) $(wildcard HALKit/AMD64/*.s)
$(ASM) $(ASMFLAGS) HALKit/AMD64/HalInterruptAPI.asm
$(ASM) $(ASMFLAGS) HALKit/AMD64/HalCommonAPI.asm
diff --git a/dev/kernel/KernelRsrc.rsrc b/dev/kernel/kernel_rsrc.rsrc
index d437c176..b5273787 100644
--- a/dev/kernel/KernelRsrc.rsrc
+++ b/dev/kernel/kernel_rsrc.rsrc
@@ -9,12 +9,12 @@ BEGIN
BLOCK "080904E4"
BEGIN
VALUE "CompanyName", "Amlal El Mahrouss."
- VALUE "FileDescription", "NeKernel."
+ VALUE "FileDescription", "NeKernel"
VALUE "FileVersion", KERNEL_VERSION
VALUE "InternalName", "neoskrnl"
- VALUE "LegalCopyright", "(c) 2024 Amlal El Mahrouss, all rights reserved."
+ VALUE "LegalCopyright", "(c) 2024-2025 Amlal El Mahrouss, all rights reserved"
VALUE "OriginalFilename", "neoskrnl.exe"
- VALUE "ProductName", "NeKernel."
+ VALUE "ProductName", "NeKernel"
VALUE "ProductVersion", KERNEL_VERSION
END
END
diff --git a/dev/kernel/src/Swap/SwapDisk.cc b/dev/kernel/src/Swap/DiskSwap.cc
index fbc63b2f..c50a96a9 100644
--- a/dev/kernel/src/Swap/SwapDisk.cc
+++ b/dev/kernel/src/Swap/DiskSwap.cc
@@ -4,7 +4,7 @@
------------------------------------------- */
-#include <SwapKit/SwapDisk.h>
+#include <SwapKit/DiskSwap.h>
#include <KernelKit/FileMgr.h>
namespace NeOS
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-13 13:10:16 +0000