diff options
author | bunnei <bunneidev@gmail.com> | 2021-01-30 07:48:06 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2021-02-05 23:00:36 +0100 |
commit | e86a7e36912b6f3fc64a594338d3c1ac768e3bb8 (patch) | |
tree | 28c2d60179f1f4f798b5a572af2f8c6685fa4940 /src/core/hle/service/nvdrv | |
parent | Merge pull request #5867 from Morph1984/am-GetHealthWarningDisappearedSystemEvent (diff) | |
download | yuzu-e86a7e36912b6f3fc64a594338d3c1ac768e3bb8.tar yuzu-e86a7e36912b6f3fc64a594338d3c1ac768e3bb8.tar.gz yuzu-e86a7e36912b6f3fc64a594338d3c1ac768e3bb8.tar.bz2 yuzu-e86a7e36912b6f3fc64a594338d3c1ac768e3bb8.tar.lz yuzu-e86a7e36912b6f3fc64a594338d3c1ac768e3bb8.tar.xz yuzu-e86a7e36912b6f3fc64a594338d3c1ac768e3bb8.tar.zst yuzu-e86a7e36912b6f3fc64a594338d3c1ac768e3bb8.zip |
Diffstat (limited to 'src/core/hle/service/nvdrv')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/interface.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 060599bab..1fd5504a8 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -8,7 +8,7 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/kernel/readable_event.h" +#include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/writable_event.h" #include "core/hle/service/nvdrv/devices/nvhost_ctrl.h" #include "video_core/gpu.h" diff --git a/src/core/hle/service/nvdrv/interface.cpp b/src/core/hle/service/nvdrv/interface.cpp index 1328b64d0..187501be8 100644 --- a/src/core/hle/service/nvdrv/interface.cpp +++ b/src/core/hle/service/nvdrv/interface.cpp @@ -6,9 +6,9 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/hle/ipc_helpers.h" +#include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/readable_event.h" #include "core/hle/kernel/writable_event.h" #include "core/hle/service/nvdrv/interface.h" #include "core/hle/service/nvdrv/nvdata.h" diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 620c18728..caeab0bd2 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -7,7 +7,7 @@ #include <fmt/format.h> #include "core/core.h" #include "core/hle/ipc_helpers.h" -#include "core/hle/kernel/readable_event.h" +#include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/writable_event.h" #include "core/hle/service/nvdrv/devices/nvdevice.h" #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" @@ -171,7 +171,7 @@ void Module::SignalSyncpt(const u32 syncpoint_id, const u32 value) { } } -std::shared_ptr<Kernel::ReadableEvent> Module::GetEvent(const u32 event_id) const { +std::shared_ptr<Kernel::KReadableEvent> Module::GetEvent(const u32 event_id) const { return events_interface.events[event_id].event.readable; } diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h index 144e657e5..8a75c92ff 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/core/hle/service/nvdrv/nvdrv.h @@ -132,7 +132,7 @@ public: void SignalSyncpt(const u32 syncpoint_id, const u32 value); - std::shared_ptr<Kernel::ReadableEvent> GetEvent(u32 event_id) const; + std::shared_ptr<Kernel::KReadableEvent> GetEvent(u32 event_id) const; std::shared_ptr<Kernel::WritableEvent> GetEventWriteable(u32 event_id) const; |