From 182137a9a4b09c8188d2cbffa312550c5dc83641 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 2 Jan 2024 18:29:03 -0500 Subject: am: migrate global state to per-applet state structure --- src/core/hle/service/am/application_functions.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/core/hle/service/am/application_functions.h') diff --git a/src/core/hle/service/am/application_functions.h b/src/core/hle/service/am/application_functions.h index 22aab1c8f..55eb21d39 100644 --- a/src/core/hle/service/am/application_functions.h +++ b/src/core/hle/service/am/application_functions.h @@ -8,9 +8,11 @@ namespace Service::AM { +struct Applet; + class IApplicationFunctions final : public ServiceFramework { public: - explicit IApplicationFunctions(Core::System& system_); + explicit IApplicationFunctions(Core::System& system_, std::shared_ptr applet_); ~IApplicationFunctions() override; private: @@ -50,14 +52,7 @@ private: void GetHealthWarningDisappearedSystemEvent(HLERequestContext& ctx); void PrepareForJit(HLERequestContext& ctx); - KernelHelpers::ServiceContext service_context; - - bool launch_popped_account_preselect = false; - s32 previous_program_index{-1}; - Kernel::KEvent* gpu_error_detected_event; - Kernel::KEvent* friend_invitation_storage_channel_event; - Kernel::KEvent* notification_storage_channel_event; - Kernel::KEvent* health_warning_disappeared_system_event; + const std::shared_ptr applet; }; } // namespace Service::AM -- cgit v1.2.3