diff options
author | bunnei <bunneidev@gmail.com> | 2019-04-04 03:54:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-04 03:54:32 +0200 |
commit | acde8d3f687856d05e3b4371498f8c622ba437ca (patch) | |
tree | 87238a87937044f0b3dd74cc1a06966277a85c21 /src/core/hle/service | |
parent | Merge pull request #2095 from FreddyFunk/open-transferable-shader-cache (diff) | |
parent | service/am: Correct behavior of CreateTransferMemoryStorage() (diff) | |
download | yuzu-acde8d3f687856d05e3b4371498f8c622ba437ca.tar yuzu-acde8d3f687856d05e3b4371498f8c622ba437ca.tar.gz yuzu-acde8d3f687856d05e3b4371498f8c622ba437ca.tar.bz2 yuzu-acde8d3f687856d05e3b4371498f8c622ba437ca.tar.lz yuzu-acde8d3f687856d05e3b4371498f8c622ba437ca.tar.xz yuzu-acde8d3f687856d05e3b4371498f8c622ba437ca.tar.zst yuzu-acde8d3f687856d05e3b4371498f8c622ba437ca.zip |
Diffstat (limited to 'src/core/hle/service')
-rw-r--r-- | src/core/hle/service/am/am.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index d31ab7970..a13433bcf 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -13,7 +13,7 @@ #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/process.h" #include "core/hle/kernel/readable_event.h" -#include "core/hle/kernel/shared_memory.h" +#include "core/hle/kernel/transfer_memory.h" #include "core/hle/kernel/writable_event.h" #include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/am/am.h" @@ -931,19 +931,19 @@ void ILibraryAppletCreator::CreateTransferMemoryStorage(Kernel::HLERequestContex rp.SetCurrentOffset(3); const auto handle{rp.Pop<Kernel::Handle>()}; - const auto shared_mem = - Core::System::GetInstance().CurrentProcess()->GetHandleTable().Get<Kernel::SharedMemory>( + const auto transfer_mem = + Core::System::GetInstance().CurrentProcess()->GetHandleTable().Get<Kernel::TransferMemory>( handle); - if (shared_mem == nullptr) { + if (transfer_mem == nullptr) { LOG_ERROR(Service_AM, "shared_mem is a nullpr for handle={:08X}", handle); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultCode(-1)); return; } - const u8* mem_begin = shared_mem->GetPointer(); - const u8* mem_end = mem_begin + shared_mem->GetSize(); + const u8* const mem_begin = transfer_mem->GetPointer(); + const u8* const mem_end = mem_begin + transfer_mem->GetSize(); std::vector<u8> memory{mem_begin, mem_end}; IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |