5 files changed, 18 insertions, 14 deletions
diff --git a/dev/user/SystemCalls.h b/dev/user/SystemCalls.h
index 97a49469..df91bc1e 100644
--- a/dev/user/SystemCalls.h
+++ b/dev/user/SystemCalls.h
@@ -322,14 +322,17 @@ IMPORT_C SInt32 SchedBreakPoint(Void);
 // @brief Filesystem API.
 // ------------------------------------------------------------------------------------------ //
 
-IMPORT_C BOOL FsCopy(const char* path, const char* dst);
-IMPORT_C BOOL FsMove(const char* path, const char* dst);
+IMPORT_C BOOL FsCopy(const Char* path, const Char* dst);
 
-IMPORT_C BOOL FsExists(const char* path);
+IMPORT_C BOOL FsMove(const Char* path, const Char* dst);
 
-IMPORT_C BOOL FsCreateDir(const char* path);
-IMPORT_C BOOL FsCreateFile(const char* path);
-IMPORT_C BOOL FsCreateAlias(const char* path, const char* from);
+IMPORT_C BOOL FsExists(const Char* path);
+
+IMPORT_C BOOL FsCreateDir(const Char* path);
+
+IMPORT_C BOOL FsCreateFile(const Char* path);
+
+IMPORT_C BOOL FsCreateAlias(const Char* path, const Char* from);
 
 // ------------------------------------------------------------------------------------------ //
 // @brief Format API.
@@ -337,6 +340,6 @@ IMPORT_C BOOL FsCreateAlias(const char* path, const char* from);
 
 IMPORT_C Char* StrFmt(const Char* fmt, ...);
 
-IMPORT_C UInt64 MathToNumber(const Char* in, const Char** endp, const SInt16 base);
+IMPORT_C UInt64 StrMathToNumber(const Char* in, const Char** endp, const SInt16 base);
 
 #endif // ifndef SCI_SCI_H
diff --git a/dev/user/src/GNUmakefile b/dev/user/src/GNUmakefile
index c0ddd5b4..09993d16 100644
--- a/dev/user/src/GNUmakefile
+++ b/dev/user/src/GNUmakefile
@@ -1,6 +1,6 @@
 ##################################################
 # (c) Amlal El Mahrouss, all rights reserved.
-# This is the bootloader makefile.
+# This file is for user.sys's syscall stubs.
 ##################################################
 
 ASM=nasm
@@ -13,4 +13,4 @@ error:
 
 .PHONY: sci_asm_io_x64
 sci_asm_io_x64:
-	$(ASM) $(FLAGS) SystemCall+IO.asm -o SystemCall+IO.o
+	$(ASM) $(FLAGS) SystemCalls+IO.asm -o SystemCalls+IO.asm.o
diff --git a/dev/user/src/SystemCall+IO.asm b/dev/user/src/SystemCalls+IO.asm
index 8f123ec8..58ea79e7 100644
--- a/dev/user/src/SystemCall+IO.asm
+++ b/dev/user/src/SystemCalls+IO.asm
@@ -9,6 +9,8 @@
 
 [bits 64]
 
+;; @brief Syscall dispatch, also taking note the Microsoft's calling convention to translate it to NeKernel's ABI.
+
 section .text
 
 global sci_syscall_arg_1
diff --git a/dev/user/src/SystemCalls.cc b/dev/user/src/SystemCalls.cc
index 19f1fe42..2dd27dc0 100644
--- a/dev/user/src/SystemCalls.cc
+++ b/dev/user/src/SystemCalls.cc
@@ -27,7 +27,7 @@ IMPORT_C VoidPtr MmCopyMemory(_Input VoidPtr dest, _Input VoidPtr src, _Input Si
 	return dest;
 }
 
-/// @brief Fill memory region with **value**.
+/// @brief Fill memory region **dest** with **value**.
 IMPORT_C VoidPtr MmFillMemory(_Input VoidPtr dest, _Input SizeT len, _Input UInt8 value)
 {
 	if (!len ||
diff --git a/public/tools/diutil/src/CommandLine.cc b/public/tools/diutil/src/CommandLine.cc
index 61154e7a..9f11e778 100644
--- a/public/tools/diutil/src/CommandLine.cc
+++ b/public/tools/diutil/src/CommandLine.cc
@@ -11,14 +11,13 @@
 
 static const Char	kDiskName[kDIDiskNameLen] = "Disk";
 static SInt32		kDiskSectorSz			  = 512;
-static const SInt32 kDiskBlockCnt			  = 1;
 static SizeT		kDiskSz					  = gib_cast(4);
 static const Char	kOutDisk[kDIOutNameLen]	  = "disk.eimg";
 
 /// @brief Filesystem tool entrypoint.
 int main(int argc, char** argv)
 {
-	for (SizeT arg = 0; arg < argc; ++arg)
+	for (SInt32 arg = 0; arg < argc; ++arg)
 	{
 		const Char* arg_s = argv[arg];
 
@@ -33,14 +32,14 @@ int main(int argc, char** argv)
 		{
 			if ((arg + 1) < argc)
 			{
-				kDiskSz = MathToNumber(argv[arg + 1], nullptr, 10);
+				kDiskSz = StrMathToNumber(argv[arg + 1], nullptr, 10);
 			}
 		}
 		else if (MmCmpMemory((VoidPtr)arg_s, (VoidPtr) "--disk-sector-size", MmStrLen("--disk-sector-size") == 0))
 		{
 			if ((arg + 1) < argc)
 			{
-				kDiskSectorSz = MathToNumber(argv[arg + 1], nullptr, 10);
+				kDiskSectorSz = StrMathToNumber(argv[arg + 1], nullptr, 10);
 			}
 		}
 		else if (MmCmpMemory((VoidPtr)arg_s, (VoidPtr) "--disk-part-name", MmStrLen("--disk-part-name") == 0))