diff options
| author | 2019-04-13 22:09:58 -0400 | |
|---|---|---|
| committer | 2019-04-13 22:09:58 -0400 | |
| commit | a788c861bdd2b9622a73c511c5b626ee65f613a4 (patch) | |
| tree | a1ebbd99b34b97b07ea5eaa08466ee0311a92361 /src | |
| parent | Merge pull request #2386 from ReinUsesLisp/shader-manager (diff) | |
| parent | fsp_srv: Remove unnecessary parameter popping in IDirectory's Read() (diff) | |
| download | yuzu-a788c861bdd2b9622a73c511c5b626ee65f613a4.tar.gz yuzu-a788c861bdd2b9622a73c511c5b626ee65f613a4.tar.xz yuzu-a788c861bdd2b9622a73c511c5b626ee65f613a4.zip | |
Merge pull request #2381 from lioncash/fs
fsp_srv: Minor cleanup related changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/filesystem/fsp_srv.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index 657baddb8..0249b6992 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp | |||
| @@ -115,11 +115,12 @@ private: | |||
| 115 | 115 | ||
| 116 | void Read(Kernel::HLERequestContext& ctx) { | 116 | void Read(Kernel::HLERequestContext& ctx) { |
| 117 | IPC::RequestParser rp{ctx}; | 117 | IPC::RequestParser rp{ctx}; |
| 118 | const u64 unk = rp.Pop<u64>(); | 118 | const u64 option = rp.Pop<u64>(); |
| 119 | const s64 offset = rp.Pop<s64>(); | 119 | const s64 offset = rp.Pop<s64>(); |
| 120 | const s64 length = rp.Pop<s64>(); | 120 | const s64 length = rp.Pop<s64>(); |
| 121 | 121 | ||
| 122 | LOG_DEBUG(Service_FS, "called, offset=0x{:X}, length={}", offset, length); | 122 | LOG_DEBUG(Service_FS, "called, option={}, offset=0x{:X}, length={}", option, offset, |
| 123 | length); | ||
| 123 | 124 | ||
| 124 | // Error checking | 125 | // Error checking |
| 125 | if (length < 0) { | 126 | if (length < 0) { |
| @@ -148,11 +149,12 @@ private: | |||
| 148 | 149 | ||
| 149 | void Write(Kernel::HLERequestContext& ctx) { | 150 | void Write(Kernel::HLERequestContext& ctx) { |
| 150 | IPC::RequestParser rp{ctx}; | 151 | IPC::RequestParser rp{ctx}; |
| 151 | const u64 unk = rp.Pop<u64>(); | 152 | const u64 option = rp.Pop<u64>(); |
| 152 | const s64 offset = rp.Pop<s64>(); | 153 | const s64 offset = rp.Pop<s64>(); |
| 153 | const s64 length = rp.Pop<s64>(); | 154 | const s64 length = rp.Pop<s64>(); |
| 154 | 155 | ||
| 155 | LOG_DEBUG(Service_FS, "called, offset=0x{:X}, length={}", offset, length); | 156 | LOG_DEBUG(Service_FS, "called, option={}, offset=0x{:X}, length={}", option, offset, |
| 157 | length); | ||
| 156 | 158 | ||
| 157 | // Error checking | 159 | // Error checking |
| 158 | if (length < 0) { | 160 | if (length < 0) { |
| @@ -250,10 +252,7 @@ private: | |||
| 250 | u64 next_entry_index = 0; | 252 | u64 next_entry_index = 0; |
| 251 | 253 | ||
| 252 | void Read(Kernel::HLERequestContext& ctx) { | 254 | void Read(Kernel::HLERequestContext& ctx) { |
| 253 | IPC::RequestParser rp{ctx}; | 255 | LOG_DEBUG(Service_FS, "called."); |
| 254 | const u64 unk = rp.Pop<u64>(); | ||
| 255 | |||
| 256 | LOG_DEBUG(Service_FS, "called, unk=0x{:X}", unk); | ||
| 257 | 256 | ||
| 258 | // Calculate how many entries we can fit in the output buffer | 257 | // Calculate how many entries we can fit in the output buffer |
| 259 | const u64 count_entries = ctx.GetWriteBufferSize() / sizeof(FileSys::Entry); | 258 | const u64 count_entries = ctx.GetWriteBufferSize() / sizeof(FileSys::Entry); |