From 4c4a01bf413eab37394e76683790cebe08d57922 Mon Sep 17 00:00:00 2001 From: archshift Date: Wed, 20 Aug 2014 22:03:31 -0700 Subject: Added FS functions to Archive and Archive_RomFS --- src/core/file_sys/archive.h | 19 +++++++++++++++++-- src/core/file_sys/archive_romfs.cpp | 27 +++++++++++++++++++++++---- src/core/file_sys/archive_romfs.h | 19 +++++++++++++++++-- 3 files changed, 57 insertions(+), 8 deletions(-) (limited to 'src/core/file_sys') diff --git a/src/core/file_sys/archive.h b/src/core/file_sys/archive.h index ed2d83640..ac5630bea 100644 --- a/src/core/file_sys/archive.h +++ b/src/core/file_sys/archive.h @@ -37,18 +37,33 @@ public: /** * Read data from the archive - * @param offset Offset in bytes to start reading archive from - * @param length Length in bytes to read data from archive + * @param offset Offset in bytes to start reading data from + * @param length Length in bytes of data to read from archive * @param buffer Buffer to read data into * @return Number of bytes read */ virtual size_t Read(const u64 offset, const u32 length, u8* buffer) const = 0; + /** + * Write data to the archive + * @param offset Offset in bytes to start writing data to + * @param length Length in bytes of data to write to archive + * @param buffer Buffer to write data from + * @param flush The flush parameters (0 == do not flush) + * @return Number of bytes written + */ + virtual size_t Write(const u64 offset, const u32 length, const u32 flush, u8* buffer) = 0; + /** * Get the size of the archive in bytes * @return Size of the archive in bytes */ virtual size_t GetSize() const = 0; + + /** + * Set the size of the archive in bytes + */ + virtual void SetSize(const u64 size) = 0; }; } // namespace FileSys diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp index fd84b9c8c..dc3fb1807 100644 --- a/src/core/file_sys/archive_romfs.cpp +++ b/src/core/file_sys/archive_romfs.cpp @@ -23,8 +23,8 @@ Archive_RomFS::~Archive_RomFS() { /** * Read data from the archive - * @param offset Offset in bytes to start reading archive from - * @param length Length in bytes to read data from archive + * @param offset Offset in bytes to start reading data from + * @param length Length in bytes of data to read from archive * @param buffer Buffer to read data into * @return Number of bytes read */ @@ -34,13 +34,32 @@ size_t Archive_RomFS::Read(const u64 offset, const u32 length, u8* buffer) const return length; } +/** + * Write data to the archive + * @param offset Offset in bytes to start writing data to + * @param length Length in bytes of data to write to archive + * @param buffer Buffer to write data from + * @param flush The flush parameters (0 == do not flush) + * @return Number of bytes written + */ +size_t Archive_RomFS::Write(const u64 offset, const u32 length, const u32 flush, u8* buffer) { + ERROR_LOG(FILESYS, "Attempted to write to ROMFS."); + return 0; +} + /** * Get the size of the archive in bytes * @return Size of the archive in bytes */ size_t Archive_RomFS::GetSize() const { - ERROR_LOG(FILESYS, "(UNIMPLEMENTED)"); - return 0; + return sizeof(u8) * raw_data.size(); +} + +/** + * Set the size of the archive in bytes + */ +void Archive_RomFS::SetSize(const u64 size) { + ERROR_LOG(FILESYS, "Attempted to set the size of ROMFS"); } } // namespace FileSys diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h index 8a31190a9..e9ed6f77a 100644 --- a/src/core/file_sys/archive_romfs.h +++ b/src/core/file_sys/archive_romfs.h @@ -30,18 +30,33 @@ public: /** * Read data from the archive - * @param offset Offset in bytes to start reading archive from - * @param length Length in bytes to read data from archive + * @param offset Offset in bytes to start reading data from + * @param length Length in bytes of data to read from archive * @param buffer Buffer to read data into * @return Number of bytes read */ size_t Read(const u64 offset, const u32 length, u8* buffer) const override; + /** + * Write data to the archive + * @param offset Offset in bytes to start writing data to + * @param length Length in bytes of data to write to archive + * @param buffer Buffer to write data from + * @param flush The flush parameters (0 == do not flush) + * @return Number of bytes written + */ + size_t Write(const u64 offset, const u32 length, const u32 flush, u8* buffer) override; + /** * Get the size of the archive in bytes * @return Size of the archive in bytes */ size_t GetSize() const override; + + /** + * Set the size of the archive in bytes + */ + void SetSize(const u64 size) override; private: std::vector raw_data; -- cgit v1.2.3