From 96081010dc4a52607f027297241b555348703685 Mon Sep 17 00:00:00 2001 From: Tom Date: Sun, 1 Nov 2020 13:43:02 -0700 Subject: [PATCH] Kernel: Remove dead code from BlockDevice --- Kernel/Devices/BlockDevice.cpp | 20 -------------------- Kernel/Devices/BlockDevice.h | 2 -- 2 files changed, 22 deletions(-) diff --git a/Kernel/Devices/BlockDevice.cpp b/Kernel/Devices/BlockDevice.cpp index d78388b610..d1f70a14dd 100644 --- a/Kernel/Devices/BlockDevice.cpp +++ b/Kernel/Devices/BlockDevice.cpp @@ -42,24 +42,4 @@ bool BlockDevice::write_block(unsigned index, const UserOrKernelBuffer& data) return write_blocks(index, 1, data); } -bool BlockDevice::read_raw(u32 offset, unsigned length, UserOrKernelBuffer& out) const -{ - ASSERT((offset % block_size()) == 0); - ASSERT((length % block_size()) == 0); - u32 first_block = offset / block_size(); - u32 end_block = (offset + length) / block_size(); - return const_cast(this)->read_blocks(first_block, end_block - first_block, out); -} - -bool BlockDevice::write_raw(u32 offset, unsigned length, const UserOrKernelBuffer& in) -{ - ASSERT((offset % block_size()) == 0); - ASSERT((length % block_size()) == 0); - u32 first_block = offset / block_size(); - u32 end_block = (offset + length) / block_size(); - ASSERT(first_block <= 0xffffffff); - ASSERT(end_block <= 0xffffffff); - return write_blocks(first_block, end_block - first_block, in); -} - } diff --git a/Kernel/Devices/BlockDevice.h b/Kernel/Devices/BlockDevice.h index 69786df3f8..ee9a5bbead 100644 --- a/Kernel/Devices/BlockDevice.h +++ b/Kernel/Devices/BlockDevice.h @@ -39,8 +39,6 @@ public: bool read_block(unsigned index, UserOrKernelBuffer&) const; bool write_block(unsigned index, const UserOrKernelBuffer&); - bool read_raw(u32 offset, unsigned length, UserOrKernelBuffer&) const; - bool write_raw(u32 offset, unsigned length, const UserOrKernelBuffer&); virtual bool read_blocks(unsigned index, u16 count, UserOrKernelBuffer&) = 0; virtual bool write_blocks(unsigned index, u16 count, const UserOrKernelBuffer&) = 0;