diff options
| author | 2018-01-07 21:25:01 -0500 | |
|---|---|---|
| committer | 2018-01-10 23:28:02 -0500 | |
| commit | ab86b80cac890399886efe1ed084e1cb7a3aacb4 (patch) | |
| tree | bf2cf1b3fd0fec6675d898682a0b8eb42657abb0 /src | |
| parent | svc: Stub ResetSignal and CreateTransferMemory (diff) | |
| download | yuzu-ab86b80cac890399886efe1ed084e1cb7a3aacb4.tar.gz yuzu-ab86b80cac890399886efe1ed084e1cb7a3aacb4.tar.xz yuzu-ab86b80cac890399886efe1ed084e1cb7a3aacb4.zip | |
IPC: Corrected some definitions for the buffer C descriptor flags.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/ipc.h | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.h | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h index c2f481624..ec08be0f4 100644 --- a/src/core/hle/ipc.h +++ b/src/core/hle/ipc.h | |||
| @@ -48,8 +48,8 @@ struct CommandHeader { | |||
| 48 | 48 | ||
| 49 | enum class BufferDescriptorCFlag : u32 { | 49 | enum class BufferDescriptorCFlag : u32 { |
| 50 | Disabled = 0, | 50 | Disabled = 0, |
| 51 | NoDescriptor = 1, | 51 | InlineDescriptor = 1, |
| 52 | TwoDesciptors = 2, | 52 | OneDescriptor = 2, |
| 53 | }; | 53 | }; |
| 54 | 54 | ||
| 55 | union { | 55 | union { |
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 1c6adb4a0..ee47c9654 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp | |||
| @@ -83,7 +83,10 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) { | |||
| 83 | } | 83 | } |
| 84 | if (command_header->buf_c_descriptor_flags != | 84 | if (command_header->buf_c_descriptor_flags != |
| 85 | IPC::CommandHeader::BufferDescriptorCFlag::Disabled) { | 85 | IPC::CommandHeader::BufferDescriptorCFlag::Disabled) { |
| 86 | UNIMPLEMENTED(); | 86 | if (command_header->buf_c_descriptor_flags != |
| 87 | IPC::CommandHeader::BufferDescriptorCFlag::OneDescriptor) { | ||
| 88 | UNIMPLEMENTED(); | ||
| 89 | } | ||
| 87 | } | 90 | } |
| 88 | 91 | ||
| 89 | // Padding to align to 16 bytes | 92 | // Padding to align to 16 bytes |
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 266fcf9c1..8c26285e5 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h | |||
| @@ -139,6 +139,10 @@ public: | |||
| 139 | return buffer_a_desciptors; | 139 | return buffer_a_desciptors; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | const std::vector<IPC::BufferDescriptorABW>& BufferDescriptorB() const { | ||
| 143 | return buffer_b_desciptors; | ||
| 144 | } | ||
| 145 | |||
| 142 | const std::unique_ptr<IPC::DomainMessageHeader>& GetDomainMessageHeader() const { | 146 | const std::unique_ptr<IPC::DomainMessageHeader>& GetDomainMessageHeader() const { |
| 143 | return domain_message_header; | 147 | return domain_message_header; |
| 144 | } | 148 | } |