summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Morph2021-02-02 10:47:09 -0500
committerGravatar Morph2021-02-02 10:47:38 -0500
commit13b08376b7f27d71f05c46eb0e5504bf3e6da51a (patch)
treefb756eec4d74039cddb67ff0b35bbdb625d5b5ae
parentMerge pull request #5861 from german77/HandheldFix (diff)
downloadyuzu-13b08376b7f27d71f05c46eb0e5504bf3e6da51a.tar.gz
yuzu-13b08376b7f27d71f05c46eb0e5504bf3e6da51a.tar.xz
yuzu-13b08376b7f27d71f05c46eb0e5504bf3e6da51a.zip
IApplicationFunctions: Implement GetHealthWarningDisappearedSystemEvent
-rw-r--r--src/core/hle/service/am/am.cpp13
-rw-r--r--src/core/hle/service/am/am.h2
2 files changed, 14 insertions, 1 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index d42236a3a..07a755599 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -1216,7 +1216,7 @@ IApplicationFunctions::IApplicationFunctions(Core::System& system_)
1216 {141, &IApplicationFunctions::TryPopFromFriendInvitationStorageChannel, "TryPopFromFriendInvitationStorageChannel"}, 1216 {141, &IApplicationFunctions::TryPopFromFriendInvitationStorageChannel, "TryPopFromFriendInvitationStorageChannel"},
1217 {150, nullptr, "GetNotificationStorageChannelEvent"}, 1217 {150, nullptr, "GetNotificationStorageChannelEvent"},
1218 {151, nullptr, "TryPopFromNotificationStorageChannel"}, 1218 {151, nullptr, "TryPopFromNotificationStorageChannel"},
1219 {160, nullptr, "GetHealthWarningDisappearedSystemEvent"}, 1219 {160, &IApplicationFunctions::GetHealthWarningDisappearedSystemEvent, "GetHealthWarningDisappearedSystemEvent"},
1220 {170, nullptr, "SetHdcpAuthenticationActivated"}, 1220 {170, nullptr, "SetHdcpAuthenticationActivated"},
1221 {180, nullptr, "GetLaunchRequiredVersion"}, 1221 {180, nullptr, "GetLaunchRequiredVersion"},
1222 {181, nullptr, "UpgradeLaunchRequiredVersion"}, 1222 {181, nullptr, "UpgradeLaunchRequiredVersion"},
@@ -1234,6 +1234,9 @@ IApplicationFunctions::IApplicationFunctions(Core::System& system_)
1234 1234
1235 friend_invitation_storage_channel_event = Kernel::WritableEvent::CreateEventPair( 1235 friend_invitation_storage_channel_event = Kernel::WritableEvent::CreateEventPair(
1236 kernel, "IApplicationFunctions:FriendInvitationStorageChannelEvent"); 1236 kernel, "IApplicationFunctions:FriendInvitationStorageChannelEvent");
1237
1238 health_warning_disappeared_system_event = Kernel::WritableEvent::CreateEventPair(
1239 kernel, "IApplicationFunctions:HealthWarningDisappearedSystemEvent");
1237} 1240}
1238 1241
1239IApplicationFunctions::~IApplicationFunctions() = default; 1242IApplicationFunctions::~IApplicationFunctions() = default;
@@ -1649,6 +1652,14 @@ void IApplicationFunctions::TryPopFromFriendInvitationStorageChannel(
1649 rb.Push(ERR_NO_DATA_IN_CHANNEL); 1652 rb.Push(ERR_NO_DATA_IN_CHANNEL);
1650} 1653}
1651 1654
1655void IApplicationFunctions::GetHealthWarningDisappearedSystemEvent(Kernel::HLERequestContext& ctx) {
1656 LOG_DEBUG(Service_AM, "called");
1657
1658 IPC::ResponseBuilder rb{ctx, 2, 1};
1659 rb.Push(RESULT_SUCCESS);
1660 rb.PushCopyObjects(health_warning_disappeared_system_event.readable);
1661}
1662
1652void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger& nvflinger, 1663void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger& nvflinger,
1653 Core::System& system) { 1664 Core::System& system) {
1654 auto message_queue = std::make_shared<AppletMessageQueue>(system.Kernel()); 1665 auto message_queue = std::make_shared<AppletMessageQueue>(system.Kernel());
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h
index f5db41ac8..154a48710 100644
--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -290,12 +290,14 @@ private:
290 void GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx); 290 void GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx);
291 void GetFriendInvitationStorageChannelEvent(Kernel::HLERequestContext& ctx); 291 void GetFriendInvitationStorageChannelEvent(Kernel::HLERequestContext& ctx);
292 void TryPopFromFriendInvitationStorageChannel(Kernel::HLERequestContext& ctx); 292 void TryPopFromFriendInvitationStorageChannel(Kernel::HLERequestContext& ctx);
293 void GetHealthWarningDisappearedSystemEvent(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;
296 s32 previous_program_index{-1}; 297 s32 previous_program_index{-1};
297 Kernel::EventPair gpu_error_detected_event; 298 Kernel::EventPair gpu_error_detected_event;
298 Kernel::EventPair friend_invitation_storage_channel_event; 299 Kernel::EventPair friend_invitation_storage_channel_event;
300 Kernel::EventPair health_warning_disappeared_system_event;
299}; 301};
300 302
301class IHomeMenuFunctions final : public ServiceFramework<IHomeMenuFunctions> { 303class IHomeMenuFunctions final : public ServiceFramework<IHomeMenuFunctions> {