diff options
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 1d2a2c321..f94eecbb8 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" | 32 | #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" |
| 33 | #include "core/hle/kernel/k_synchronization_object.h" | 33 | #include "core/hle/kernel/k_synchronization_object.h" |
| 34 | #include "core/hle/kernel/k_thread.h" | 34 | #include "core/hle/kernel/k_thread.h" |
| 35 | #include "core/hle/kernel/k_writable_event.h" | ||
| 35 | #include "core/hle/kernel/kernel.h" | 36 | #include "core/hle/kernel/kernel.h" |
| 36 | #include "core/hle/kernel/memory/memory_block.h" | 37 | #include "core/hle/kernel/memory/memory_block.h" |
| 37 | #include "core/hle/kernel/memory/memory_layout.h" | 38 | #include "core/hle/kernel/memory/memory_layout.h" |
| @@ -45,7 +46,6 @@ | |||
| 45 | #include "core/hle/kernel/svc_wrap.h" | 46 | #include "core/hle/kernel/svc_wrap.h" |
| 46 | #include "core/hle/kernel/time_manager.h" | 47 | #include "core/hle/kernel/time_manager.h" |
| 47 | #include "core/hle/kernel/transfer_memory.h" | 48 | #include "core/hle/kernel/transfer_memory.h" |
| 48 | #include "core/hle/kernel/writable_event.h" | ||
| 49 | #include "core/hle/lock.h" | 49 | #include "core/hle/lock.h" |
| 50 | #include "core/hle/result.h" | 50 | #include "core/hle/result.h" |
| 51 | #include "core/hle/service/service.h" | 51 | #include "core/hle/service/service.h" |
| @@ -1871,7 +1871,7 @@ static ResultCode CreateEvent(Core::System& system, Handle* write_handle, Handle | |||
| 1871 | 1871 | ||
| 1872 | auto& kernel = system.Kernel(); | 1872 | auto& kernel = system.Kernel(); |
| 1873 | const auto [readable_event, writable_event] = | 1873 | const auto [readable_event, writable_event] = |
| 1874 | WritableEvent::CreateEventPair(kernel, "CreateEvent"); | 1874 | KWritableEvent::CreateEventPair(kernel, "CreateEvent"); |
| 1875 | 1875 | ||
| 1876 | HandleTable& handle_table = kernel.CurrentProcess()->GetHandleTable(); | 1876 | HandleTable& handle_table = kernel.CurrentProcess()->GetHandleTable(); |
| 1877 | 1877 | ||
| @@ -1903,7 +1903,7 @@ static ResultCode ClearEvent(Core::System& system, Handle handle) { | |||
| 1903 | 1903 | ||
| 1904 | const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); | 1904 | const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); |
| 1905 | 1905 | ||
| 1906 | auto writable_event = handle_table.Get<WritableEvent>(handle); | 1906 | auto writable_event = handle_table.Get<KWritableEvent>(handle); |
| 1907 | if (writable_event) { | 1907 | if (writable_event) { |
| 1908 | writable_event->Clear(); | 1908 | writable_event->Clear(); |
| 1909 | return RESULT_SUCCESS; | 1909 | return RESULT_SUCCESS; |
| @@ -1927,7 +1927,7 @@ static ResultCode SignalEvent(Core::System& system, Handle handle) { | |||
| 1927 | LOG_DEBUG(Kernel_SVC, "called. Handle=0x{:08X}", handle); | 1927 | LOG_DEBUG(Kernel_SVC, "called. Handle=0x{:08X}", handle); |
| 1928 | 1928 | ||
| 1929 | HandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); | 1929 | HandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); |
| 1930 | auto writable_event = handle_table.Get<WritableEvent>(handle); | 1930 | auto writable_event = handle_table.Get<KWritableEvent>(handle); |
| 1931 | 1931 | ||
| 1932 | if (!writable_event) { | 1932 | if (!writable_event) { |
| 1933 | LOG_ERROR(Kernel_SVC, "Non-existent writable event handle used (0x{:08X})", handle); | 1933 | LOG_ERROR(Kernel_SVC, "Non-existent writable event handle used (0x{:08X})", handle); |