thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

3DS: Upgrade to libctru v2.0.0

Browse source
This commit is contained in:
Bastien Bouclet 2020-07-19 17:33:47 +02:00
parent 5b69df78d4
commit 4825e9f967
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
backends/platform/3ds/osystem-events.cpp
View file

@ -228,17 +228,8 @@ static void aptHookFunc(APT_HookType hookType, void *param) {
osys->sleeping = false; osys->sleeping = false;
loadConfig(); loadConfig();
break; break;
case APTHOOK_ONEXIT: { case APTHOOK_ONEXIT:
if (osys->_sleepPauseToken.isActive()) {
osys->_sleepPauseToken.clear();
}
Common::StackLock lock(*eventMutex);
Common::Event event;
event.type = Common::EVENT_QUIT;
g_system->getEventManager()->pushEvent(event);
break; break;
}
default: default:
warning("Unhandled APT hook, type: %d", hookType); warning("Unhandled APT hook, type: %d", hookType);
} }
@ -349,7 +340,15 @@ Common::KeymapperDefaultBindings *OSystem_3DS::getKeymapperDefaultBindings() {
} }
bool OSystem_3DS::pollEvent(Common::Event &event) { bool OSystem_3DS::pollEvent(Common::Event &event) {
aptMainLoop(); // Call apt hook when necessary if (!aptMainLoop()) {
// The system requested us to quit
if (_sleepPauseToken.isActive()) {
_sleepPauseToken.clear();
}
event.type = Common::EVENT_QUIT;
return true;
}
// If magnify mode is on when returning to Launcher, turn it off // If magnify mode is on when returning to Launcher, turn it off
if (_eventManager->shouldReturnToLauncher()) { if (_eventManager->shouldReturnToLauncher()) {

2
backends/plugins/3ds/3ds-provider.cpp
View file

@ -51,7 +51,7 @@ protected:
uint32 _segmentHeapAddress; uint32 _segmentHeapAddress;
void flushDataCache(void *ptr, uint32 len) const override { void flushDataCache(void *ptr, uint32 len) const override {
svcFlushProcessDataCache(CUR_PROCESS_HANDLE, ptr, len); svcFlushProcessDataCache(CUR_PROCESS_HANDLE, (uint32)ptr, len);
} }
void protectMemory(void *ptr, uint32 len, int prot) const override { void protectMemory(void *ptr, uint32 len, int prot) const override {