Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Kernel: Move Partition out of StorageDevice and rename functions

Browse Source
This commit is contained in:
Bananymous
2023-03-29 13:23:01 +03:00
parent ae05ad3f38
commit dd84a2175f
10 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/include/kernel/Storage/ATAController.h
View File

@@ -9,7 +9,7 @@ namespace Kernel
struct ATABus;
class ATAController;
class ATADevice : public StorageDevice
class ATADevice final : public StorageDevice
{
public:
virtual BAN::ErrorOr<void> read_sectors(uint64_t, uint8_t, uint8_t*) override;
@@ -18,14 +18,14 @@ namespace Kernel
virtual uint64_t total_size() const override { return lba_count * sector_size(); }
private:
enum class Type
enum class DeviceType
{
Unknown,
ATA,
ATAPI,
};
Type type;
DeviceType type;
uint8_t slave_bit; // 0x00 for master, 0x10 for slave
uint16_t signature;
uint16_t capabilities;

49
kernel/include/kernel/Storage/StorageDevice.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include <BAN/Vector.h>
#include <kernel/Device.h>
namespace Kernel
{
@@ -13,35 +14,37 @@ namespace Kernel
uint8_t data4[8];
};
class StorageDevice
class StorageDevice;
class Partition
{
public:
struct Partition
{
Partition(StorageDevice&, const GUID&, const GUID&, uint64_t, uint64_t, uint64_t, const char*);
Partition(StorageDevice&, const GUID&, const GUID&, uint64_t, uint64_t, uint64_t, const char*);
const GUID& type() const { return m_type; }
const GUID& guid() const { return m_guid; }
uint64_t lba_start() const { return m_lba_start; }
uint64_t lba_end() const { return m_lba_end; }
uint64_t attributes() const { return m_attributes; }
const char* name() const { return m_name; }
const StorageDevice& device() const { return m_device; }
const GUID& partition_type() const { return m_type; }
const GUID& partition_guid() const { return m_guid; }
uint64_t lba_start() const { return m_lba_start; }
uint64_t lba_end() const { return m_lba_end; }
uint64_t attributes() const { return m_attributes; }
const char* label() const { return m_label; }
const StorageDevice& device() const { return m_device; }
BAN::ErrorOr<void> read_sectors(uint64_t lba, uint8_t sector_count, uint8_t* buffer);
BAN::ErrorOr<void> write_sectors(uint64_t lba, uint8_t sector_count, const uint8_t* buffer);
bool is_used() const { uint8_t zero[16] {}; return memcmp(&m_type, zero, 16); }
BAN::ErrorOr<void> read_sectors(uint64_t lba, uint8_t sector_count, uint8_t* buffer);
BAN::ErrorOr<void> write_sectors(uint64_t lba, uint8_t sector_count, const uint8_t* buffer);
bool is_used() const { uint8_t zero[16] {}; return memcmp(&m_type, zero, 16); }
private:
StorageDevice& m_device;
const GUID m_type;
const GUID m_guid;
const uint64_t m_lba_start;
const uint64_t m_lba_end;
const uint64_t m_attributes;
char m_name[36 * 4 + 1];
};
private:
StorageDevice& m_device;
const GUID m_type;
const GUID m_guid;
const uint64_t m_lba_start;
const uint64_t m_lba_end;
const uint64_t m_attributes;
char m_label[36 * 4 + 1];
};
class StorageDevice
{
public:
virtual ~StorageDevice() {}