IMP: Drive Manager improvements and to the JSON C++ API.

7 files changed, 38 insertions, 38 deletions

diff --git a/dev/zka/KernelKit/DriveMgr.hxx b/dev/zka/KernelKit/DriveMgr.hxx
index e2e0bc3a..ffad5340 100644
--- a/dev/zka/KernelKit/DriveMgr.hxx
+++ b/dev/zka/KernelKit/DriveMgr.hxx
@@ -15,7 +15,7 @@
 #include <NewKit/Defines.hxx>
 #include <NewKit/String.hxx>
 
-#define kDriveMgrCount (4U)
+#define kMaxDriveCountPerMountpoint (4U)
 
 #define kDriveInvalidID (-1)
 #define kDriveNameLen	(32)
diff --git a/dev/zka/NewKit/Json.hxx b/dev/zka/NewKit/Json.hxx
index a5893147..614eb78e 100644
--- a/dev/zka/NewKit/Json.hxx
+++ b/dev/zka/NewKit/Json.hxx
@@ -22,10 +22,10 @@
 namespace Kernel
 {
 	/// @brief Json class
-	class JsonType final
+	class JSON final
 	{
 	public:
-		explicit JsonType()
+		explicit JSON()
 		{
 			auto	   len = cJSONLen;
 			StringView key = StringView(len);
@@ -35,14 +35,14 @@ namespace Kernel
 			this->AsValue() = key;
 		}
 
-		explicit JsonType(SizeT lhsLen, SizeT rhsLen)
+		explicit JSON(SizeT lhsLen, SizeT rhsLen)
 			: fKey(lhsLen), fValue(rhsLen)
 		{
 		}
 
-		~JsonType() = default;
+		~JSON() = default;
 
-		ZKA_COPY_DEFAULT(JsonType);
+		ZKA_COPY_DEFAULT(JSON);
 
 		const Bool& IsUndefined()
 		{
@@ -69,13 +69,13 @@ namespace Kernel
 			return fValue;
 		}
 
-		static JsonType kNull;
+		static JSON kNull;
 	};
 
 	/// @brief Json stream reader helper.
 	struct JsonStreamReader final
 	{
-		STATIC JsonType In(const Char* full_array)
+		STATIC JSON In(const Char* full_array)
 		{
 			auto start_val = '{';
 			auto end_val   = '}';
@@ -84,7 +84,7 @@ namespace Kernel
 			if (full_array[0] != start_val)
 			{
 				if (full_array[0] != '[')
-					return JsonType::kNull;
+					return JSON::kNull;
 
 				start_val = '[';
 				end_val = ']';
@@ -97,7 +97,7 @@ namespace Kernel
 			SizeT key_len	= 0;
 			SizeT value_len = 0;
 
-			JsonType type(cMaxJsonPath, cMaxJsonPath);
+			JSON type(cMaxJsonPath, cMaxJsonPath);
 
 			for (SizeT i = 1; i < len; ++i)
 			{
@@ -147,5 +147,5 @@ namespace Kernel
 		}
 	};
 
-	using JsonStream = Stream<JsonStreamReader, JsonType>;
+	using JsonStream = Stream<JsonStreamReader, JSON>;
 } // namespace Kernel
diff --git a/dev/zka/NewKit/Variant.hxx b/dev/zka/NewKit/Variant.hxx
index 6b0f30bd..f1fc3287 100644
--- a/dev/zka/NewKit/Variant.hxx
+++ b/dev/zka/NewKit/Variant.hxx
@@ -38,7 +38,7 @@ namespace Kernel
 		{
 		}
 
-		explicit Variant(JsonType* json)
+		explicit Variant(JSON* json)
 			: fPtr((VoidPtr)json), fKind(VariantKind::kJson)
 		{
 		}
diff --git a/dev/zka/src/DriveMgr.cxx b/dev/zka/src/DriveMgr.cxx
index 4b51cf66..6e231772 100644
--- a/dev/zka/src/DriveMgr.cxx
+++ b/dev/zka/src/DriveMgr.cxx
@@ -23,7 +23,7 @@ namespace Kernel
 	/// @brief reads from an ATA drive.
 	/// @param pckt
 	/// @return
-	Void ke_drv_input(DriveTrait::DrivePacket* pckt)
+	Void io_drv_input(DriveTrait::DrivePacket* pckt)
 	{
 		if (!pckt)
 		{
@@ -38,9 +38,9 @@ namespace Kernel
 	}
 
 	/// @brief Writes to an ATA drive.
-	/// @param pckt
+	/// @param pckt the packet to write.
 	/// @return
-	Void ke_drv_output(DriveTrait::DrivePacket* pckt)
+	Void io_drv_output(DriveTrait::DrivePacket* pckt)
 	{
 		if (!pckt)
 		{
@@ -55,9 +55,9 @@ namespace Kernel
 	}
 
 	/// @brief Executes a disk check on the ATA drive.
-	/// @param pckt
+	/// @param pckt the packet to read.
 	/// @return
-	Void ke_drv_init(DriveTrait::DrivePacket* pckt)
+	Void io_drv_init(DriveTrait::DrivePacket* pckt)
 	{
 		if (!pckt)
 		{
@@ -80,24 +80,24 @@ namespace Kernel
 	}
 
 /// @brief Gets the drive kind (ATA, SCSI, AHCI...)
-/// @param
-/// @return
+/// @param no arguments.
+/// @return no arguments.
 #ifdef __ATA_PIO__
-	const Char* ke_drv_kind(Void)
+	const Char* io_drv_kind(Void)
 	{
 		return "ATA-PIO";
 	}
 #endif
 
 #ifdef __ATA_DMA__
-	const Char* ke_drv_kind(Void)
+	const Char* io_drv_kind(Void)
 	{
 		return "ATA-DMA";
 	}
 #endif
 
 #ifdef __AHCI__
-	const Char* ke_drv_kind(Void)
+	const Char* io_drv_kind(Void)
 	{
 		return "AHCI";
 	}
@@ -115,7 +115,7 @@ namespace Kernel
 	/// @return the new drive.
 	DriveTrait io_construct_drive() noexcept
 	{
-		DriveTrait trait;
+		DriveTrait trait{};
 
 		rt_copy_memory((VoidPtr) "\\Mount\\NUL:", trait.fName, rt_string_len("\\Mount\\NUL:"));
 		trait.fKind = kInvalidDrive;
@@ -124,7 +124,7 @@ namespace Kernel
 		trait.fOutput	 = io_drv_unimplemented;
 		trait.fVerify	 = io_drv_unimplemented;
 		trait.fInit		 = io_drv_unimplemented;
-		trait.fDriveKind = ke_drv_kind;
+		trait.fDriveKind = io_drv_kind;
 
 		return trait;
 	}
@@ -133,18 +133,18 @@ namespace Kernel
 	/// @return the new drive.
 	DriveTrait io_construct_main_drive() noexcept
 	{
-		DriveTrait trait;
+		DriveTrait trait{};
 
 		rt_copy_memory((VoidPtr) "\\Mount\\MainDisk:", trait.fName, rt_string_len("\\Mount\\MainDisk:"));
 		trait.fKind = kMassStorage;
 
-		trait.fInput	 = ke_drv_input;
-		trait.fOutput	 = ke_drv_output;
 		trait.fVerify	 = io_drv_unimplemented;
-		trait.fInit		 = ke_drv_init;
-		trait.fDriveKind = ke_drv_kind;
+		trait.fOutput	 = io_drv_output;
+		trait.fInput	 = io_drv_input;
+		trait.fInit		 = io_drv_init;
+		trait.fDriveKind = io_drv_kind;
 
-		kcout << "Construct drive with success.\r";
+		kcout << "Constructed drive successfully..\r";
 
 		return trait;
 	}
diff --git a/dev/zka/src/Json.cxx b/dev/zka/src/Json.cxx
index df0d0ef8..5784f898 100644
--- a/dev/zka/src/Json.cxx
+++ b/dev/zka/src/Json.cxx
@@ -9,4 +9,4 @@
 using namespace Kernel;
 
 /// @brief Undefined object, is null in length.
-cInitObject(Kernel::JsonType::kNull, Kernel::JsonType);
+cInitObject(Kernel::JSON::kNull, Kernel::JSON);
diff --git a/dev/zka/src/LPC.cxx b/dev/zka/src/LPC.cxx
index 46814bbd..18e79753 100644
--- a/dev/zka/src/LPC.cxx
+++ b/dev/zka/src/LPC.cxx
@@ -9,26 +9,26 @@
 
 namespace Kernel
 {
-	STATIC Bool cRaise = false;
+	STATIC Bool kRaiseOnBugCheck = false;
 
 	/// @brief Does a system wide bug check.
 	/// @param void no params.
 	/// @return if error-free: false, otherwise true.
 	Boolean err_bug_check(void) noexcept
 	{
-		if (cRaise)
+		if (kRaiseOnBugCheck)
 		{
 			ke_stop(RUNTIME_CHECK_BAD_BEHAVIOR);
 		}
 
-		return false;
+		return No;
 	}
 
 	/// @brief Tells if we should raise a bug check not.
-	/// @param  void
+	/// @param void
 	/// @return void
 	Void err_bug_check_raise(Void) noexcept
 	{
-		cRaise = true;
+		kRaiseOnBugCheck = true;
 	}
 } // namespace Kernel
diff --git a/dev/zka/src/Storage/ATADeviceInterface.cxx b/dev/zka/src/Storage/ATADeviceInterface.cxx
index 78abada0..d9c8a71f 100644
--- a/dev/zka/src/Storage/ATADeviceInterface.cxx
+++ b/dev/zka/src/Storage/ATADeviceInterface.cxx
@@ -43,7 +43,7 @@ ATADeviceInterface& ATADeviceInterface::operator<<(MountpointInterface* Data)
 	if (!Data)
 		return *this;
 
-	for (SizeT driveCount = 0; driveCount < kDriveMgrCount; ++driveCount)
+	for (SizeT driveCount = 0; driveCount < kMaxDriveCountPerMountpoint; ++driveCount)
 	{
 		auto interface = Data->GetAddressOf(driveCount);
 		if ((interface) && rt_string_cmp((interface)->fDriveKind(), "ATA-", 5) == 0)
@@ -69,7 +69,7 @@ ATADeviceInterface& ATADeviceInterface::operator>>(MountpointInterface* Data)
 	if (!Data)
 		return *this;
 
-	for (SizeT driveCount = 0; driveCount < kDriveMgrCount; ++driveCount)
+	for (SizeT driveCount = 0; driveCount < kMaxDriveCountPerMountpoint; ++driveCount)
 	{
 		auto interface = Data->GetAddressOf(driveCount);
 		if ((interface) && rt_string_cmp((interface)->fDriveKind(), "ATA-", 5) == 0)