yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #338 from bunnei/unrequire-shared-font 

pl_u: Use empty shared font if none is available.
This commit is contained in:
bunnei 2018-04-15 16:54:36 -04:00 committed by GitHub
parent d6d7d0989c ac628f139d
commit 44e09ba807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/hle/service/ns/pl_u.cpp
View File

@ -47,10 +47,10 @@ PL_U::PL_U() : ServiceFramework("pl:u") {
FileUtil::CreateFullPath(filepath); // Create path if not already created FileUtil::CreateFullPath(filepath); // Create path if not already created
FileUtil::IOFile file(filepath, "rb"); FileUtil::IOFile file(filepath, "rb");
shared_font = std::make_shared<std::vector<u8>>(SHARED_FONT_MEM_SIZE);
if (file.IsOpen()) { if (file.IsOpen()) {
// Read shared font data // Read shared font data
ASSERT(file.GetSize() == SHARED_FONT_MEM_SIZE); ASSERT(file.GetSize() == SHARED_FONT_MEM_SIZE);
shared_font = std::make_shared<std::vector<u8>>(static_cast<size_t>(file.GetSize()));
file.ReadBytes(shared_font->data(), shared_font->size()); file.ReadBytes(shared_font->data(), shared_font->size());
} else { } else {
LOG_WARNING(Service_NS, "Unable to load shared font: %s", filepath.c_str()); LOG_WARNING(Service_NS, "Unable to load shared font: %s", filepath.c_str());
@ -97,22 +97,19 @@ void PL_U::GetSharedMemoryAddressOffset(Kernel::HLERequestContext& ctx) {
} }
void PL_U::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) { void PL_U::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) {
if (shared_font != nullptr) { // TODO(bunnei): This is a less-than-ideal solution to load a RAM dump of the Switch shared
// TODO(bunnei): This is a less-than-ideal solution to load a RAM dump of the Switch shared // font data. This (likely) relies on exact address, size, and offsets from the original
// font data. This (likely) relies on exact address, size, and offsets from the original // dump. In the future, we need to replace this with a more robust solution.
// dump. In the future, we need to replace this with a more robust solution.
// Map backing memory for the font data // Map backing memory for the font data
Core::CurrentProcess()->vm_manager.MapMemoryBlock(SHARED_FONT_MEM_VADDR, shared_font, 0, Core::CurrentProcess()->vm_manager.MapMemoryBlock(
SHARED_FONT_MEM_SIZE, SHARED_FONT_MEM_VADDR, shared_font, 0, SHARED_FONT_MEM_SIZE, Kernel::MemoryState::Shared);
Kernel::MemoryState::Shared);
// Create shared font memory object // Create shared font memory object
shared_font_mem = Kernel::SharedMemory::Create( shared_font_mem = Kernel::SharedMemory::Create(
Core::CurrentProcess(), SHARED_FONT_MEM_SIZE, Kernel::MemoryPermission::ReadWrite, Core::CurrentProcess(), SHARED_FONT_MEM_SIZE, Kernel::MemoryPermission::ReadWrite,
Kernel::MemoryPermission::Read, SHARED_FONT_MEM_VADDR, Kernel::MemoryRegion::BASE, Kernel::MemoryPermission::Read, SHARED_FONT_MEM_VADDR, Kernel::MemoryRegion::BASE,
"PL_U:shared_font_mem"); "PL_U:shared_font_mem");
}
LOG_DEBUG(Service_NS, "called"); LOG_DEBUG(Service_NS, "called");
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};