summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.vscode/c_cpp_properties.json126
-rw-r--r--Kernel/FSKit/NewFS.hxx4
-rw-r--r--Kernel/KernelKit/FileManager.hpp133
-rw-r--r--Kernel/KernelKit/ProcessScheduler.hxx4
-rw-r--r--Kernel/KernelKit/RLE.hxx12
-rw-r--r--Kernel/Modules/CoreCG/Accessibility.hxx5
-rw-r--r--Kernel/Sources/FS/NewFS.cxx27
-rw-r--r--Kernel/Sources/FileManager.cxx4
-rw-r--r--Kernel/Sources/KeMain.cxx17
-rw-r--r--Kernel/Sources/NewFS+FileManager.cxx4
-rw-r--r--Kernel/Sources/NewFS+IO.cxx4
-rw-r--r--Kernel/Sources/NewFS+Journal.cxx4
-rw-r--r--Kernel/Sources/compile_flags.txt2
-rw-r--r--Kernel/amd64-efi.make2
-rw-r--r--Kernel/arm64-cb.make2
-rw-r--r--newoskrnl.config2
16 files changed, 227 insertions, 125 deletions
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index c24b99d4..87bb07f6 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -1,65 +1,63 @@
{
- "configurations": [
- {
- "name": "MicroKernel (Macintosh)",
- "includePath": [
- "${workspaceFolder}/Kernel/**",
- "${workspaceFolder}/Drv/**",
- "${workspaceFolder}/Boot/**",
- "${workspaceFolder}/**",
- "${workspaceFolder}/Usr/Sys/CoreSystem/**",
- "${workspaceFolder}/Usr/Sys/**"
- ],
- "defines": [
- "__MAHROUSS__",
- "__KERNEL__",
- "Z_PREFIX",
- "__HAVE_MAHROUSS_APIS__",
- "__FSKIT_NEWFS__",
- "__EFI_x86_64__",
- "__ATA_PIO__",
- "__NEWOS_AMD64__"
- ],
- "cStandard": "c17",
- "cppStandard": "c++20",
- "compilerPath": "/opt/homebrew/bin/x86_64-w64-mingw32-gcc",
- "intelliSenseMode": "gcc-x64"
- },
- {
- "name": "AppDev ",
- "includePath": [
- "${workspaceFolder}/Usr/Developer/**"
- ],
- "defines": [],
- "cStandard": "c17",
- "cppStandard": "c++20",
- "intelliSenseMode": "gcc-x64"
- },
- {
- "name": "MicroKernel (Windows)",
- "includePath": [
- "${workspaceFolder}/Drv/**",
- "${workspaceFolder}/Kernel/**",
- "${workspaceFolder}/Boot/**",
- "${workspaceFolder}/**",
- "${workspaceFolder}/Usr/Sys/CoreSystem/**",
- "${workspaceFolder}/Usr/Sys/**"
- ],
- "defines": [
- "__MAHROUSS__",
- "__KERNEL__",
- "Z_PREFIX",
- "__HAVE_MAHROUSS_APIS__",
- "__FSKIT_NEWFS__",
- "__EFI_x86_64__",
- "__ATA_PIO__",
- "__NEWOS_AMD64__"
- ],
- "cStandard": "c17",
- "cppStandard": "c++20",
- "compilerPath": "C:/cygwin64/bin/x86_64-w64-mingw32-gcc.exe",
- "intelliSenseMode": "gcc-x64"
- }
- ],
- "version": 4
-} \ No newline at end of file
+ "configurations": [
+ {
+ "name": "MicroKernel (Macintosh)",
+ "includePath": [
+ "${workspaceFolder}/Kernel/**",
+ "${workspaceFolder}/Drv/**",
+ "${workspaceFolder}/Boot/**",
+ "${workspaceFolder}/**",
+ "${workspaceFolder}/Usr/Sys/CoreSystem/**",
+ "${workspaceFolder}/Usr/Sys/**"
+ ],
+ "defines": [
+ "__MAHROUSS__",
+ "__KERNEL__",
+ "Z_PREFIX",
+ "__HAVE_MAHROUSS_APIS__",
+ "__FSKIT_USE_NEWFS__",
+ "__EFI_x86_64__",
+ "__ATA_PIO__",
+ "__NEWOS_AMD64__"
+ ],
+ "cStandard": "c17",
+ "cppStandard": "c++20",
+ "compilerPath": "/opt/homebrew/bin/x86_64-w64-mingw32-gcc",
+ "intelliSenseMode": "gcc-x64"
+ },
+ {
+ "name": "AppDev ",
+ "includePath": ["${workspaceFolder}/Usr/Developer/**"],
+ "defines": [],
+ "cStandard": "c17",
+ "cppStandard": "c++20",
+ "intelliSenseMode": "gcc-x64"
+ },
+ {
+ "name": "MicroKernel (Windows)",
+ "includePath": [
+ "${workspaceFolder}/Drv/**",
+ "${workspaceFolder}/Kernel/**",
+ "${workspaceFolder}/Boot/**",
+ "${workspaceFolder}/**",
+ "${workspaceFolder}/Usr/Sys/CoreSystem/**",
+ "${workspaceFolder}/Usr/Sys/**"
+ ],
+ "defines": [
+ "__MAHROUSS__",
+ "__KERNEL__",
+ "Z_PREFIX",
+ "__HAVE_MAHROUSS_APIS__",
+ "__FSKIT_USE_NEWFS__",
+ "__EFI_x86_64__",
+ "__ATA_PIO__",
+ "__NEWOS_AMD64__"
+ ],
+ "cStandard": "c17",
+ "cppStandard": "c++20",
+ "compilerPath": "C:/cygwin64/bin/x86_64-w64-mingw32-gcc.exe",
+ "intelliSenseMode": "gcc-x64"
+ }
+ ],
+ "version": 4
+}
diff --git a/Kernel/FSKit/NewFS.hxx b/Kernel/FSKit/NewFS.hxx
index 60622c03..7e4fd0cf 100644
--- a/Kernel/FSKit/NewFS.hxx
+++ b/Kernel/FSKit/NewFS.hxx
@@ -225,7 +225,7 @@ namespace Kernel
/// @param theFork the fork itself.
/// @return the fork
_Output NewFork* CreateFork(_Input NewCatalog* catalog,
- _Input NewFork& theFork);
+ _Input NewFork& theFork);
/// @brief Find fork inside New filesystem.
/// @param catalog the catalog.
@@ -243,7 +243,7 @@ namespace Kernel
_Output NewCatalog* GetCatalog(_Input const char* name);
- _Output NewCatalog* CreateCatalog(_Input const char* name,
+ _Output NewCatalog* CreateCatalog(_Input const char* name,
_Input const Int32& flags,
_Input const Int32& kind);
diff --git a/Kernel/KernelKit/FileManager.hpp b/Kernel/KernelKit/FileManager.hpp
index 55d87fea..b234ba2b 100644
--- a/Kernel/KernelKit/FileManager.hpp
+++ b/Kernel/KernelKit/FileManager.hpp
@@ -9,31 +9,42 @@
Revision History:
31/01/24: Update documentation (amlel)
+ 05/07/24: NewFS support, and fork support, updated constants and specs
+ as well.
------------------------------------------- */
#pragma once
-#ifdef __FSKIT_NEWFS__
+#include "NewKit/Utils.hpp"
+#ifdef __FSKIT_USE_NEWFS__
#include <FSKit/NewFS.hxx>
-#endif // __FSKIT_NEWFS__
+#endif // __FSKIT_USE_NEWFS__
#include <CompilerKit/CompilerKit.hxx>
#include <HintKit/CompilerHint.hxx>
#include <NewKit/Ref.hpp>
+#include <KernelKit/HError.hpp>
#include <NewKit/Stream.hpp>
/// @brief Filesystem abstraction manager.
/// Works like the VFS or IFS.
-#define cRestrictR "r"
-#define cRestrictRB "rb"
-#define cRestrictW "w"
-#define cRestrictRW "rw"
+#define cRestrictR "r"
+#define cRestrictRB "rb"
+#define cRestrictW "w"
+#define cRestrictWB "rw"
+#define cRestrictRWB "rwb"
-/// refer to first enum.
+#define cRestrictMax 5
+
+#define node_cast(PTR) reinterpret_cast<Kernel::NodePtr>(PTR)
+
+/**
+ @note Refer to first enum.
+*/
#define cFileOpsCount 4
-#define cFileMimeGeneric "application-type/*"
+#define cFileMimeGeneric "n-application-kind/all"
/** @brief invalid position. (n-pos) */
#define kNPos (SizeT)(-1);
@@ -121,7 +132,7 @@ namespace Kernel
virtual bool Rewind(_Input NodePtr node) = 0;
};
-#ifdef __FSKIT_NEWFS__
+#ifdef __FSKIT_USE_NEWFS__
/**
* @brief Based of FilesystemManagerInterface, takes care of managing NewFS
* disks.
@@ -172,7 +183,7 @@ namespace Kernel
NewFSParser* fImpl{nullptr};
};
-#endif // ifdef __FSKIT_NEWFS__
+#endif // ifdef __FSKIT_USE_NEWFS__
/**
* Usable FileStream
@@ -194,6 +205,12 @@ namespace Kernel
public:
ErrorOr<Int64> WriteAll(const VoidPtr data) noexcept
{
+ if (this->fFileRestrict != eRestrictReadWrite &&
+ this->fFileRestrict != eRestrictReadWriteBinary &&
+ this->fFileRestrict != eRestrictWrite &&
+ this->fFileRestrict != eRestrictWriteBinary)
+ return ErrorOr<Int64>(kErrorInvalidData);
+
if (data == nullptr)
return ErrorOr<Int64>(kErrorInvalidData);
@@ -208,8 +225,14 @@ namespace Kernel
return ErrorOr<Int64>(kErrorInvalidData);
}
- VoidPtr Read() noexcept
+ VoidPtr ReadAll() noexcept
{
+ if (this->fFileRestrict != eRestrictReadWrite &&
+ this->fFileRestrict != eRestrictReadWriteBinary &&
+ this->fFileRestrict != eRestrictRead &&
+ this->fFileRestrict != eRestrictReadBinary)
+ return nullptr;
+
auto man = FSClass::GetMounted();
if (man)
@@ -223,6 +246,12 @@ namespace Kernel
ErrorOr<Int64> WriteAll(const char* fName, const VoidPtr data) noexcept
{
+ if (this->fFileRestrict != eRestrictReadWrite &&
+ this->fFileRestrict != eRestrictReadWriteBinary &&
+ this->fFileRestrict != eRestrictWrite &&
+ this->fFileRestrict != eRestrictWriteBinary)
+ return ErrorOr<Int64>(kErrorInvalidData);
+
if (data == nullptr)
return ErrorOr<Int64>(kErrorInvalidData);
@@ -239,6 +268,12 @@ namespace Kernel
VoidPtr Read(const char* fName) noexcept
{
+ if (this->fFileRestrict != eRestrictReadWrite &&
+ this->fFileRestrict != eRestrictReadWriteBinary &&
+ this->fFileRestrict != eRestrictRead &&
+ this->fFileRestrict != eRestrictReadBinary)
+ return nullptr;
+
auto man = FSClass::GetMounted();
if (man)
@@ -250,8 +285,14 @@ namespace Kernel
return nullptr;
}
- voidPtr Read(SizeT offset, SizeT sz)
+ VoidPtr Read(SizeT offset, SizeT sz)
{
+ if (this->fFileRestrict != eRestrictReadWrite &&
+ this->fFileRestrict != eRestrictReadWriteBinary &&
+ this->fFileRestrict != eRestrictRead &&
+ this->fFileRestrict != eRestrictReadBinary)
+ return nullptr;
+
auto man = FSClass::GetMounted();
if (man)
@@ -267,6 +308,12 @@ namespace Kernel
Void Write(SizeT offset, voidPtr data, SizeT sz)
{
+ if (this->fFileRestrict != eRestrictReadWrite &&
+ this->fFileRestrict != eRestrictReadWriteBinary &&
+ this->fFileRestrict != eRestrictWrite &&
+ this->fFileRestrict != eRestrictWriteBinary)
+ return;
+
auto man = FSClass::GetMounted();
if (man)
@@ -276,6 +323,7 @@ namespace Kernel
}
}
+ public:
/// @brief Leak node pointer.
/// @return The node pointer.
NodePtr Leak()
@@ -283,14 +331,26 @@ namespace Kernel
return fFile;
}
- public:
- char* MIME() noexcept
+ /// @brief Leak MIME.
+ /// @return The MIME.
+ Char* MIME() noexcept
{
return const_cast<char*>(fMime);
}
+ enum
+ {
+ eRestrictRead,
+ eRestrictReadBinary,
+ eRestrictWrite,
+ eRestrictWriteBinary,
+ eRestrictReadWrite,
+ eRestrictReadWriteBinary,
+ };
+
private:
- NodePtr fFile;
+ NodePtr fFile{nullptr};
+ Int32 fFileRestrict{};
const Char* fMime{cFileMimeGeneric};
};
@@ -305,6 +365,47 @@ namespace Kernel
const Encoding* restrict_type)
: fFile(Class::GetMounted()->Open(path, restrict_type))
{
+ static const auto cLength = 255;
+
+ struct StringMap final
+ {
+ Char fRestrict[cLength];
+ Int32 fMappedTo;
+ };
+
+ const SizeT cRestrictCount = cRestrictMax;
+ const StringMap cRestrictList[] = {
+ {
+ .fRestrict = cRestrictR,
+ .fMappedTo = eRestrictRead,
+ },
+ {
+ .fRestrict = cRestrictRB,
+ .fMappedTo = eRestrictReadBinary,
+ },
+ {
+ .fRestrict = cRestrictRWB,
+ .fMappedTo = eRestrictReadWriteBinary,
+ },
+ {
+ .fRestrict = cRestrictW,
+ .fMappedTo = eRestrictWrite,
+ },
+ {
+ .fRestrict = cRestrictWB,
+ .fMappedTo = eRestrictReadWrite,
+ }};
+
+ for (SizeT index = 0; index < cRestrictCount; ++index)
+ {
+ if (rt_string_cmp(restrict_type, cRestrictList[index].fRestrict,
+ rt_string_len(cRestrictList[index].fRestrict)) == 0)
+ {
+ fFileRestrict = cRestrictList[index].fMappedTo;
+ break;
+ }
+ }
+
kcout << "newoskrnl: new file: " << path << ".\r";
}
@@ -315,5 +416,3 @@ namespace Kernel
delete fFile;
}
} // namespace Kernel
-
-#define node_cast(PTR) reinterpret_cast<Kernel::NodePtr>(PTR)
diff --git a/Kernel/KernelKit/ProcessScheduler.hxx b/Kernel/KernelKit/ProcessScheduler.hxx
index 866841f7..7616e91a 100644
--- a/Kernel/KernelKit/ProcessScheduler.hxx
+++ b/Kernel/KernelKit/ProcessScheduler.hxx
@@ -275,8 +275,8 @@ namespace Kernel
class ProcessHelper final
{
public:
- STATIC bool Switch(HAL::StackFrame* newStack, const PID& newPid);
- STATIC bool CanBeScheduled(Ref<ProcessHeader>& process);
+ STATIC bool Switch(HAL::StackFrame* newStack, const PID& newPid);
+ STATIC bool CanBeScheduled(Ref<ProcessHeader>& process);
STATIC PID& TheCurrentPID();
STATIC SizeT StartScheduling();
};
diff --git a/Kernel/KernelKit/RLE.hxx b/Kernel/KernelKit/RLE.hxx
new file mode 100644
index 00000000..be3cedd7
--- /dev/null
+++ b/Kernel/KernelKit/RLE.hxx
@@ -0,0 +1,12 @@
+/* -------------------------------------------
+
+ Copyright Zeta Electronics Corporation
+
+------------------------------------------- */
+
+#ifndef __KERNELKIT_RLE_HXX__
+#define __KERNELKIT_RLE_HXX__
+
+#include <NewKit/Defines.hpp>
+
+#endif // !ifndef __KERNELKIT_RLE_HXX__
diff --git a/Kernel/Modules/CoreCG/Accessibility.hxx b/Kernel/Modules/CoreCG/Accessibility.hxx
index 7878de4f..d251e4c2 100644
--- a/Kernel/Modules/CoreCG/Accessibility.hxx
+++ b/Kernel/Modules/CoreCG/Accessibility.hxx
@@ -4,7 +4,8 @@
------------------------------------------- */
-#pragma once
+#ifndef __CORECG_ACCESS_HXX__
+#define __CORECG_ACCESS_HXX__
#include <NewKit/NewKit.hpp>
#include <KernelKit/HError.hpp>
@@ -44,3 +45,5 @@ namespace Kernel
}
};
} // namespace Kernel
+
+#endif // !__CORECG_ACCESS_HXX__
diff --git a/Kernel/Sources/FS/NewFS.cxx b/Kernel/Sources/FS/NewFS.cxx
index c07ec6d7..e8771de9 100644
--- a/Kernel/Sources/FS/NewFS.cxx
+++ b/Kernel/Sources/FS/NewFS.cxx
@@ -4,7 +4,7 @@
------------------------------------------- */
-#ifdef __FSKIT_NEWFS__
+#ifdef __FSKIT_USE_NEWFS__
#include <Modules/AHCI/AHCI.hxx>
#include <Modules/ATA/ATA.hxx>
@@ -38,7 +38,7 @@ STATIC MountpointInterface sMountpointInterface;
/// @param theFork the fork itself.
/// @return the fork
_Output NewFork* NewFSParser::CreateFork(_Input NewCatalog* catalog,
- _Input NewFork& theFork)
+ _Input NewFork& theFork)
{
if (!sMountpointInterface.GetAddressOf(this->fDriveIndex))
return nullptr;
@@ -207,7 +207,7 @@ _Output NewCatalog* NewFSParser::CreateCatalog(_Input const char* name)
/// @param flags the flags of the catalog.
/// @param kind the catalog kind.
/// @return catalog pointer.
-_Output NewCatalog* NewFSParser::CreateCatalog(_Input const char* name,
+_Output NewCatalog* NewFSParser::CreateCatalog(_Input const char* name,
_Input const Int32& flags,
_Input const Int32& kind)
{
@@ -451,7 +451,7 @@ bool NewFSParser::Format(_Input _Output DriveTrait* drive)
if (partBlock->PartitionName[0] == 0 &&
rt_string_cmp(partBlock->Ident, kNewFSIdent, kNewFSIdentLen))
{
- /// partition is free and valid.
+ // partition is free and valid.
partBlock->Version = kNewFSVersionInteger;
@@ -463,9 +463,10 @@ bool NewFSParser::Format(_Input _Output DriveTrait* drive)
rt_copy_memory((VoidPtr)cUntitledHD, (VoidPtr)partBlock->PartitionName,
rt_string_len(cUntitledHD));
- SizeT catalogCount = 0;
- SizeT sectorCount = drv_std_get_sector_count();
- SizeT diskSize = drv_std_get_drv_size();
+ SizeT catalogCount = 0UL;
+
+ SizeT sectorCount = drv_std_get_sector_count();
+ SizeT diskSize = drv_std_get_drv_size();
partBlock->Kind = kNewFSPartitionTypeStandard;
partBlock->StartCatalog = kNewFSCatalogStartAddress;
@@ -490,12 +491,12 @@ bool NewFSParser::Format(_Input _Output DriveTrait* drive)
kcout << "newoskrnl: free sectors: " << hex_number(partBlock->FreeSectors) << endl;
kcout << "newoskrnl: sector size: " << hex_number(partBlock->SectorSize) << endl;
- /// write the root catalog.
+ // write the root catalog.
this->CreateCatalog(kNewFSRoot, 0, kNewFSCatalogKindDir);
if (partBlock->Flags & kNewFSPartitionTypeBoot)
{
- /// make it bootable when needed.
+ // make it bootable when needed.
Char bufEpmHdr[kNewFSSectorSz] = {0};
BootBlockType* epmBoot = (BootBlockType*)bufEpmHdr;
@@ -525,7 +526,7 @@ bool NewFSParser::Format(_Input _Output DriveTrait* drive)
kcout << "newoskrnl: partition block already exists.\r";
- /// return success as well, do not ignore that partition.
+ // return success as well, do not ignore that partition.
return true;
}
@@ -555,7 +556,7 @@ bool NewFSParser::WriteCatalog(_Input _Output NewCatalog* catalog, voidPtr data,
rt_copy_memory(catalog->Name, forkData->CatalogName, kNewFSNodeNameLen);
- /// sanity check of the fork position as the condition to run the loop.
+ // sanity check of the fork position as the condition to run the loop.
while (startFork >= kNewFSCatalogStartAddress)
{
drive->fPacket.fPacketContent = forkData;
@@ -566,7 +567,7 @@ bool NewFSParser::WriteCatalog(_Input _Output NewCatalog* catalog, voidPtr data,
kcout << "newoskrnl: fork name: " << forkData->ForkName << endl;
- /// sanity check the fork.
+ // check the fork, if it's position is valid.
if (forkData->DataOffset <= kNewFSCatalogStartAddress)
{
ErrLocal() = kErrorDiskIsCorrupted;
@@ -980,4 +981,4 @@ namespace Kernel::Detail
}
} // namespace Kernel::Detail
-#endif // ifdef __FSKIT_NEWFS__
+#endif // ifdef __FSKIT_USE_NEWFS__
diff --git a/Kernel/Sources/FileManager.cxx b/Kernel/Sources/FileManager.cxx
index 4cd34d1f..fa076a33 100644
--- a/Kernel/Sources/FileManager.cxx
+++ b/Kernel/Sources/FileManager.cxx
@@ -50,7 +50,7 @@ namespace Kernel
return false;
}
-#ifdef __FSKIT_NEWFS__
+#ifdef __FSKIT_USE_NEWFS__
/// @brief Opens a new file.
/// @param path
/// @param r
@@ -192,5 +192,5 @@ namespace Kernel
{
return fImpl;
}
-#endif // __FSKIT_NEWFS__
+#endif // __FSKIT_USE_NEWFS__
} // namespace Kernel
diff --git a/Kernel/Sources/KeMain.cxx b/Kernel/Sources/KeMain.cxx
index a4b087c3..099ade0c 100644
--- a/Kernel/Sources/KeMain.cxx
+++ b/Kernel/Sources/KeMain.cxx
@@ -187,25 +187,14 @@ namespace Kernel::Detail
STATIC Kernel::Void ke_launch_srv(Kernel::Void)
{
// load security server.
- Kernel::PEFLoader launchDevil("C:\\System\\launchd");
+ Kernel::PEFLoader simConn("C:\\System\\SimConnect");
- if (!launchDevil.IsLoaded())
+ if (!simConn.IsLoaded())
{
Kernel::ke_stop(RUNTIME_CHECK_FAILED);
}
- Kernel::Utils::execute_from_image(launchDevil,
- Kernel::ProcessHeader::kAppKind);
-
- /// load middleware service.
- Kernel::PEFLoader stageBoard("C:\\System\\stageboard");
-
- if (!stageBoard.IsLoaded())
- {
- Kernel::ke_stop(RUNTIME_CHECK_FAILED);
- }
-
- Kernel::Utils::execute_from_image(stageBoard,
+ Kernel::Utils::execute_from_image(simConn,
Kernel::ProcessHeader::kAppKind);
}
} // namespace Kernel::Detail
diff --git a/Kernel/Sources/NewFS+FileManager.cxx b/Kernel/Sources/NewFS+FileManager.cxx
index 2658d784..b68bd99c 100644
--- a/Kernel/Sources/NewFS+FileManager.cxx
+++ b/Kernel/Sources/NewFS+FileManager.cxx
@@ -7,7 +7,7 @@
#include <KernelKit/FileManager.hpp>
#include <KernelKit/KernelHeap.hpp>
-#ifdef __FSKIT_NEWFS__
+#ifdef __FSKIT_USE_NEWFS__
/// @brief NewFS File manager.
/// BUGS: 0
@@ -86,4 +86,4 @@ namespace Kernel
}
} // namespace Kernel
-#endif // ifdef __FSKIT_NEWFS__
+#endif // ifdef __FSKIT_USE_NEWFS__
diff --git a/Kernel/Sources/NewFS+IO.cxx b/Kernel/Sources/NewFS+IO.cxx
index 884f8c11..20f3011f 100644
--- a/Kernel/Sources/NewFS+IO.cxx
+++ b/Kernel/Sources/NewFS+IO.cxx
@@ -17,7 +17,7 @@
*
*************************************************************/
-#ifdef __FSKIT_NEWFS__
+#ifdef __FSKIT_USE_NEWFS__
#include <FirmwareKit/EPM.hxx>
@@ -98,4 +98,4 @@ Int32 fs_newfs_write(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIn
return DrvTrait.fPacket.fPacketGood;
}
-#endif // ifdef __FSKIT_NEWFS__
+#endif // ifdef __FSKIT_USE_NEWFS__
diff --git a/Kernel/Sources/NewFS+Journal.cxx b/Kernel/Sources/NewFS+Journal.cxx
index f69744cc..75e8b94b 100644
--- a/Kernel/Sources/NewFS+Journal.cxx
+++ b/Kernel/Sources/NewFS+Journal.cxx
@@ -7,7 +7,7 @@
#include <KernelKit/DebugOutput.hpp>
#include <KernelKit/FileManager.hpp>
-#ifdef __FSKIT_NEWFS__
+#ifdef __FSKIT_USE_NEWFS__
///! BUGS: 0
///! @file NewFS+Journal.cxx
@@ -19,4 +19,4 @@ namespace Kernel::Journal
using namespace Kernel;
-#endif // ifdef __FSKIT_NEWFS__
+#endif // ifdef __FSKIT_USE_NEWFS__
diff --git a/Kernel/Sources/compile_flags.txt b/Kernel/Sources/compile_flags.txt
index 1f54e6fb..b02c5e3d 100644
--- a/Kernel/Sources/compile_flags.txt
+++ b/Kernel/Sources/compile_flags.txt
@@ -3,5 +3,5 @@
-std=c++20
-I../
-I$(HOME)/
--D__FSKIT_NEWFS__
+-D__FSKIT_USE_NEWFS__
-D__NEWOS_AMD64__
diff --git a/Kernel/amd64-efi.make b/Kernel/amd64-efi.make
index 7624c6fd..b3bb3898 100644
--- a/Kernel/amd64-efi.make
+++ b/Kernel/amd64-efi.make
@@ -6,7 +6,7 @@
CC = x86_64-w64-mingw32-g++
LD = x86_64-w64-mingw32-ld
CCFLAGS = -c -fPIC -ffreestanding -D__NEWOS_AMD64__ -mno-red-zone -fno-rtti -fno-exceptions \
- -std=c++20 -D__FSKIT_NEWFS__ -D__KERNEL__ -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -I./
+ -std=c++20 -D__FSKIT_USE_NEWFS__ -D__KERNEL__ -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -I./
ASM = nasm
diff --git a/Kernel/arm64-cb.make b/Kernel/arm64-cb.make
index 1d87edf6..fe604b93 100644
--- a/Kernel/arm64-cb.make
+++ b/Kernel/arm64-cb.make
@@ -6,7 +6,7 @@
CC = arm-none-eabi-g++ -march=armv8-a
LD = arm-none-eabi-ld
CCFLAGS = -c -fPIC -ffreestanding -D__NEWOS_ARM64__ -fno-rtti -fno-exceptions -I./ \
- -std=c++20 -D__FSKIT_NEWFS__ -D__ZETA_MACHINE__ -D__KERNEL__ -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__
+ -std=c++20 -D__FSKIT_USE_NEWFS__ -D__ZETA_MACHINE__ -D__KERNEL__ -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__
ASM = arm-none-eabi-as -march=armv8-a
diff --git a/newoskrnl.config b/newoskrnl.config
index 38552b7d..64bd76c1 100644
--- a/newoskrnl.config
+++ b/newoskrnl.config
@@ -2,4 +2,4 @@
// #define THE_ANSWER 42
#define __KERNEL__
#define __NEWOS_AMD64__
-#define __FSKIT_NEWFS__
+#define __FSKIT_USE_NEWFS__
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-14 19:44:41 +0000