mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 08:27:46 +00:00
Kernel+LibPartition: Move EBRPartitionTable into LibPartition
This commit is contained in:
parent
1a6ef03e4a
commit
9053d86b82
6 changed files with 37 additions and 42 deletions
|
@ -1,73 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2020-2022, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/ByteBuffer.h>
|
||||
#include <Kernel/Storage/Partition/EBRPartitionTable.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
ErrorOr<NonnullOwnPtr<EBRPartitionTable>> EBRPartitionTable::try_to_initialize(StorageDevice const& device)
|
||||
{
|
||||
auto table = TRY(adopt_nonnull_own_or_enomem(new (nothrow) EBRPartitionTable(device)));
|
||||
if (table->is_protective_mbr())
|
||||
return Error::from_errno(ENOTSUP);
|
||||
if (!table->is_valid())
|
||||
return Error::from_errno(EINVAL);
|
||||
return table;
|
||||
}
|
||||
|
||||
void EBRPartitionTable::search_extended_partition(StorageDevice const& device, MBRPartitionTable& checked_ebr, u64 current_block_offset, size_t limit)
|
||||
{
|
||||
if (limit == 0)
|
||||
return;
|
||||
// EBRs should not carry more than 2 partitions (because they need to form a linked list)
|
||||
VERIFY(checked_ebr.partitions_count() <= 2);
|
||||
auto checked_logical_partition = checked_ebr.partition(0);
|
||||
|
||||
// If we are pointed to an invalid logical partition, something is seriously wrong.
|
||||
VERIFY(checked_logical_partition.has_value());
|
||||
m_partitions.append(checked_logical_partition.value().offset(current_block_offset));
|
||||
if (!checked_ebr.contains_ebr())
|
||||
return;
|
||||
current_block_offset += checked_ebr.partition(1).value().start_block();
|
||||
auto next_ebr = MBRPartitionTable::try_to_initialize(device, current_block_offset);
|
||||
if (!next_ebr)
|
||||
return;
|
||||
search_extended_partition(device, *next_ebr, current_block_offset, (limit - 1));
|
||||
}
|
||||
|
||||
EBRPartitionTable::EBRPartitionTable(StorageDevice const& device)
|
||||
: MBRPartitionTable(device)
|
||||
{
|
||||
if (!is_header_valid())
|
||||
return;
|
||||
m_valid = true;
|
||||
|
||||
VERIFY(partitions_count() == 0);
|
||||
|
||||
auto& header = this->header();
|
||||
for (size_t index = 0; index < 4; index++) {
|
||||
auto& entry = header.entry[index];
|
||||
// Start enumerating all logical partitions
|
||||
if (entry.type == 0xf) {
|
||||
auto checked_ebr = MBRPartitionTable::try_to_initialize(device, entry.offset);
|
||||
if (!checked_ebr)
|
||||
continue;
|
||||
// It's quite unlikely to see that amount of partitions, so stop at 128 partitions.
|
||||
search_extended_partition(device, *checked_ebr, entry.offset, 128);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (entry.offset == 0x00) {
|
||||
continue;
|
||||
}
|
||||
MUST(m_partitions.try_empend(entry.offset, (entry.offset + entry.length), entry.type));
|
||||
}
|
||||
}
|
||||
|
||||
EBRPartitionTable::~EBRPartitionTable() = default;
|
||||
|
||||
}
|
|
@ -1,33 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2020-2022, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/Error.h>
|
||||
#include <AK/NonnullOwnPtr.h>
|
||||
#include <AK/RefPtr.h>
|
||||
#include <AK/Result.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <Kernel/Storage/Partition/DiskPartition.h>
|
||||
#include <LibPartition/MBRPartitionTable.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
struct EBRPartitionHeader;
|
||||
class EBRPartitionTable : public Partition::MBRPartitionTable {
|
||||
public:
|
||||
~EBRPartitionTable();
|
||||
|
||||
static ErrorOr<NonnullOwnPtr<EBRPartitionTable>> try_to_initialize(StorageDevice const&);
|
||||
explicit EBRPartitionTable(StorageDevice const&);
|
||||
virtual bool is_valid() const override { return m_valid; };
|
||||
|
||||
private:
|
||||
void search_extended_partition(StorageDevice const&, MBRPartitionTable&, u64, size_t limit);
|
||||
|
||||
bool m_valid { false };
|
||||
};
|
||||
}
|
|
@ -21,10 +21,10 @@
|
|||
#include <Kernel/Storage/ATA/GenericIDE/ISAController.h>
|
||||
#include <Kernel/Storage/ATA/GenericIDE/PCIController.h>
|
||||
#include <Kernel/Storage/NVMe/NVMeController.h>
|
||||
#include <Kernel/Storage/Partition/EBRPartitionTable.h>
|
||||
#include <Kernel/Storage/Partition/GUIDPartitionTable.h>
|
||||
#include <Kernel/Storage/Ramdisk/Controller.h>
|
||||
#include <Kernel/Storage/StorageManagement.h>
|
||||
#include <LibPartition/EBRPartitionTable.h>
|
||||
#include <LibPartition/MBRPartitionTable.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
@ -136,7 +136,7 @@ UNMAP_AFTER_INIT ErrorOr<NonnullOwnPtr<Partition::PartitionTable>> StorageManage
|
|||
auto mbr_table_or_error = Partition::MBRPartitionTable::try_to_initialize(device);
|
||||
if (!mbr_table_or_error.is_error())
|
||||
return mbr_table_or_error.release_value();
|
||||
auto ebr_table_or_error = EBRPartitionTable::try_to_initialize(device);
|
||||
auto ebr_table_or_error = Partition::EBRPartitionTable::try_to_initialize(device);
|
||||
if (!ebr_table_or_error.is_error()) {
|
||||
return ebr_table_or_error.release_value();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue