Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 07:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge remote-tracking branch 'upstream/master' into moar-gpu

Browse source
This commit is contained in:
wheremyfoodat 2023-08-06 17:00:16 +03:00
commit b566f951ce
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/memory.cpp
View file

@ -394,7 +394,8 @@ MemoryInfo Memory::queryMemory(u32 vaddr) {
u8* Memory::mapSharedMemory(Handle handle, u32 vaddr, u32 myPerms, u32 otherPerms) {
for (auto& e : sharedMemBlocks) {
if (e.handle == handle) {
if (e.mapped) Helpers::panic("Allocated shared memory block twice. Is this allowed?");
// Virtual Console titles trigger this. TODO: Investigate how it should work
if (e.mapped) Helpers::warn("Allocated shared memory block twice. Is this allowed?");
const u32 paddr = e.paddr;
const u32 size = e.size;

4
src/core/services/apt.cpp
View file

@ -242,7 +242,7 @@ void APTService::getApplicationCpuTimeLimit(u32 messagePointer) {
void APTService::setScreencapPostPermission(u32 messagePointer) {
u32 perm = mem.read32(messagePointer + 4);
log("APT::SetScreencapPostPermission (perm = %d)\n");
log("APT::SetScreencapPostPermission (perm = %d)\n", perm);
mem.write32(messagePointer, IPC::responseHeader(0x55, 1, 0));
// Apparently only 1-3 are valid values, but I see 0 used in some games like Pokemon Rumble
@ -282,4 +282,4 @@ void APTService::getWirelessRebootInfo(u32 messagePointer) {
for (u32 i = 0; i < size; i++) {
mem.write8(messagePointer + 0x104 + i, 0); // Temporarily stub this until we add SetWirelessRebootInfo
}
}
}