diff options
| -rw-r--r-- | src/core/file_sys/archive.h | 19 | ||||
| -rw-r--r-- | src/core/file_sys/archive_romfs.cpp | 27 | ||||
| -rw-r--r-- | src/core/file_sys/archive_romfs.h | 19 | ||||
| -rw-r--r-- | src/core/hle/kernel/archive.cpp | 34 |
4 files changed, 88 insertions, 11 deletions
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 */ @@ -35,12 +35,31 @@ size_t Archive_RomFS::Read(const u64 offset, const u32 length, u8* buffer) const } /** + * 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<u8> raw_data; diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp index 5079fcb84..1596367c3 100644 --- a/src/core/hle/kernel/archive.cpp +++ b/src/core/hle/kernel/archive.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "common/common_types.h" +#include "common/math_util.h" #include "core/file_sys/archive.h" #include "core/hle/service/service.h" @@ -48,23 +49,50 @@ public: Result SyncRequest(bool* wait) { u32* cmd_buff = Service::GetCommandBuffer(); FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]); + switch (cmd) { - // Read from archive... case FileCommand::Read: { - u64 offset = cmd_buff[1] | ((u64) cmd_buff[2]) << 32; + u64 offset = cmd_buff[1] | ((u64)cmd_buff[2] << 32); u32 length = cmd_buff[3]; u32 address = cmd_buff[5]; + + // Number of bytes read cmd_buff[2] = backend->Read(offset, length, Memory::GetPointer(address)); break; } + // Write to archive... + case FileCommand::Write: + { + u64 offset = cmd_buff[1] | ((u64)cmd_buff[2] << 32); + u32 length = cmd_buff[3]; + u32 flush = cmd_buff[4]; + u32 address = cmd_buff[6]; + // Number of bytes written + cmd_buff[2] = backend->Write(offset, length, flush, Memory::GetPointer(address)); + break; + } + case FileCommand::GetSize: + { + u64 filesize = (u64) backend->GetSize(); + cmd_buff[2] = (u32) filesize; // Lower word + cmd_buff[3] = (u32) (filesize >> 32); // Upper word + break; + } + case FileCommand::SetSize: + { + backend->SetSize(cmd_buff[1] | ((u64)cmd_buff[2] << 32)); + break; + } // Unknown command... default: + { ERROR_LOG(KERNEL, "Unknown command=0x%08X!", cmd); return -1; } + } cmd_buff[1] = 0; // No error return 0; } @@ -140,7 +168,7 @@ Archive* CreateArchive(Handle& handle, FileSys::Archive* backend, const std::str */ Handle CreateArchive(FileSys::Archive* backend, const std::string& name) { Handle handle; - Archive* archive = CreateArchive(handle, backend, name); + CreateArchive(handle, backend, name); return handle; } |