diff options
| author | David Marcec <dmarcecguzman@gmail.com> | 2019-09-22 16:35:43 +1000 |
|---|---|---|
| committer | David Marcec <dmarcecguzman@gmail.com> | 2019-09-22 16:35:43 +1000 |
| commit | f21ab654db620198b388bd25cd0db4c2085c4c8a (patch) | |
| tree | 4a787355d020e7df09dd0c032f1892f08009e0de /src/core/hle/service/ns/pl_u.cpp | |
| parent | 8d3ff2b12723b577909e5996fffcc1532b6fbad6 (diff) | |
Rebase
Diffstat (limited to 'src/core/hle/service/ns/pl_u.cpp')
| -rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index 8f0c6bc07..4f9b843e6 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp @@ -145,8 +145,9 @@ struct PL_U::Impl { std::vector<FontRegion> shared_font_regions; }; -PL_U::PL_U(FileSystem::FileSystemController& fsc) - : ServiceFramework("pl:u"), impl{std::make_unique<Impl>()} { +PL_U::PL_U(Core::System& system, FileSystem::FileSystemController& fsc) + : ServiceFramework("pl:u"), impl{std::make_unique<Impl>()}, system(system) { + static const FunctionInfo functions[] = { {0, &PL_U::RequestLoad, "RequestLoad"}, {1, &PL_U::GetLoadState, "GetLoadState"}, @@ -255,7 +256,7 @@ void PL_U::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) { Kernel::MemoryState::Shared); // Create shared font memory object - auto& kernel = Core::System::GetInstance().Kernel(); + auto& kernel = system.Kernel(); impl->shared_font_mem = Kernel::SharedMemory::Create( kernel, Core::CurrentProcess(), SHARED_FONT_MEM_SIZE, Kernel::MemoryPermission::ReadWrite, Kernel::MemoryPermission::Read, SHARED_FONT_MEM_VADDR, Kernel::MemoryRegion::BASE, |