diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-10-11 07:18:04 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-10-11 07:18:04 +0200 |
| commit | faf6a99a3dd3cbf4fbacc0392dc89555db42016e (patch) | |
| tree | 72713287e8c1f2349b01f3f836f0968bb856e19b /dev/zka/src | |
| parent | bb074eb78074d9231c1f08ca8339937360b5ce8c (diff) | |
IMP: Drive Manager improvements and to the JSON C++ API.
Diffstat (limited to 'dev/zka/src')
| -rw-r--r-- | dev/zka/src/DriveMgr.cxx | 36 | ||||
| -rw-r--r-- | dev/zka/src/Json.cxx | 2 | ||||
| -rw-r--r-- | dev/zka/src/LPC.cxx | 10 | ||||
| -rw-r--r-- | dev/zka/src/Storage/ATADeviceInterface.cxx | 4 |
4 files changed, 26 insertions, 26 deletions
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) |
