diff --git a/Kernel/Storage/AHCIController.h b/Kernel/Storage/AHCIController.h index 9fbef60410..a59aab5e9d 100644 --- a/Kernel/Storage/AHCIController.h +++ b/Kernel/Storage/AHCIController.h @@ -48,7 +48,6 @@ public: UNMAP_AFTER_INIT static NonnullRefPtr initialize(PCI::Address address); virtual ~AHCIController() override; - virtual Type type() const override { return Type::AHCI; } virtual RefPtr device(u32 index) const override; virtual bool reset() override; virtual bool shutdown() override; diff --git a/Kernel/Storage/IDEController.h b/Kernel/Storage/IDEController.h index 6cd9ed1a6b..3a0f922fe8 100644 --- a/Kernel/Storage/IDEController.h +++ b/Kernel/Storage/IDEController.h @@ -44,7 +44,6 @@ public: static NonnullRefPtr initialize(PCI::Address address, bool force_pio); virtual ~IDEController() override; - virtual Type type() const override { return Type::IDE; } virtual RefPtr device(u32 index) const override; virtual bool reset() override; virtual bool shutdown() override; diff --git a/Kernel/Storage/PATADiskDevice.h b/Kernel/Storage/PATADiskDevice.h index 406242c584..246adef78b 100644 --- a/Kernel/Storage/PATADiskDevice.h +++ b/Kernel/Storage/PATADiskDevice.h @@ -60,9 +60,6 @@ public: static NonnullRefPtr create(const IDEController&, IDEChannel&, DriveType, InterfaceType, u16, u64); virtual ~PATADiskDevice() override; - // ^StorageDevice - virtual Type type() const override { return StorageDevice::Type::IDE; } - // ^BlockDevice virtual void start_request(AsyncBlockDeviceRequest&) override; virtual String device_name() const override; diff --git a/Kernel/Storage/Partition/EBRPartitionTable.h b/Kernel/Storage/Partition/EBRPartitionTable.h index ef9b61f7a1..b13f8e455d 100644 --- a/Kernel/Storage/Partition/EBRPartitionTable.h +++ b/Kernel/Storage/Partition/EBRPartitionTable.h @@ -43,7 +43,6 @@ public: static Result, PartitionTable::Error> try_to_initialize(const StorageDevice&); explicit EBRPartitionTable(const StorageDevice&); virtual bool is_valid() const override { return m_valid; }; - virtual Type type() const override { return Type::EBR; }; private: void search_extended_partition(const StorageDevice&, MBRPartitionTable&, u64, size_t limit); diff --git a/Kernel/Storage/Partition/GUIDPartitionTable.h b/Kernel/Storage/Partition/GUIDPartitionTable.h index 5fbfe3d976..d30f6d62ee 100644 --- a/Kernel/Storage/Partition/GUIDPartitionTable.h +++ b/Kernel/Storage/Partition/GUIDPartitionTable.h @@ -43,7 +43,6 @@ public: static Result, PartitionTable::Error> try_to_initialize(const StorageDevice&); explicit GUIDPartitionTable(const StorageDevice&); - virtual Type type() const override { return Type::GPT; }; virtual bool is_valid() const override { return m_valid; }; private: diff --git a/Kernel/Storage/Partition/MBRPartitionTable.h b/Kernel/Storage/Partition/MBRPartitionTable.h index 4e539d7ee5..1ed657a6a1 100644 --- a/Kernel/Storage/Partition/MBRPartitionTable.h +++ b/Kernel/Storage/Partition/MBRPartitionTable.h @@ -68,7 +68,6 @@ public: bool is_protective_mbr() const; bool contains_ebr() const; - virtual Type type() const override { return Type::MBR; }; virtual bool is_valid() const override { return m_valid; }; protected: diff --git a/Kernel/Storage/Partition/PartitionTable.h b/Kernel/Storage/Partition/PartitionTable.h index 8c7ece095b..4aea446e4e 100644 --- a/Kernel/Storage/Partition/PartitionTable.h +++ b/Kernel/Storage/Partition/PartitionTable.h @@ -36,12 +36,6 @@ namespace Kernel { class PartitionTable { public: - enum class Type { - MBR, - EBR, - GPT, - BSD - }; enum class Error { Invalid, MBRProtective, @@ -51,7 +45,6 @@ public: public: Optional partition(unsigned index); size_t partitions_count() const { return m_partitions.size(); } - virtual Type type() const = 0; virtual ~PartitionTable() = default; virtual bool is_valid() const = 0; diff --git a/Kernel/Storage/RamdiskController.h b/Kernel/Storage/RamdiskController.h index a968d99356..8ebf6c3df1 100644 --- a/Kernel/Storage/RamdiskController.h +++ b/Kernel/Storage/RamdiskController.h @@ -44,7 +44,6 @@ public: static NonnullRefPtr initialize(); virtual ~RamdiskController() override; - virtual Type type() const override { return Type::Ramdisk; } virtual RefPtr device(u32 index) const override; virtual bool reset() override; virtual bool shutdown() override; diff --git a/Kernel/Storage/RamdiskDevice.h b/Kernel/Storage/RamdiskDevice.h index f34b639d5d..f59cd92660 100644 --- a/Kernel/Storage/RamdiskDevice.h +++ b/Kernel/Storage/RamdiskDevice.h @@ -41,9 +41,6 @@ public: RamdiskDevice(const RamdiskController&, NonnullOwnPtr&&, int major, int minor); virtual ~RamdiskDevice() override; - // ^StorageDevice - virtual Type type() const override { return StorageDevice::Type::Ramdisk; } - // ^BlockDevice virtual void start_request(AsyncBlockDeviceRequest&) override; diff --git a/Kernel/Storage/SATADiskDevice.h b/Kernel/Storage/SATADiskDevice.h index e26cfba906..8df9520915 100644 --- a/Kernel/Storage/SATADiskDevice.h +++ b/Kernel/Storage/SATADiskDevice.h @@ -48,7 +48,6 @@ public: virtual ~SATADiskDevice() override; // ^StorageDevice - virtual Type type() const override { return StorageDevice::Type::SATA; } // ^BlockDevice virtual void start_request(AsyncBlockDeviceRequest&) override; virtual String device_name() const override; diff --git a/Kernel/Storage/StorageController.h b/Kernel/Storage/StorageController.h index d2c61331c3..27a9b82277 100644 --- a/Kernel/Storage/StorageController.h +++ b/Kernel/Storage/StorageController.h @@ -44,17 +44,10 @@ class AsyncBlockDeviceRequest; class StorageDevice; class StorageController : public RefCounted { AK_MAKE_ETERNAL -public: - enum class Type : u8 { - Ramdisk, - IDE, - AHCI, - NVMe - }; +public: virtual ~StorageController() = default; - virtual Type type() const = 0; virtual RefPtr device(u32 index) const = 0; virtual size_t devices_count() const = 0; diff --git a/Kernel/Storage/StorageDevice.h b/Kernel/Storage/StorageDevice.h index ebdea7757c..9cbc844d28 100644 --- a/Kernel/Storage/StorageDevice.h +++ b/Kernel/Storage/StorageDevice.h @@ -37,16 +37,8 @@ namespace Kernel { class StorageDevice : public BlockDevice { friend class StorageManagement; AK_MAKE_ETERNAL -public: - enum class Type : u8 { - Ramdisk, - IDE, - SATA, - NVMe, - }; public: - virtual Type type() const = 0; virtual u64 max_addressable_block() const { return m_max_addressable_block; } NonnullRefPtr controller() const; diff --git a/Kernel/Storage/StorageManagement.cpp b/Kernel/Storage/StorageManagement.cpp index e91620e2c6..c3307e62ab 100644 --- a/Kernel/Storage/StorageManagement.cpp +++ b/Kernel/Storage/StorageManagement.cpp @@ -225,13 +225,4 @@ StorageManagement& StorageManagement::the() return *s_the; } -NonnullRefPtrVector StorageManagement::ide_controllers() const -{ - NonnullRefPtrVector ide_controllers; - for (auto& controller : m_controllers) { - if (controller.type() == StorageController::Type::IDE) - ide_controllers.append(controller); - } - return ide_controllers; -} } diff --git a/Kernel/Storage/StorageManagement.h b/Kernel/Storage/StorageManagement.h index 7251ec25cb..f252898123 100644 --- a/Kernel/Storage/StorageManagement.h +++ b/Kernel/Storage/StorageManagement.h @@ -51,8 +51,6 @@ public: static int major_number(); static int minor_number(); - NonnullRefPtrVector ide_controllers() const; - private: bool boot_argument_contains_partition_uuid();