diff options
| author | 2020-04-08 21:10:02 -0400 | |
|---|---|---|
| committer | 2020-04-17 00:59:33 -0400 | |
| commit | 77382ac2b2d29b69b2a1140ba43e6a178ff4187f (patch) | |
| tree | 934f8c01534ccdb92da20afe38be143619b8c971 | |
| parent | service: time: Update for new shared memory layout. (diff) | |
| download | yuzu-77382ac2b2d29b69b2a1140ba43e6a178ff4187f.tar.gz yuzu-77382ac2b2d29b69b2a1140ba43e6a178ff4187f.tar.xz yuzu-77382ac2b2d29b69b2a1140ba43e6a178ff4187f.zip | |
service: pl_u: Update for new shared memory layout.
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index 8da4e52c5..ab1746d28 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include "core/file_sys/romfs.h" | 19 | #include "core/file_sys/romfs.h" |
| 20 | #include "core/file_sys/system_archive/system_archive.h" | 20 | #include "core/file_sys/system_archive/system_archive.h" |
| 21 | #include "core/hle/ipc_helpers.h" | 21 | #include "core/hle/ipc_helpers.h" |
| 22 | #include "core/hle/kernel/kernel.h" | ||
| 22 | #include "core/hle/kernel/physical_memory.h" | 23 | #include "core/hle/kernel/physical_memory.h" |
| 23 | #include "core/hle/kernel/shared_memory.h" | 24 | #include "core/hle/kernel/shared_memory.h" |
| 24 | #include "core/hle/service/filesystem/filesystem.h" | 25 | #include "core/hle/service/filesystem/filesystem.h" |
| @@ -265,16 +266,13 @@ void PL_U::GetSharedMemoryAddressOffset(Kernel::HLERequestContext& ctx) { | |||
| 265 | void PL_U::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) { | 266 | void PL_U::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) { |
| 266 | // Map backing memory for the font data | 267 | // Map backing memory for the font data |
| 267 | LOG_DEBUG(Service_NS, "called"); | 268 | LOG_DEBUG(Service_NS, "called"); |
| 268 | system.CurrentProcess()->VMManager().MapMemoryBlock(SHARED_FONT_MEM_VADDR, impl->shared_font, 0, | ||
| 269 | SHARED_FONT_MEM_SIZE, | ||
| 270 | Kernel::MemoryState::Shared); | ||
| 271 | 269 | ||
| 272 | // Create shared font memory object | 270 | // Create shared font memory object |
| 273 | auto& kernel = system.Kernel(); | 271 | auto& kernel = system.Kernel(); |
| 274 | impl->shared_font_mem = Kernel::SharedMemory::Create( | 272 | impl->shared_font_mem = SharedFrom(&kernel.GetFontSharedMem()); |
| 275 | kernel, system.CurrentProcess(), SHARED_FONT_MEM_SIZE, Kernel::MemoryPermission::ReadWrite, | 273 | |
| 276 | Kernel::MemoryPermission::Read, SHARED_FONT_MEM_VADDR, Kernel::MemoryRegion::BASE, | 274 | std::memcpy(impl->shared_font_mem->GetPointer(), impl->shared_font->data(), |
| 277 | "PL_U:shared_font_mem"); | 275 | impl->shared_font->size()); |
| 278 | 276 | ||
| 279 | IPC::ResponseBuilder rb{ctx, 2, 1}; | 277 | IPC::ResponseBuilder rb{ctx, 2, 1}; |
| 280 | rb.Push(RESULT_SUCCESS); | 278 | rb.Push(RESULT_SUCCESS); |