From 0a8822a498d0db5883f0d4bba52842a1c8a74602 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Sun, 12 Jan 2025 21:31:01 +0100
Subject: ADD: Some tweaks and improvements on NeFS. ADD: Tweaks on BootThread
 class.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 dev/Kernel/FSKit/NeFS.h      |  8 ++++----
 dev/Kernel/src/FS/NeFS.cc    |  6 +++---
 dev/Kernel/src/KernelMain.cc |  2 +-
 dev/Kernel/src/NeFS+IO.cc    | 24 ++++++++++++------------
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'dev/Kernel')

diff --git a/dev/Kernel/FSKit/NeFS.h b/dev/Kernel/FSKit/NeFS.h
index 88792a3e..bca0e305 100644
--- a/dev/Kernel/FSKit/NeFS.h
+++ b/dev/Kernel/FSKit/NeFS.h
@@ -432,9 +432,9 @@ namespace Kernel
 		Char mStamp[255] = {"/system/journal" kNeFSJournalExt};
 	};
 
-	namespace Detail
+	namespace NeFS
 	{
-		Boolean fs_init_newfs(Void) noexcept;
+		Boolean fs_init_nefs(Void) noexcept;
 	} // namespace Detail
 } // namespace Kernel
 
@@ -443,7 +443,7 @@ namespace Kernel
 /// @param drv_trait drive info
 /// @param drv_indx drive index.
 /// @return status code.
-Kernel::Int32 fs_newfs_write(Kernel::MountpointInterface* drv_mnt,
+Kernel::Int32 fs_nefs_write(Kernel::MountpointInterface* drv_mnt,
 							 Kernel::DriveTrait&		  drv_trait,
 							 Kernel::Int32				  drv_indx);
 
@@ -452,6 +452,6 @@ Kernel::Int32 fs_newfs_write(Kernel::MountpointInterface* drv_mnt,
 /// @param drv_trait drive info
 /// @param drv_indx drive index.
 /// @return status code.
-Kernel::Int32 fs_newfs_read(Kernel::MountpointInterface* drv_mnt,
+Kernel::Int32 fs_nefs_read(Kernel::MountpointInterface* drv_mnt,
 							Kernel::DriveTrait&			 drv_trait,
 							Kernel::Int32				 drv_indx);
diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc
index 5df4daca..e8f757ea 100644
--- a/dev/Kernel/src/FS/NeFS.cc
+++ b/dev/Kernel/src/FS/NeFS.cc
@@ -159,7 +159,7 @@ _Output NFS_FORK_STRUCT* NeFileSystemParser::FindFork(_Input NFS_CATALOG_STRUCT*
 		rt_copy_memory((VoidPtr) "fs/nefs-packet", drv.fPacket.fPacketMime, 16);
 
 		if (auto res =
-				fs_newfs_read(&kDiskMountpoint, drv, this->mDriveIndex);
+				fs_nefs_read(&kDiskMountpoint, drv, this->mDriveIndex);
 			res)
 		{
 			switch (res)
@@ -986,12 +986,12 @@ SizeT NeFileSystemParser::Tell(_Input _Output NFS_CATALOG_STRUCT* catalog)
 	return 0;
 }
 
-namespace Kernel::Detail
+namespace Kernel::NeFS
 {
 	/***********************************************************************************/
 	/// @brief Construct NeFS drives.
 	/***********************************************************************************/
-	Boolean fs_init_newfs(Void) noexcept
+	Boolean fs_init_nefs(Void) noexcept
 	{
 		kcout << "Creating A:\r";
 
diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc
index 459acf02..35f85d6d 100644
--- a/dev/Kernel/src/KernelMain.cc
+++ b/dev/Kernel/src/KernelMain.cc
@@ -96,7 +96,7 @@ namespace Kernel::Detail
 EXTERN_C Kernel::Void rtl_kernel_main(Kernel::SizeT argc, char** argv, char** envp, Kernel::SizeT envp_len)
 {
 #ifdef __ZKA_AUTO_FORMAT__
-	Kernel::Detail::fs_init_newfs();
+	Kernel::NeFS::fs_init_nefs();
 	Kernel::Detail::NeFilesystemInstaller installer{};
 #endif // __ZKA_AUTO_FORMAT__
 }
diff --git a/dev/Kernel/src/NeFS+IO.cc b/dev/Kernel/src/NeFS+IO.cc
index 10e336e3..5d22ebe5 100644
--- a/dev/Kernel/src/NeFS+IO.cc
+++ b/dev/Kernel/src/NeFS+IO.cc
@@ -23,8 +23,8 @@
 
 /// Useful macros.
 
-#define NEFS_WRITE(DRV, TRAITS, MP) (MP->DRV()).fOutput(&TRAITS)
-#define NEFS_READ(DRV, TRAITS, MP)	(MP->DRV()).fInput(&TRAITS)
+#define rtl_nefs_write(DRV, TRAITS, MP) (MP->DRV()).fOutput(&TRAITS)
+#define rtl_nefs_read(DRV, TRAITS, MP)	(MP->DRV()).fInput(&TRAITS)
 
 using namespace Kernel;
 
@@ -33,7 +33,7 @@ using namespace Kernel;
 /// @param DrvTrait drive info
 /// @param DrvIndex drive index.
 /// @return
-Int32 fs_newfs_read(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex)
+Int32 fs_nefs_read(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex)
 {
 	if (!Mnt)
 		return 1;
@@ -43,19 +43,19 @@ Int32 fs_newfs_read(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvInd
 	switch (DrvIndex)
 	{
 	case kNeFSSubDriveA: {
-		NEFS_READ(A, DrvTrait.fPacket, Mnt);
+		rtl_nefs_read(A, DrvTrait.fPacket, Mnt);
 		break;
 	}
 	case kNeFSSubDriveB: {
-		NEFS_READ(B, DrvTrait.fPacket, Mnt);
+		rtl_nefs_read(B, DrvTrait.fPacket, Mnt);
 		break;
 	}
 	case kNeFSSubDriveC: {
-		NEFS_READ(C, DrvTrait.fPacket, Mnt);
+		rtl_nefs_read(C, DrvTrait.fPacket, Mnt);
 		break;
 	}
 	case kNeFSSubDriveD: {
-		NEFS_READ(D, DrvTrait.fPacket, Mnt);
+		rtl_nefs_read(D, DrvTrait.fPacket, Mnt);
 		break;
 	}
 	}
@@ -68,7 +68,7 @@ Int32 fs_newfs_read(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvInd
 /// @param DrvTrait drive info
 /// @param DrvIndex drive index.
 /// @return
-Int32 fs_newfs_write(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex)
+Int32 fs_nefs_write(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex)
 {
 	if (!Mnt)
 		return 1;
@@ -78,19 +78,19 @@ Int32 fs_newfs_write(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIn
 	switch (DrvIndex)
 	{
 	case kNeFSSubDriveA: {
-		NEFS_WRITE(A, DrvTrait.fPacket, Mnt);
+		rtl_nefs_write(A, DrvTrait.fPacket, Mnt);
 		break;
 	}
 	case kNeFSSubDriveB: {
-		NEFS_WRITE(B, DrvTrait.fPacket, Mnt);
+		rtl_nefs_write(B, DrvTrait.fPacket, Mnt);
 		break;
 	}
 	case kNeFSSubDriveC: {
-		NEFS_WRITE(C, DrvTrait.fPacket, Mnt);
+		rtl_nefs_write(C, DrvTrait.fPacket, Mnt);
 		break;
 	}
 	case kNeFSSubDriveD: {
-		NEFS_WRITE(D, DrvTrait.fPacket, Mnt);
+		rtl_nefs_write(D, DrvTrait.fPacket, Mnt);
 		break;
 	}
 	}
-- 
cgit v1.2.3