diff options
| -rw-r--r-- | src/core/hle/service/fs/archive.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index f21934108..09205e4b2 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp | |||
| @@ -104,8 +104,8 @@ void File::HandleSyncRequest(Kernel::SharedPtr<Kernel::ServerSession> server_ses | |||
| 104 | u64 offset = cmd_buff[1] | ((u64)cmd_buff[2]) << 32; | 104 | u64 offset = cmd_buff[1] | ((u64)cmd_buff[2]) << 32; |
| 105 | u32 length = cmd_buff[3]; | 105 | u32 length = cmd_buff[3]; |
| 106 | u32 address = cmd_buff[5]; | 106 | u32 address = cmd_buff[5]; |
| 107 | LOG_TRACE(Service_FS, "Read %s %s: offset=0x%llx length=%d address=0x%x", | 107 | LOG_TRACE(Service_FS, "Read %s: offset=0x%llx length=%d address=0x%x", GetName().c_str(), |
| 108 | GetTypeName().c_str(), GetName().c_str(), offset, length, address); | 108 | offset, length, address); |
| 109 | 109 | ||
| 110 | if (offset + length > backend->GetSize()) { | 110 | if (offset + length > backend->GetSize()) { |
| 111 | LOG_ERROR(Service_FS, | 111 | LOG_ERROR(Service_FS, |
| @@ -130,8 +130,8 @@ void File::HandleSyncRequest(Kernel::SharedPtr<Kernel::ServerSession> server_ses | |||
| 130 | u32 length = cmd_buff[3]; | 130 | u32 length = cmd_buff[3]; |
| 131 | u32 flush = cmd_buff[4]; | 131 | u32 flush = cmd_buff[4]; |
| 132 | u32 address = cmd_buff[6]; | 132 | u32 address = cmd_buff[6]; |
| 133 | LOG_TRACE(Service_FS, "Write %s %s: offset=0x%llx length=%d address=0x%x, flush=0x%x", | 133 | LOG_TRACE(Service_FS, "Write %s: offset=0x%llx length=%d address=0x%x, flush=0x%x", |
| 134 | GetTypeName().c_str(), GetName().c_str(), offset, length, address, flush); | 134 | GetName().c_str(), offset, length, address, flush); |
| 135 | 135 | ||
| 136 | std::vector<u8> data(length); | 136 | std::vector<u8> data(length); |
| 137 | Memory::ReadBlock(address, data.data(), data.size()); | 137 | Memory::ReadBlock(address, data.data(), data.size()); |
| @@ -145,7 +145,7 @@ void File::HandleSyncRequest(Kernel::SharedPtr<Kernel::ServerSession> server_ses | |||
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | case FileCommand::GetSize: { | 147 | case FileCommand::GetSize: { |
| 148 | LOG_TRACE(Service_FS, "GetSize %s %s", GetTypeName().c_str(), GetName().c_str()); | 148 | LOG_TRACE(Service_FS, "GetSize %s", GetName().c_str()); |
| 149 | u64 size = backend->GetSize(); | 149 | u64 size = backend->GetSize(); |
| 150 | cmd_buff[2] = (u32)size; | 150 | cmd_buff[2] = (u32)size; |
| 151 | cmd_buff[3] = size >> 32; | 151 | cmd_buff[3] = size >> 32; |
| @@ -154,14 +154,13 @@ void File::HandleSyncRequest(Kernel::SharedPtr<Kernel::ServerSession> server_ses | |||
| 154 | 154 | ||
| 155 | case FileCommand::SetSize: { | 155 | case FileCommand::SetSize: { |
| 156 | u64 size = cmd_buff[1] | ((u64)cmd_buff[2] << 32); | 156 | u64 size = cmd_buff[1] | ((u64)cmd_buff[2] << 32); |
| 157 | LOG_TRACE(Service_FS, "SetSize %s %s size=%llu", GetTypeName().c_str(), GetName().c_str(), | 157 | LOG_TRACE(Service_FS, "SetSize %s size=%llu", GetName().c_str(), size); |
| 158 | size); | ||
| 159 | backend->SetSize(size); | 158 | backend->SetSize(size); |
| 160 | break; | 159 | break; |
| 161 | } | 160 | } |
| 162 | 161 | ||
| 163 | case FileCommand::Close: { | 162 | case FileCommand::Close: { |
| 164 | LOG_TRACE(Service_FS, "Close %s %s", GetTypeName().c_str(), GetName().c_str()); | 163 | LOG_TRACE(Service_FS, "Close %s", GetName().c_str()); |
| 165 | backend->Close(); | 164 | backend->Close(); |
| 166 | break; | 165 | break; |
| 167 | } | 166 | } |
| @@ -219,8 +218,7 @@ void Directory::HandleSyncRequest(Kernel::SharedPtr<Kernel::ServerSession> serve | |||
| 219 | u32 count = cmd_buff[1]; | 218 | u32 count = cmd_buff[1]; |
| 220 | u32 address = cmd_buff[3]; | 219 | u32 address = cmd_buff[3]; |
| 221 | std::vector<FileSys::Entry> entries(count); | 220 | std::vector<FileSys::Entry> entries(count); |
| 222 | LOG_TRACE(Service_FS, "Read %s %s: count=%d", GetTypeName().c_str(), GetName().c_str(), | 221 | LOG_TRACE(Service_FS, "Read %s: count=%d", GetName().c_str(), count); |
| 223 | count); | ||
| 224 | 222 | ||
| 225 | // Number of entries actually read | 223 | // Number of entries actually read |
| 226 | u32 read = backend->Read(entries.size(), entries.data()); | 224 | u32 read = backend->Read(entries.size(), entries.data()); |
| @@ -230,7 +228,7 @@ void Directory::HandleSyncRequest(Kernel::SharedPtr<Kernel::ServerSession> serve | |||
| 230 | } | 228 | } |
| 231 | 229 | ||
| 232 | case DirectoryCommand::Close: { | 230 | case DirectoryCommand::Close: { |
| 233 | LOG_TRACE(Service_FS, "Close %s %s", GetTypeName().c_str(), GetName().c_str()); | 231 | LOG_TRACE(Service_FS, "Close %s", GetName().c_str()); |
| 234 | backend->Close(); | 232 | backend->Close(); |
| 235 | break; | 233 | break; |
| 236 | } | 234 | } |