From c83f69841f96d25ba15d4ee8adde527fdeb8400d Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 5 Feb 2018 20:58:11 -0500 Subject: IApplicationFunctions: Stub out EnsureSaveData. --- src/core/hle/service/am/am.cpp | 7 +++++++ src/core/hle/service/am/am.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index eb4a04c53..b3341d9ad 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -270,6 +270,7 @@ private: IApplicationFunctions::IApplicationFunctions() : ServiceFramework("IApplicationFunctions") { static const FunctionInfo functions[] = { {1, &IApplicationFunctions::PopLaunchParameter, "PopLaunchParameter"}, + {20, &IApplicationFunctions::EnsureSaveData, "EnsureSaveData"}, {21, &IApplicationFunctions::GetDesiredLanguage, "GetDesiredLanguage"}, {22, &IApplicationFunctions::SetTerminateResult, "SetTerminateResult"}, {66, &IApplicationFunctions::InitializeGamePlayRecording, "InitializeGamePlayRecording"}, @@ -299,6 +300,12 @@ void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); } +void IApplicationFunctions::EnsureSaveData(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service, "(STUBBED) called"); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); +} + void IApplicationFunctions::SetTerminateResult(Kernel::HLERequestContext& ctx) { // Takes an input u32 Result, no output. // For example, in some cases official apps use this with error 0x2A2 then uses svcBreak. diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index b603c17dd..0f17f8377 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -100,6 +100,7 @@ public: private: void PopLaunchParameter(Kernel::HLERequestContext& ctx); + void EnsureSaveData(Kernel::HLERequestContext& ctx); void SetTerminateResult(Kernel::HLERequestContext& ctx); void GetDesiredLanguage(Kernel::HLERequestContext& ctx); void InitializeGamePlayRecording(Kernel::HLERequestContext& ctx); -- cgit v1.2.3 From 1963222933d7b354979a5f6a820804162d799a2c Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 5 Feb 2018 21:53:11 -0500 Subject: hid: Stub ActivateTouchScreen and SetNpadJoyHoldType. --- src/core/hle/service/hid/hid.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index be058a64e..9c2e405ee 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -174,12 +174,12 @@ public: static const FunctionInfo functions[] = { {0, &Hid::CreateAppletResource, "CreateAppletResource"}, {1, &Hid::ActivateDebugPad, "ActivateDebugPad"}, - {11, nullptr, "ActivateTouchScreen"}, + {11, &Hid::ActivateTouchScreen, "ActivateTouchScreen"}, {66, &Hid::StartSixAxisSensor, "StartSixAxisSensor"}, {100, &Hid::SetSupportedNpadStyleSet, "SetSupportedNpadStyleSet"}, {102, &Hid::SetSupportedNpadIdType, "SetSupportedNpadIdType"}, {103, &Hid::ActivateNpad, "ActivateNpad"}, - {120, nullptr, "SetNpadJoyHoldType"}, + {120, &Hid::SetNpadJoyHoldType, "SetNpadJoyHoldType"}, {124, nullptr, "SetNpadJoyAssignmentModeDual"}, {203, &Hid::CreateActiveVibrationDeviceList, "CreateActiveVibrationDeviceList"}, }; @@ -207,6 +207,12 @@ private: LOG_WARNING(Service_HID, "(STUBBED) called"); } + void ActivateTouchScreen(Kernel::HLERequestContext& ctx) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + LOG_WARNING(Service_HID, "(STUBBED) called"); + } + void StartSixAxisSensor(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); @@ -231,6 +237,12 @@ private: LOG_WARNING(Service_HID, "(STUBBED) called"); } + void SetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + LOG_WARNING(Service_HID, "(STUBBED) called"); + } + void CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(RESULT_SUCCESS); -- cgit v1.2.3 From 903beb43a84e08fc37cd58110c91dfbadf0faf0f Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 5 Feb 2018 21:54:10 -0500 Subject: mutex: Update hasWaiters on release. --- src/core/hle/kernel/mutex.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index 4e86eb918..0b9dc700c 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp @@ -70,6 +70,7 @@ ResultCode Mutex::Release(Thread* thread) { holding_thread->held_mutexes.erase(this); holding_thread->UpdatePriority(); SetHoldingThread(nullptr); + SetHasWaiters(!GetWaitingThreads().empty()); WakeupAllWaitingThreads(); Core::System::GetInstance().PrepareReschedule(); -- cgit v1.2.3