summaryrefslogtreecommitdiffhomepage
path: root/dev/kernel/src/Storage
diff options
context:
space:
mode:
Diffstat (limited to 'dev/kernel/src/Storage')
-rw-r--r--dev/kernel/src/Storage/AHCIDeviceInterface.cc119
-rw-r--r--dev/kernel/src/Storage/ATADeviceInterface.cc130
-rw-r--r--dev/kernel/src/Storage/NVMEDeviceInterface.cc33
-rw-r--r--dev/kernel/src/Storage/SCSIDeviceInterface.cc2
4 files changed, 120 insertions, 164 deletions
diff --git a/dev/kernel/src/Storage/AHCIDeviceInterface.cc b/dev/kernel/src/Storage/AHCIDeviceInterface.cc
index c5f43bf6..d5c1e5c6 100644
--- a/dev/kernel/src/Storage/AHCIDeviceInterface.cc
+++ b/dev/kernel/src/Storage/AHCIDeviceInterface.cc
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
------------------------------------------- */
@@ -12,95 +12,78 @@ using namespace Kernel;
/// @param Out Drive output
/// @param In Drive input
/// @param Cleanup Drive cleanup.
-AHCIDeviceInterface::AHCIDeviceInterface(void (*out)(IDeviceObject* self, MountpointInterface* outpacket),
- void (*in)(IDeviceObject* self, MountpointInterface* inpacket))
- : IDeviceObject(out, in)
-{
-}
+AHCIDeviceInterface::AHCIDeviceInterface(void (*out)(IDeviceObject* self,
+ MountpointInterface* outpacket),
+ void (*in)(IDeviceObject* self,
+ MountpointInterface* inpacket))
+ : IDeviceObject(out, in) {}
/// @brief Class desctructor
AHCIDeviceInterface::~AHCIDeviceInterface() = default;
/// @brief Returns the name of the device interface.
/// @return it's name as a string.
-const Char* AHCIDeviceInterface::Name() const
-{
- return "/dev/sda{}";
+const Char* AHCIDeviceInterface::Name() const {
+ return "/dev/sda{}";
}
/// @brief Output operator.
/// @param mnt the disk mountpoint.
/// @return the class itself after operation.
-AHCIDeviceInterface& AHCIDeviceInterface::operator<<(MountpointInterface* mnt)
-{
- if (!mnt)
- return *this;
-
- for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount)
- {
- auto interface = mnt->GetAddressOf(driveCount);
-
- if ((interface) && rt_string_cmp((interface)->fProtocol(), "AHCI", rt_string_len("AHCI")) == 0)
- {
- continue;
- }
- else if ((interface) &&
- rt_string_cmp((interface)->fProtocol(), "AHCI", rt_string_len("AHCI")) != 0)
- {
- return *this;
- }
- }
-
- return (AHCIDeviceInterface&)IDeviceObject<MountpointInterface*>::operator<<(
- mnt);
+AHCIDeviceInterface& AHCIDeviceInterface::operator<<(MountpointInterface* mnt) {
+ if (!mnt) return *this;
+
+ for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount) {
+ auto interface = mnt->GetAddressOf(driveCount);
+
+ if ((interface) &&
+ rt_string_cmp((interface)->fProtocol(), "AHCI", rt_string_len("AHCI")) == 0) {
+ continue;
+ } else if ((interface) &&
+ rt_string_cmp((interface)->fProtocol(), "AHCI", rt_string_len("AHCI")) != 0) {
+ return *this;
+ }
+ }
+
+ return (AHCIDeviceInterface&) IDeviceObject<MountpointInterface*>::operator<<(mnt);
}
/// @brief Input operator.
/// @param mnt the disk mountpoint.
/// @return the class itself after operation.
-AHCIDeviceInterface& AHCIDeviceInterface::operator>>(MountpointInterface* mnt)
-{
- if (!mnt)
- return *this;
-
- for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount)
- {
- auto interface = mnt->GetAddressOf(driveCount);
-
- // really check if it's ATA.
- if ((interface) && rt_string_cmp((interface)->fProtocol(), "AHCI", rt_string_len("AHCI")) == 0)
- {
- continue;
- }
- else if ((interface) &&
- rt_string_cmp((interface)->fProtocol(), "AHCI", rt_string_len("AHCI")) != 0)
- {
- return *this;
- }
- }
-
- return (AHCIDeviceInterface&)IDeviceObject<MountpointInterface*>::operator>>(
- mnt);
+AHCIDeviceInterface& AHCIDeviceInterface::operator>>(MountpointInterface* mnt) {
+ if (!mnt) return *this;
+
+ for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount) {
+ auto interface = mnt->GetAddressOf(driveCount);
+
+ // really check if it's ATA.
+ if ((interface) &&
+ rt_string_cmp((interface)->fProtocol(), "AHCI", rt_string_len("AHCI")) == 0) {
+ continue;
+ } else if ((interface) &&
+ rt_string_cmp((interface)->fProtocol(), "AHCI", rt_string_len("AHCI")) != 0) {
+ return *this;
+ }
+ }
+
+ return (AHCIDeviceInterface&) IDeviceObject<MountpointInterface*>::operator>>(mnt);
}
-const UInt16& AHCIDeviceInterface::GetPortsImplemented()
-{
- return this->fPortsImplemented;
+const UInt16& AHCIDeviceInterface::GetPortsImplemented() {
+ return this->fPortsImplemented;
}
-Void AHCIDeviceInterface::SetPortsImplemented(const UInt16& pi)
-{
- MUST_PASS(pi > 0);
- this->fPortsImplemented = pi;
+Void AHCIDeviceInterface::SetPortsImplemented(const UInt16& pi) {
+ MUST_PASS(pi > 0);
+ this->fPortsImplemented = pi;
}
-const UInt32& AHCIDeviceInterface::GetIndex()
-{
- return this->fDriveIndex;
+const UInt32& AHCIDeviceInterface::GetIndex() {
+ return this->fDriveIndex;
}
-Void AHCIDeviceInterface::SetIndex(const UInt32& drv)
-{
- MUST_PASS(MountpointInterface::kDriveIndexInvalid != drv);
- this->fDriveIndex = drv;
+Void AHCIDeviceInterface::SetIndex(const UInt32& drv) {
+ MUST_PASS(MountpointInterface::kDriveIndexInvalid != drv);
+ this->fDriveIndex = drv;
} \ No newline at end of file
diff --git a/dev/kernel/src/Storage/ATADeviceInterface.cc b/dev/kernel/src/Storage/ATADeviceInterface.cc
index 3fe331dd..f38d5359 100644
--- a/dev/kernel/src/Storage/ATADeviceInterface.cc
+++ b/dev/kernel/src/Storage/ATADeviceInterface.cc
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
------------------------------------------- */
@@ -12,107 +12,85 @@ using namespace Kernel;
/// @param Out Drive output
/// @param In Drive input
/// @param Cleanup Drive cleanup.
-ATADeviceInterface::ATADeviceInterface(
- void (*Out)(IDeviceObject*, MountpointInterface* outpacket),
- void (*In)(IDeviceObject*, MountpointInterface* inpacket))
- : IDeviceObject(Out, In)
-{
-}
+ATADeviceInterface::ATADeviceInterface(void (*Out)(IDeviceObject*, MountpointInterface* outpacket),
+ void (*In)(IDeviceObject*, MountpointInterface* inpacket))
+ : IDeviceObject(Out, In) {}
/// @brief Class desctructor
ATADeviceInterface::~ATADeviceInterface() = default;
/// @brief Returns the name of the device interface.
/// @return it's name as a string.
-const Char* ATADeviceInterface::Name() const
-{
- return "/dev/hda{}";
+const Char* ATADeviceInterface::Name() const {
+ return "/dev/hda{}";
}
/// @brief Output operator.
/// @param Data the disk mountpoint.
/// @return the class itself after operation.
-ATADeviceInterface& ATADeviceInterface::operator<<(MountpointInterface* Data)
-{
- if (!Data)
- return *this;
-
- for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount)
- {
- auto interface = Data->GetAddressOf(driveCount);
-
- if ((interface) && rt_string_cmp((interface)->fProtocol(), "ATA-", rt_string_len("ATA-")) == 0)
- {
- continue;
- }
- else if ((interface) &&
- rt_string_cmp((interface)->fProtocol(), "ATA-", rt_string_len("ATA-")) != 0)
- {
- return *this;
- }
- }
-
- return (ATADeviceInterface&)IDeviceObject<MountpointInterface*>::operator<<(
- Data);
+ATADeviceInterface& ATADeviceInterface::operator<<(MountpointInterface* Data) {
+ if (!Data) return *this;
+
+ for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount) {
+ auto interface = Data->GetAddressOf(driveCount);
+
+ if ((interface) &&
+ rt_string_cmp((interface)->fProtocol(), "ATA-", rt_string_len("ATA-")) == 0) {
+ continue;
+ } else if ((interface) &&
+ rt_string_cmp((interface)->fProtocol(), "ATA-", rt_string_len("ATA-")) != 0) {
+ return *this;
+ }
+ }
+
+ return (ATADeviceInterface&) IDeviceObject<MountpointInterface*>::operator<<(Data);
}
/// @brief Input operator.
/// @param Data the disk mountpoint.
/// @return the class itself after operation.
-ATADeviceInterface& ATADeviceInterface::operator>>(MountpointInterface* Data)
-{
- if (!Data)
- return *this;
-
- for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount)
- {
- auto interface = Data->GetAddressOf(driveCount);
-
- // really check if it's ATA.
- if ((interface) && rt_string_cmp((interface)->fProtocol(), "ATA-", rt_string_len("ATA-")) == 0)
- {
- continue;
- }
- else if ((interface) &&
- rt_string_cmp((interface)->fProtocol(), "ATA-", rt_string_len("ATA-")) != 0)
- {
- return *this;
- }
- }
-
- return (ATADeviceInterface&)IDeviceObject<MountpointInterface*>::operator>>(
- Data);
+ATADeviceInterface& ATADeviceInterface::operator>>(MountpointInterface* Data) {
+ if (!Data) return *this;
+
+ for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount) {
+ auto interface = Data->GetAddressOf(driveCount);
+
+ // really check if it's ATA.
+ if ((interface) &&
+ rt_string_cmp((interface)->fProtocol(), "ATA-", rt_string_len("ATA-")) == 0) {
+ continue;
+ } else if ((interface) &&
+ rt_string_cmp((interface)->fProtocol(), "ATA-", rt_string_len("ATA-")) != 0) {
+ return *this;
+ }
+ }
+
+ return (ATADeviceInterface&) IDeviceObject<MountpointInterface*>::operator>>(Data);
}
-const UInt32& ATADeviceInterface::GetIndex()
-{
- return this->fDriveIndex;
+const UInt32& ATADeviceInterface::GetIndex() {
+ return this->fDriveIndex;
}
-Void ATADeviceInterface::SetIndex(const UInt32& drv)
-{
- MUST_PASS(MountpointInterface::kDriveIndexInvalid != drv);
- this->fDriveIndex = drv;
+Void ATADeviceInterface::SetIndex(const UInt32& drv) {
+ MUST_PASS(MountpointInterface::kDriveIndexInvalid != drv);
+ this->fDriveIndex = drv;
}
-const UInt16& ATADeviceInterface::GetIO()
-{
- return this->fIO;
+const UInt16& ATADeviceInterface::GetIO() {
+ return this->fIO;
}
-Void ATADeviceInterface::SetIO(const UInt16& drv)
-{
- MUST_PASS(0xFFFF != drv);
- this->fIO = drv;
+Void ATADeviceInterface::SetIO(const UInt16& drv) {
+ MUST_PASS(0xFFFF != drv);
+ this->fIO = drv;
}
-const UInt16& ATADeviceInterface::GetMaster()
-{
- return this->fIO;
+const UInt16& ATADeviceInterface::GetMaster() {
+ return this->fIO;
}
-Void ATADeviceInterface::SetMaster(const UInt16& drv)
-{
- MUST_PASS(0xFFFF != drv);
- this->fMaster = drv;
+Void ATADeviceInterface::SetMaster(const UInt16& drv) {
+ MUST_PASS(0xFFFF != drv);
+ this->fMaster = drv;
} \ No newline at end of file
diff --git a/dev/kernel/src/Storage/NVMEDeviceInterface.cc b/dev/kernel/src/Storage/NVMEDeviceInterface.cc
index 14c9722f..edec6d6d 100644
--- a/dev/kernel/src/Storage/NVMEDeviceInterface.cc
+++ b/dev/kernel/src/Storage/NVMEDeviceInterface.cc
@@ -1,28 +1,23 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
------------------------------------------- */
#include <StorageKit/NVME.h>
-namespace Kernel
-{
- NVMEDeviceInterface::NVMEDeviceInterface(void (*out)(IDeviceObject*, MountpointInterface* outpacket),
- void (*in)(IDeviceObject*, MountpointInterface* inpacket),
- void (*cleanup)(void))
- : IDeviceObject(out, in), fCleanup(cleanup)
- {
- }
+namespace Kernel {
+NVMEDeviceInterface::NVMEDeviceInterface(void (*out)(IDeviceObject*,
+ MountpointInterface* outpacket),
+ void (*in)(IDeviceObject*, MountpointInterface* inpacket),
+ void (*cleanup)(void))
+ : IDeviceObject(out, in), fCleanup(cleanup) {}
- NVMEDeviceInterface::~NVMEDeviceInterface()
- {
- if (fCleanup)
- fCleanup();
- }
+NVMEDeviceInterface::~NVMEDeviceInterface() {
+ if (fCleanup) fCleanup();
+}
- const Char* NVMEDeviceInterface::Name() const
- {
- return ("/dev/nvme{}");
- }
-} // namespace Kernel
+const Char* NVMEDeviceInterface::Name() const {
+ return ("/dev/nvme{}");
+}
+} // namespace Kernel
diff --git a/dev/kernel/src/Storage/SCSIDeviceInterface.cc b/dev/kernel/src/Storage/SCSIDeviceInterface.cc
index 85432822..6f26f486 100644
--- a/dev/kernel/src/Storage/SCSIDeviceInterface.cc
+++ b/dev/kernel/src/Storage/SCSIDeviceInterface.cc
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
------------------------------------------- */
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-13 08:27:30 +0000