summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal EL Mahrouss <amlalelmahrouss@icloud.com>2024-06-29 15:55:15 +0200
committerAmlal EL Mahrouss <amlalelmahrouss@icloud.com>2024-06-29 15:55:15 +0200
commit1d9d0ba0f529e4b90875e459a841889495e45369 (patch)
treee441c7af5da07f57ff7389ad81a05b4adce0ea7b
parentd9d42bcfeb444652ae198a6bd3481ce316549e55 (diff)
DM: Add prefix 'io_' for drive manager functions.
Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>
-rw-r--r--Kernel/KernelKit/DriveManager.hxx14
-rw-r--r--Kernel/Sources/DriveManager.cxx22
-rw-r--r--Kernel/Sources/FS/NewFS.cxx8
3 files changed, 22 insertions, 22 deletions
diff --git a/Kernel/KernelKit/DriveManager.hxx b/Kernel/KernelKit/DriveManager.hxx
index d4ccb50f..47ecba67 100644
--- a/Kernel/KernelKit/DriveManager.hxx
+++ b/Kernel/KernelKit/DriveManager.hxx
@@ -130,20 +130,20 @@ namespace NewOS
/// @brief Unimplemented drive.
/// @param pckt
/// @return
- Void ke_drv_unimplemented(DriveTrait::DrivePacket* pckt);
+ Void io_drv_unimplemented(DriveTrait::DrivePacket* pckt);
/// @brief Gets the drive kind (ATA, SCSI, AHCI...)
/// @param
- /// @return
- const Char* ke_drive_kind(Void);
+ /// @return the drive kind (ATA, Flash, NVM)
+ const Char* io_drive_kind(Void);
/// @brief Makes a new drive.
- /// @return the new drive.
- DriveTrait construct_drive(void) noexcept;
+ /// @return the new drive as a trait.
+ DriveTrait io_construct_drive(void) noexcept;
/// @brief Fetches the main drive.
- /// @return the new drive.
- DriveTrait construct_main_drive(void) noexcept;
+ /// @return the new drive as a trait.
+ DriveTrait io_construct_main_drive(void) noexcept;
} // namespace NewOS
#endif /* ifndef __INC_DRIVE_MANAGER_HXX__ */
diff --git a/Kernel/Sources/DriveManager.cxx b/Kernel/Sources/DriveManager.cxx
index 23fb99fa..fa4b8298 100644
--- a/Kernel/Sources/DriveManager.cxx
+++ b/Kernel/Sources/DriveManager.cxx
@@ -86,21 +86,21 @@ namespace NewOS
/// @param
/// @return
#ifdef __ATA_PIO__
- const Char* ke_drive_kind(Void)
+ const Char* io_drive_kind(Void)
{
return "ATA-PIO";
}
#endif
#ifdef __ATA_DMA__
- const Char* ke_drive_kind(Void)
+ const Char* io_drive_kind(Void)
{
return "ATA-DMA";
}
#endif
#ifdef __AHCI__
- const Char* ke_drive_kind(Void)
+ const Char* io_drive_kind(Void)
{
return "AHCI";
}
@@ -109,30 +109,30 @@ namespace NewOS
/// @brief Unimplemented drive.
/// @param pckt
/// @return
- Void ke_drv_unimplemented(DriveTrait::DrivePacket* pckt)
+ Void io_drv_unimplemented(DriveTrait::DrivePacket* pckt)
{
}
/// @brief Makes a new drive.
/// @return the new drive.
- DriveTrait construct_drive() noexcept
+ DriveTrait io_construct_drive() noexcept
{
DriveTrait trait;
rt_copy_memory((VoidPtr) "/Mount/Null", trait.fName, rt_string_len("/Mount/Null"));
trait.fKind = kInvalidDrive;
- trait.fInput = ke_drv_unimplemented;
- trait.fOutput = ke_drv_unimplemented;
- trait.fVerify = ke_drv_unimplemented;
- trait.fDriveKind = ke_drive_kind;
+ trait.fInput = io_drv_unimplemented;
+ trait.fOutput = io_drv_unimplemented;
+ trait.fVerify = io_drv_unimplemented;
+ trait.fDriveKind = io_drive_kind;
return trait;
}
/// @brief Fetches the main drive.
/// @return the new drive.
- DriveTrait construct_main_drive() noexcept
+ DriveTrait io_construct_main_drive() noexcept
{
DriveTrait trait;
@@ -142,7 +142,7 @@ namespace NewOS
trait.fInput = ke_drv_input;
trait.fOutput = ke_drv_output;
trait.fVerify = ke_drv_check_disk;
- trait.fDriveKind = ke_drive_kind;
+ trait.fDriveKind = io_drive_kind;
return trait;
}
diff --git a/Kernel/Sources/FS/NewFS.cxx b/Kernel/Sources/FS/NewFS.cxx
index 33857590..5ede2ef7 100644
--- a/Kernel/Sources/FS/NewFS.cxx
+++ b/Kernel/Sources/FS/NewFS.cxx
@@ -947,10 +947,10 @@ namespace NewOS::Detail
/***********************************************************************************/
Boolean fs_init_newfs(Void) noexcept
{
- sMountpointInterface.A() = construct_main_drive();
- sMountpointInterface.B() = construct_drive();
- sMountpointInterface.C() = construct_drive();
- sMountpointInterface.D() = construct_drive();
+ sMountpointInterface.A() = io_construct_main_drive();
+ sMountpointInterface.B() = io_construct_drive();
+ sMountpointInterface.C() = io_construct_drive();
+ sMountpointInterface.D() = io_construct_drive();
sMountpointInterface.A().fVerify(&sMountpointInterface.A().fPacket);