summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Morph2020-09-17 20:45:51 -0400
committerGravatar Morph2020-09-17 22:03:02 -0400
commit40a72e9cd584287e68203ce2530e326c5d8538f9 (patch)
tree26edc2ab6e6b77f0526cc567504d9c693e70de93 /src
parentMerge pull request #4670 from lioncash/initializer (diff)
downloadyuzu-40a72e9cd584287e68203ce2530e326c5d8538f9.tar.gz
yuzu-40a72e9cd584287e68203ce2530e326c5d8538f9.tar.xz
yuzu-40a72e9cd584287e68203ce2530e326c5d8538f9.zip
am: Stub GetPreviousProgramIndex
- Used in Super Mario 3D All-Stars
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/am/am.cpp10
-rw-r--r--src/core/hle/service/am/am.h2
2 files changed, 11 insertions, 1 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 7d92b25a3..d7a81f64a 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -1192,7 +1192,7 @@ IApplicationFunctions::IApplicationFunctions(Core::System& system_)
1192 {120, nullptr, "ExecuteProgram"}, 1192 {120, nullptr, "ExecuteProgram"},
1193 {121, nullptr, "ClearUserChannel"}, 1193 {121, nullptr, "ClearUserChannel"},
1194 {122, nullptr, "UnpopToUserChannel"}, 1194 {122, nullptr, "UnpopToUserChannel"},
1195 {123, nullptr, "GetPreviousProgramIndex"}, 1195 {123, &IApplicationFunctions::GetPreviousProgramIndex, "GetPreviousProgramIndex"},
1196 {124, nullptr, "EnableApplicationAllThreadDumpOnCrash"}, 1196 {124, nullptr, "EnableApplicationAllThreadDumpOnCrash"},
1197 {130, &IApplicationFunctions::GetGpuErrorDetectedSystemEvent, "GetGpuErrorDetectedSystemEvent"}, 1197 {130, &IApplicationFunctions::GetGpuErrorDetectedSystemEvent, "GetGpuErrorDetectedSystemEvent"},
1198 {140, &IApplicationFunctions::GetFriendInvitationStorageChannelEvent, "GetFriendInvitationStorageChannelEvent"}, 1198 {140, &IApplicationFunctions::GetFriendInvitationStorageChannelEvent, "GetFriendInvitationStorageChannelEvent"},
@@ -1554,6 +1554,14 @@ void IApplicationFunctions::QueryApplicationPlayStatisticsByUid(Kernel::HLEReque
1554 rb.Push<u32>(0); 1554 rb.Push<u32>(0);
1555} 1555}
1556 1556
1557void IApplicationFunctions::GetPreviousProgramIndex(Kernel::HLERequestContext& ctx) {
1558 LOG_WARNING(Service_AM, "(STUBBED) called");
1559
1560 IPC::ResponseBuilder rb{ctx, 3};
1561 rb.Push(RESULT_SUCCESS);
1562 rb.Push<s32>(previous_program_index);
1563}
1564
1557void IApplicationFunctions::GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx) { 1565void IApplicationFunctions::GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx) {
1558 LOG_WARNING(Service_AM, "(STUBBED) called"); 1566 LOG_WARNING(Service_AM, "(STUBBED) called");
1559 1567
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h
index 6e69796ec..bcc06affe 100644
--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -288,11 +288,13 @@ private:
288 void SetApplicationCopyrightVisibility(Kernel::HLERequestContext& ctx); 288 void SetApplicationCopyrightVisibility(Kernel::HLERequestContext& ctx);
289 void QueryApplicationPlayStatistics(Kernel::HLERequestContext& ctx); 289 void QueryApplicationPlayStatistics(Kernel::HLERequestContext& ctx);
290 void QueryApplicationPlayStatisticsByUid(Kernel::HLERequestContext& ctx); 290 void QueryApplicationPlayStatisticsByUid(Kernel::HLERequestContext& ctx);
291 void GetPreviousProgramIndex(Kernel::HLERequestContext& ctx);
291 void GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx); 292 void GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx);
292 void GetFriendInvitationStorageChannelEvent(Kernel::HLERequestContext& ctx); 293 void GetFriendInvitationStorageChannelEvent(Kernel::HLERequestContext& ctx);
293 294
294 bool launch_popped_application_specific = false; 295 bool launch_popped_application_specific = false;
295 bool launch_popped_account_preselect = false; 296 bool launch_popped_account_preselect = false;
297 s32 previous_program_index{-1};
296 Kernel::EventPair gpu_error_detected_event; 298 Kernel::EventPair gpu_error_detected_event;
297 Kernel::EventPair friend_invitation_storage_channel_event; 299 Kernel::EventPair friend_invitation_storage_channel_event;
298 Core::System& system; 300 Core::System& system;