summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Mat M2020-04-30 13:38:35 -0400
committerGravatar GitHub2020-04-30 13:38:35 -0400
commitecf1f2e05457d5c1ea435af399ac3eb341a16ee2 (patch)
tree1dfa11ece998a9cf507bf9860e0cd290cbe8b1a2 /src
parentMerge pull request #3835 from ogniK5377/GetFreeSpaceSize-GetTotalSpaceSize (diff)
parentam: GetFriendInvitationStorageChannelEvent (diff)
downloadyuzu-ecf1f2e05457d5c1ea435af399ac3eb341a16ee2.tar.gz
yuzu-ecf1f2e05457d5c1ea435af399ac3eb341a16ee2.tar.xz
yuzu-ecf1f2e05457d5c1ea435af399ac3eb341a16ee2.zip
Merge pull request #3830 from ogniK5377/GetFriendInvitationStorageChannelEvent
am: GetFriendInvitationStorageChannelEvent
Diffstat (limited to 'src')
-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 5695d2521..0bb6141b0 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -1169,7 +1169,7 @@ IApplicationFunctions::IApplicationFunctions(Core::System& system_)
1169 {121, nullptr, "ClearUserChannel"}, 1169 {121, nullptr, "ClearUserChannel"},
1170 {122, nullptr, "UnpopToUserChannel"}, 1170 {122, nullptr, "UnpopToUserChannel"},
1171 {130, &IApplicationFunctions::GetGpuErrorDetectedSystemEvent, "GetGpuErrorDetectedSystemEvent"}, 1171 {130, &IApplicationFunctions::GetGpuErrorDetectedSystemEvent, "GetGpuErrorDetectedSystemEvent"},
1172 {140, nullptr, "GetFriendInvitationStorageChannelEvent"}, 1172 {140, &IApplicationFunctions::GetFriendInvitationStorageChannelEvent, "GetFriendInvitationStorageChannelEvent"},
1173 {141, nullptr, "TryPopFromFriendInvitationStorageChannel"}, 1173 {141, nullptr, "TryPopFromFriendInvitationStorageChannel"},
1174 {150, nullptr, "GetNotificationStorageChannelEvent"}, 1174 {150, nullptr, "GetNotificationStorageChannelEvent"},
1175 {151, nullptr, "TryPopFromNotificationStorageChannel"}, 1175 {151, nullptr, "TryPopFromNotificationStorageChannel"},
@@ -1186,6 +1186,9 @@ IApplicationFunctions::IApplicationFunctions(Core::System& system_)
1186 auto& kernel = system.Kernel(); 1186 auto& kernel = system.Kernel();
1187 gpu_error_detected_event = Kernel::WritableEvent::CreateEventPair( 1187 gpu_error_detected_event = Kernel::WritableEvent::CreateEventPair(
1188 kernel, "IApplicationFunctions:GpuErrorDetectedSystemEvent"); 1188 kernel, "IApplicationFunctions:GpuErrorDetectedSystemEvent");
1189
1190 friend_invitation_storage_channel_event = Kernel::WritableEvent::CreateEventPair(
1191 kernel, "IApplicationFunctions:FriendInvitationStorageChannelEvent");
1189} 1192}
1190 1193
1191IApplicationFunctions::~IApplicationFunctions() = default; 1194IApplicationFunctions::~IApplicationFunctions() = default;
@@ -1500,6 +1503,14 @@ void IApplicationFunctions::GetGpuErrorDetectedSystemEvent(Kernel::HLERequestCon
1500 rb.PushCopyObjects(gpu_error_detected_event.readable); 1503 rb.PushCopyObjects(gpu_error_detected_event.readable);
1501} 1504}
1502 1505
1506void IApplicationFunctions::GetFriendInvitationStorageChannelEvent(Kernel::HLERequestContext& ctx) {
1507 LOG_DEBUG(Service_AM, "called");
1508
1509 IPC::ResponseBuilder rb{ctx, 2, 1};
1510 rb.Push(RESULT_SUCCESS);
1511 rb.PushCopyObjects(friend_invitation_storage_channel_event.readable);
1512}
1513
1503void InstallInterfaces(SM::ServiceManager& service_manager, 1514void InstallInterfaces(SM::ServiceManager& service_manager,
1504 std::shared_ptr<NVFlinger::NVFlinger> nvflinger, Core::System& system) { 1515 std::shared_ptr<NVFlinger::NVFlinger> nvflinger, Core::System& system) {
1505 auto message_queue = std::make_shared<AppletMessageQueue>(system.Kernel()); 1516 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 53cfce10f..55afe2b63 100644
--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -280,10 +280,12 @@ private:
280 void QueryApplicationPlayStatistics(Kernel::HLERequestContext& ctx); 280 void QueryApplicationPlayStatistics(Kernel::HLERequestContext& ctx);
281 void QueryApplicationPlayStatisticsByUid(Kernel::HLERequestContext& ctx); 281 void QueryApplicationPlayStatisticsByUid(Kernel::HLERequestContext& ctx);
282 void GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx); 282 void GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx);
283 void GetFriendInvitationStorageChannelEvent(Kernel::HLERequestContext& ctx);
283 284
284 bool launch_popped_application_specific = false; 285 bool launch_popped_application_specific = false;
285 bool launch_popped_account_preselect = false; 286 bool launch_popped_account_preselect = false;
286 Kernel::EventPair gpu_error_detected_event; 287 Kernel::EventPair gpu_error_detected_event;
288 Kernel::EventPair friend_invitation_storage_channel_event;
287 Core::System& system; 289 Core::System& system;
288}; 290};
289 291