From 32d78a8526d24116d25fbe50db552beb6b2e1ce9 Mon Sep 17 00:00:00 2001 From: Conrad Pankoff Date: Sun, 2 Jun 2019 19:38:37 +1000 Subject: [PATCH] Kernel: Rename OffsetDiskDevice to DiskPartition --- Kernel/Devices/DiskPartition.cpp | 63 +++++++++++++++++++ .../{OffsetDiskDevice.h => DiskPartition.h} | 8 +-- Kernel/Devices/OffsetDiskDevice.cpp | 63 ------------------- Kernel/Makefile | 2 +- Kernel/init.cpp | 4 +- 5 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 Kernel/Devices/DiskPartition.cpp rename Kernel/Devices/{OffsetDiskDevice.h => DiskPartition.h} (70%) delete mode 100644 Kernel/Devices/OffsetDiskDevice.cpp diff --git a/Kernel/Devices/DiskPartition.cpp b/Kernel/Devices/DiskPartition.cpp new file mode 100644 index 0000000000..413e1cb0a4 --- /dev/null +++ b/Kernel/Devices/DiskPartition.cpp @@ -0,0 +1,63 @@ +#include + +// #define OFFD_DEBUG + +Retained DiskPartition::create(Retained&& device, unsigned block_offset) +{ + return adopt(*new DiskPartition(move(device), block_offset)); +} + +DiskPartition::DiskPartition(Retained&& device, unsigned block_offset) + : m_device(move(device)), m_block_offset(block_offset) +{ +} + +DiskPartition::~DiskPartition() +{ +} + +unsigned DiskPartition::block_size() const +{ + return m_device->block_size(); +} + +bool DiskPartition::read_block(unsigned index, byte* out) const +{ +#ifdef OFFD_DEBUG + kprintf("DiskPartition::read_block %u (really: %u)\n", index, m_block_offset + index); +#endif + + return m_device->read_block(m_block_offset + index, out); +} + +bool DiskPartition::write_block(unsigned index, const byte* data) +{ +#ifdef OFFD_DEBUG + kprintf("DiskPartition::write_block %u (really: %u)\n", index, m_block_offset + index); +#endif + + return m_device->write_block(m_block_offset + index, data); +} + +bool DiskPartition::read_blocks(unsigned index, word count, byte* out) +{ +#ifdef OFFD_DEBUG + kprintf("DiskPartition::read_blocks %u (really: %u) count=%u\n", index, m_block_offset + index, count); +#endif + + return m_device->read_blocks(m_block_offset + index, count, out); +} + +bool DiskPartition::write_blocks(unsigned index, word count, const byte* data) +{ +#ifdef OFFD_DEBUG + kprintf("DiskPartition::write_blocks %u (really: %u) count=%u\n", index, m_block_offset + index, count); +#endif + + return m_device->write_blocks(m_block_offset + index, count, data); +} + +const char* DiskPartition::class_name() const +{ + return "DiskPartition"; +} diff --git a/Kernel/Devices/OffsetDiskDevice.h b/Kernel/Devices/DiskPartition.h similarity index 70% rename from Kernel/Devices/OffsetDiskDevice.h rename to Kernel/Devices/DiskPartition.h index aaa2350319..c4e1b39ee9 100644 --- a/Kernel/Devices/OffsetDiskDevice.h +++ b/Kernel/Devices/DiskPartition.h @@ -3,10 +3,10 @@ #include #include -class OffsetDiskDevice final : public DiskDevice { +class DiskPartition final : public DiskDevice { public: - static Retained create(Retained&& device, unsigned block_offset); - virtual ~OffsetDiskDevice(); + static Retained create(Retained&& device, unsigned block_offset); + virtual ~DiskPartition(); virtual unsigned block_size() const override; virtual bool read_block(unsigned index, byte* out) const override; @@ -17,7 +17,7 @@ public: private: virtual const char* class_name() const override; - OffsetDiskDevice(Retained&&, unsigned); + DiskPartition(Retained&&, unsigned); Retained m_device; unsigned m_block_offset; diff --git a/Kernel/Devices/OffsetDiskDevice.cpp b/Kernel/Devices/OffsetDiskDevice.cpp deleted file mode 100644 index 74d66853c4..0000000000 --- a/Kernel/Devices/OffsetDiskDevice.cpp +++ /dev/null @@ -1,63 +0,0 @@ -#include - -// #define OFFD_DEBUG - -Retained OffsetDiskDevice::create(Retained&& device, unsigned block_offset) -{ - return adopt(*new OffsetDiskDevice(move(device), block_offset)); -} - -OffsetDiskDevice::OffsetDiskDevice(Retained&& device, unsigned block_offset) - : m_device(move(device)), m_block_offset(block_offset) -{ -} - -OffsetDiskDevice::~OffsetDiskDevice() -{ -} - -unsigned OffsetDiskDevice::block_size() const -{ - return m_device->block_size(); -} - -bool OffsetDiskDevice::read_block(unsigned index, byte* out) const -{ -#ifdef OFFD_DEBUG - kprintf("OffsetDiskDevice::read_block %u (really: %u)\n", index, m_block_offset + index); -#endif - - return m_device->read_block(m_block_offset + index, out); -} - -bool OffsetDiskDevice::write_block(unsigned index, const byte* data) -{ -#ifdef OFFD_DEBUG - kprintf("OffsetDiskDevice::write_block %u (really: %u)\n", index, m_block_offset + index); -#endif - - return m_device->write_block(m_block_offset + index, data); -} - -bool OffsetDiskDevice::read_blocks(unsigned index, word count, byte* out) -{ -#ifdef OFFD_DEBUG - kprintf("OffsetDiskDevice::read_blocks %u (really: %u) count=%u\n", index, m_block_offset + index, count); -#endif - - return m_device->read_blocks(m_block_offset + index, count, out); -} - -bool OffsetDiskDevice::write_blocks(unsigned index, word count, const byte* data) -{ -#ifdef OFFD_DEBUG - kprintf("OffsetDiskDevice::write_blocks %u (really: %u) count=%u\n", index, m_block_offset + index, count); -#endif - - return m_device->write_blocks(m_block_offset + index, count, data); -} - -const char* OffsetDiskDevice::class_name() const -{ - return "OffsetDiskDevice"; -} diff --git a/Kernel/Makefile b/Kernel/Makefile index d79761bfeb..4da36b2020 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -65,7 +65,7 @@ VFS_OBJS = \ Devices/ZeroDevice.o \ Devices/RandomDevice.o \ Devices/DebugLogDevice.o \ - Devices/OffsetDiskDevice.o \ + Devices/DiskPartition.o \ FileSystem/FileSystem.o \ FileSystem/DiskBackedFileSystem.o \ FileSystem/Ext2FileSystem.o \ diff --git a/Kernel/init.cpp b/Kernel/init.cpp index 7b346d678f..e3992f7f1e 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -6,7 +6,7 @@ #include "Process.h" #include "PIC.h" #include -#include +#include #include "KSyms.h" #include #include @@ -72,7 +72,7 @@ VFS* vfs; auto dev_random = make(); auto dev_ptmx = make(); auto dev_hd0 = IDEDiskDevice::create(); - auto dev_hd0p1 = OffsetDiskDevice::create(dev_hd0.copy_ref(), PARTITION_OFFSET); + auto dev_hd0p1 = DiskPartition::create(dev_hd0.copy_ref(), PARTITION_OFFSET); auto e2fs = Ext2FS::create(dev_hd0p1.copy_ref()); e2fs->initialize();