mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 07:47:37 +00:00
LibPartition: Make PartitionTable kernel/userland agnostic
Previously, PartitionTable was constructed using a Kernel::StorageDevice making it only usable in the kernel. This commit adds a new constructor that takes a Core::File instead, making it usable in userland as well. This also adds the m_block_size field which stores the block size of the underlying device obtained by calling StorageDevice::block_size() in the kernel or by using the STORAGE_DEVICE_GET_BLOCK_SIZE ioctl in userland. This avoids the need for an #ifdef every time block size is needed.
This commit is contained in:
parent
f6ab636d31
commit
6a1c85aa61
3 changed files with 30 additions and 4 deletions
|
@ -6,25 +6,37 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <Kernel/Storage/StorageDevice.h>
|
||||
#include <LibPartition/DiskPartitionMetadata.h>
|
||||
|
||||
#ifdef KERNEL
|
||||
# include <Kernel/Storage/StorageDevice.h>
|
||||
#else
|
||||
# include <LibCore/File.h>
|
||||
#endif
|
||||
|
||||
namespace Partition {
|
||||
|
||||
class PartitionTable {
|
||||
public:
|
||||
Optional<DiskPartitionMetadata> partition(unsigned index);
|
||||
Optional<DiskPartitionMetadata> partition(unsigned index) const;
|
||||
size_t partitions_count() const { return m_partitions.size(); }
|
||||
virtual ~PartitionTable() = default;
|
||||
virtual bool is_valid() const = 0;
|
||||
|
||||
Vector<DiskPartitionMetadata> partitions() const { return m_partitions; }
|
||||
size_t block_size() const { return m_block_size; }
|
||||
|
||||
protected:
|
||||
#ifdef KERNEL
|
||||
explicit PartitionTable(Kernel::StorageDevice const&);
|
||||
|
||||
NonnullRefPtr<Kernel::StorageDevice> m_device;
|
||||
#else
|
||||
explicit PartitionTable(NonnullRefPtr<Core::File>);
|
||||
NonnullRefPtr<Core::File> m_device_file;
|
||||
#endif
|
||||
|
||||
Vector<DiskPartitionMetadata> m_partitions;
|
||||
size_t m_block_size;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue