From aaad58f2d6a56830860cb6ddef099096b089c389 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Mon, 31 Mar 2025 15:40:16 +0200 Subject: storage: unify naming for drive protocol interface Renamed `fDriveKind` to `fProtocol` across kernel storage subsystems to clarify its purpose as a protocol identifier (e.g., "AHCI", "ATA-") rather than a general "kind" classification. Updated all affected header and source files: - DriveMgr, HeFS, AHCI, ATADeviceInterface, and NeFS now consistently reference `fProtocol()` instead of `fDriveKind()`. - Added streaming operators (`<<`, `>>`) to AHCI and ATA device interfaces for improved mountpoint interaction. - Promoted `GetPortsImplemented()` and `SetPortsImplemented()` to public for AHCI device configuration. - Added null checks and protocol verification logic in stream operators. This refactor improves clarity and consistency when working with storage devices across the kernel. Signed-off-by: Amlal El Mahrouss --- dev/kernel/StorageKit/AHCI.h | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) (limited to 'dev/kernel/StorageKit') diff --git a/dev/kernel/StorageKit/AHCI.h b/dev/kernel/StorageKit/AHCI.h index caf75991..d6aeaee8 100644 --- a/dev/kernel/StorageKit/AHCI.h +++ b/dev/kernel/StorageKit/AHCI.h @@ -27,27 +27,17 @@ namespace Kernel const Char* Name() const override; - const UInt16& GetPortsImplemented() - { - return this->fPortsImplemented; - } - - Void SetPortsImplemented(const UInt16& pi) - { - MUST_PASS(pi > 0); - this->fPortsImplemented = pi; - } - - const UInt32& GetIndex() - { - return this->fDriveIndex; - } - - Void SetIndex(const UInt32& drv) - { - MUST_PASS(MountpointInterface::kDriveIndexInvalid != drv); - this->fDriveIndex = drv; - } + const UInt16& GetPortsImplemented(); + + Void SetPortsImplemented(const UInt16& pi); + + const UInt32& GetIndex(); + + Void SetIndex(const UInt32& drv); + + public: + AHCIDeviceInterface& operator<<(MountpointInterface* Data) override; + AHCIDeviceInterface& operator>>(MountpointInterface* Data) override; private: Void (*fCleanup)(Void) = {nullptr}; -- cgit v1.2.3