RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:48:12 +00:00
Code Issues Activity Actions

Kernel+LibPartition: Move DiskPartitionMetadata into LibPartition

Browse source 
This commit creates a new library LibPartition which will contain
partition related code sharable between Kernel and Userland and
includes DiskPartitionMetadata as the first shared class.
This commit is contained in:
Samuel Bowman 2022-02-12 14:21:28 -05:00 • committed by Linus Groh
parent 2786147774
commit be1c5c6b9f
9 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/CMakeLists.txt
View file

@ -104,7 +104,6 @@ set(KERNEL_SOURCES
Storage/ATA/ATAPIDiscDevice.cpp Storage/ATA/ATAPIDiscDevice.cpp
Storage/ATA/ATAPort.cpp Storage/ATA/ATAPort.cpp
Storage/Partition/DiskPartition.cpp Storage/Partition/DiskPartition.cpp
Storage/Partition/DiskPartitionMetadata.cpp
Storage/Partition/EBRPartitionTable.cpp Storage/Partition/EBRPartitionTable.cpp
Storage/Partition/GUIDPartitionTable.cpp Storage/Partition/GUIDPartitionTable.cpp
Storage/Partition/MBRPartitionTable.cpp Storage/Partition/MBRPartitionTable.cpp
@ -405,6 +404,10 @@ set(CRYPTO_SOURCES
../Userland/Libraries/LibCrypto/Hash/SHA2.cpp ../Userland/Libraries/LibCrypto/Hash/SHA2.cpp
) )
set(PARTITION_SOURCES
../Userland/Libraries/LibPartition/DiskPartitionMetadata.cpp
)
set(SOURCES set(SOURCES
${AK_SOURCES} ${AK_SOURCES}
) )
@ -416,6 +419,7 @@ if (NOT "${SERENITY_ARCH}" STREQUAL "aarch64")
${ELF_SOURCES} ${ELF_SOURCES}
${VT_SOURCES} ${VT_SOURCES}
${CRYPTO_SOURCES} ${CRYPTO_SOURCES}
${PARTITION_SOURCES}
) )
else() else()
set(RPI_SOURCES set(RPI_SOURCES

6
Kernel/Storage/Partition/DiskPartition.cpp
View file

@ -11,7 +11,7 @@
namespace Kernel { namespace Kernel {
NonnullRefPtr<DiskPartition> DiskPartition::create(BlockDevice& device, unsigned minor_number, DiskPartitionMetadata metadata) NonnullRefPtr<DiskPartition> DiskPartition::create(BlockDevice& device, unsigned minor_number, Partition::DiskPartitionMetadata metadata)
{ {
auto partition_or_error = DeviceManagement::try_create_device<DiskPartition>(device, minor_number, metadata); auto partition_or_error = DeviceManagement::try_create_device<DiskPartition>(device, minor_number, metadata);
// FIXME: Find a way to propagate errors // FIXME: Find a way to propagate errors
@ -19,7 +19,7 @@ NonnullRefPtr<DiskPartition> DiskPartition::create(BlockDevice& device, unsigned
return partition_or_error.release_value(); return partition_or_error.release_value();
} }
DiskPartition::DiskPartition(BlockDevice& device, unsigned minor_number, DiskPartitionMetadata metadata) DiskPartition::DiskPartition(BlockDevice& device, unsigned minor_number, Partition::DiskPartitionMetadata metadata)
: BlockDevice(100, minor_number, device.block_size()) : BlockDevice(100, minor_number, device.block_size())
, m_device(device) , m_device(device)
, m_metadata(metadata) , m_metadata(metadata)
@ -28,7 +28,7 @@ DiskPartition::DiskPartition(BlockDevice& device, unsigned minor_number, DiskPar
DiskPartition::~DiskPartition() = default; DiskPartition::~DiskPartition() = default;
DiskPartitionMetadata const& DiskPartition::metadata() const Partition::DiskPartitionMetadata const& DiskPartition::metadata() const
{ {
return m_metadata; return m_metadata;
} }

10
Kernel/Storage/Partition/DiskPartition.h
View file

@ -9,7 +9,7 @@
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <AK/WeakPtr.h> #include <AK/WeakPtr.h>
#include <Kernel/Devices/BlockDevice.h> #include <Kernel/Devices/BlockDevice.h>
#include <Kernel/Storage/Partition/DiskPartitionMetadata.h> #include <LibPartition/DiskPartitionMetadata.h>
namespace Kernel { namespace Kernel {
@ -17,7 +17,7 @@ class DiskPartition final : public BlockDevice {
friend class DeviceManagement; friend class DeviceManagement;
public: public:
static NonnullRefPtr<DiskPartition> create(BlockDevice&, unsigned, DiskPartitionMetadata); static NonnullRefPtr<DiskPartition> create(BlockDevice&, unsigned, Partition::DiskPartitionMetadata);
virtual ~DiskPartition(); virtual ~DiskPartition();
virtual void start_request(AsyncBlockDeviceRequest&) override; virtual void start_request(AsyncBlockDeviceRequest&) override;
@ -28,14 +28,14 @@ public:
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override;
virtual bool can_write(OpenFileDescription const&, u64) const override; virtual bool can_write(OpenFileDescription const&, u64) const override;
DiskPartitionMetadata const& metadata() const; Partition::DiskPartitionMetadata const& metadata() const;
private: private:
DiskPartition(BlockDevice&, unsigned, DiskPartitionMetadata); DiskPartition(BlockDevice&, unsigned, Partition::DiskPartitionMetadata);
virtual StringView class_name() const override; virtual StringView class_name() const override;
WeakPtr<BlockDevice> m_device; WeakPtr<BlockDevice> m_device;
DiskPartitionMetadata m_metadata; Partition::DiskPartitionMetadata m_metadata;
}; };
} }

2
Kernel/Storage/Partition/PartitionTable.cpp
View file

@ -12,7 +12,7 @@ PartitionTable::PartitionTable(StorageDevice const& device)
{ {
} }
Optional<DiskPartitionMetadata> PartitionTable::partition(unsigned index) Optional<Partition::DiskPartitionMetadata> PartitionTable::partition(unsigned index)
{ {
if (index > partitions_count()) if (index > partitions_count())
return {}; return {};

8
Kernel/Storage/Partition/PartitionTable.h
View file

@ -9,25 +9,25 @@
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <Kernel/Storage/Partition/DiskPartition.h> #include <Kernel/Storage/Partition/DiskPartition.h>
#include <Kernel/Storage/Partition/DiskPartitionMetadata.h>
#include <Kernel/Storage/StorageDevice.h> #include <Kernel/Storage/StorageDevice.h>
#include <LibPartition/DiskPartitionMetadata.h>
namespace Kernel { namespace Kernel {
class PartitionTable { class PartitionTable {
public: public:
Optional<DiskPartitionMetadata> partition(unsigned index); Optional<Partition::DiskPartitionMetadata> partition(unsigned index);
size_t partitions_count() const { return m_partitions.size(); } size_t partitions_count() const { return m_partitions.size(); }
virtual ~PartitionTable() = default; virtual ~PartitionTable() = default;
virtual bool is_valid() const = 0; virtual bool is_valid() const = 0;
Vector<DiskPartitionMetadata> partitions() const { return m_partitions; } Vector<Partition::DiskPartitionMetadata> partitions() const { return m_partitions; }
protected: protected:
explicit PartitionTable(StorageDevice const&); explicit PartitionTable(StorageDevice const&);
NonnullRefPtr<StorageDevice> m_device; NonnullRefPtr<StorageDevice> m_device;
Vector<DiskPartitionMetadata> m_partitions; Vector<Partition::DiskPartitionMetadata> m_partitions;
}; };
} }

1
Userland/Libraries/CMakeLists.txt
View file

@ -36,6 +36,7 @@ add_subdirectory(LibLine)
add_subdirectory(LibM) add_subdirectory(LibM)
add_subdirectory(LibMain) add_subdirectory(LibMain)
add_subdirectory(LibMarkdown) add_subdirectory(LibMarkdown)
add_subdirectory(LibPartition)
add_subdirectory(LibPCIDB) add_subdirectory(LibPCIDB)
add_subdirectory(LibPDF) add_subdirectory(LibPDF)
add_subdirectory(LibProtocol) add_subdirectory(LibProtocol)

5
Userland/Libraries/LibPartition/CMakeLists.txt Normal file
View file

@ -0,0 +1,5 @@
set(SOURCES
DiskPartitionMetadata.cpp
)
serenity_lib(LibPartition partition)

5
Kernel/Storage/Partition/DiskPartitionMetadata.cpp → Userland/Libraries/LibPartition/DiskPartitionMetadata.cpp
View file

@ -4,10 +4,9 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/AllOf.h> #include <LibPartition/DiskPartitionMetadata.h>
#include <Kernel/Storage/Partition/DiskPartitionMetadata.h>
namespace Kernel { namespace Partition {
DiskPartitionMetadata::PartitionType::PartitionType(u8 partition_type) DiskPartitionMetadata::PartitionType::PartitionType(u8 partition_type)
{ {

4
Kernel/Storage/Partition/DiskPartitionMetadata.h → Userland/Libraries/LibPartition/DiskPartitionMetadata.h
View file

@ -6,11 +6,9 @@
#pragma once #pragma once
#include <AK/RefPtr.h>
#include <AK/UUID.h> #include <AK/UUID.h>
#include <Kernel/Devices/BlockDevice.h>
namespace Kernel { namespace Partition {
class DiskPartitionMetadata { class DiskPartitionMetadata {
private: private: