diff options
author | bunnei <bunneidev@gmail.com> | 2021-02-06 08:00:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-06 08:00:43 +0100 |
commit | 1498a7c9a84037d7c78ff21b3bc996622269db43 (patch) | |
tree | 0fb418f721db6e307fb7105cc57fe3a2eec7d0bf /src/core/hle/service/am/am.h | |
parent | Merge pull request #5875 from lioncash/identifier (diff) | |
parent | hle: kernel: Drop R_UNLESS_NOLOG in favor of expanded if-statement. (diff) | |
download | yuzu-1498a7c9a84037d7c78ff21b3bc996622269db43.tar yuzu-1498a7c9a84037d7c78ff21b3bc996622269db43.tar.gz yuzu-1498a7c9a84037d7c78ff21b3bc996622269db43.tar.bz2 yuzu-1498a7c9a84037d7c78ff21b3bc996622269db43.tar.lz yuzu-1498a7c9a84037d7c78ff21b3bc996622269db43.tar.xz yuzu-1498a7c9a84037d7c78ff21b3bc996622269db43.tar.zst yuzu-1498a7c9a84037d7c78ff21b3bc996622269db43.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/am/am.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index 154a48710..6911f0d6e 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -7,11 +7,12 @@ #include <chrono> #include <memory> #include <queue> -#include "core/hle/kernel/writable_event.h" + #include "core/hle/service/service.h" namespace Kernel { class KernelCore; +class KEvent; class TransferMemory; } // namespace Kernel @@ -55,8 +56,8 @@ public: explicit AppletMessageQueue(Kernel::KernelCore& kernel); ~AppletMessageQueue(); - const std::shared_ptr<Kernel::ReadableEvent>& GetMessageReceiveEvent() const; - const std::shared_ptr<Kernel::ReadableEvent>& GetOperationModeChangedEvent() const; + const std::shared_ptr<Kernel::KReadableEvent>& GetMessageReceiveEvent() const; + const std::shared_ptr<Kernel::KReadableEvent>& GetOperationModeChangedEvent() const; void PushMessage(AppletMessage msg); AppletMessage PopMessage(); std::size_t GetMessageCount() const; @@ -65,8 +66,8 @@ public: private: std::queue<AppletMessage> messages; - Kernel::EventPair on_new_message; - Kernel::EventPair on_operation_mode_changed; + std::shared_ptr<Kernel::KEvent> on_new_message; + std::shared_ptr<Kernel::KEvent> on_operation_mode_changed; }; class IWindowController final : public ServiceFramework<IWindowController> { @@ -153,8 +154,8 @@ private: }; NVFlinger::NVFlinger& nvflinger; - Kernel::EventPair launchable_event; - Kernel::EventPair accumulated_suspended_tick_changed_event; + std::shared_ptr<Kernel::KEvent> launchable_event; + std::shared_ptr<Kernel::KEvent> accumulated_suspended_tick_changed_event; u32 idle_time_detection_extension = 0; u64 num_fatal_sections_entered = 0; @@ -295,9 +296,9 @@ private: bool launch_popped_application_specific = false; bool launch_popped_account_preselect = false; s32 previous_program_index{-1}; - Kernel::EventPair gpu_error_detected_event; - Kernel::EventPair friend_invitation_storage_channel_event; - Kernel::EventPair health_warning_disappeared_system_event; + std::shared_ptr<Kernel::KEvent> gpu_error_detected_event; + std::shared_ptr<Kernel::KEvent> friend_invitation_storage_channel_event; + std::shared_ptr<Kernel::KEvent> health_warning_disappeared_system_event; }; class IHomeMenuFunctions final : public ServiceFramework<IHomeMenuFunctions> { @@ -309,7 +310,7 @@ private: void RequestToGetForeground(Kernel::HLERequestContext& ctx); void GetPopFromGeneralChannelEvent(Kernel::HLERequestContext& ctx); - Kernel::EventPair pop_from_general_channel_event; + std::shared_ptr<Kernel::KEvent> pop_from_general_channel_event; }; class IGlobalStateController final : public ServiceFramework<IGlobalStateController> { |