diff options
| author | 2018-12-03 17:05:57 -0500 | |
|---|---|---|
| committer | 2018-12-03 17:05:57 -0500 | |
| commit | ef69b4b83050967732e6e977396111289c9e86ba (patch) | |
| tree | 0f0908b21f5cec9dca4d2269cd724cfca81848db /src/core/hle/kernel/svc.cpp | |
| parent | Merge pull request #1833 from lioncash/clean (diff) | |
| parent | hle_ipc: Refactor SleepClientThread to avoid ReadableEvent (diff) | |
| download | yuzu-ef69b4b83050967732e6e977396111289c9e86ba.tar.gz yuzu-ef69b4b83050967732e6e977396111289c9e86ba.tar.xz yuzu-ef69b4b83050967732e6e977396111289c9e86ba.zip | |
Merge pull request #1803 from DarkLordZach/k-able-event
kernel: Divide Event into ReadableEvent and WritableEvent
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 3339777c1..051b09d00 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -20,17 +20,18 @@ | |||
| 20 | #include "core/hle/kernel/address_arbiter.h" | 20 | #include "core/hle/kernel/address_arbiter.h" |
| 21 | #include "core/hle/kernel/client_port.h" | 21 | #include "core/hle/kernel/client_port.h" |
| 22 | #include "core/hle/kernel/client_session.h" | 22 | #include "core/hle/kernel/client_session.h" |
| 23 | #include "core/hle/kernel/event.h" | ||
| 24 | #include "core/hle/kernel/handle_table.h" | 23 | #include "core/hle/kernel/handle_table.h" |
| 25 | #include "core/hle/kernel/kernel.h" | 24 | #include "core/hle/kernel/kernel.h" |
| 26 | #include "core/hle/kernel/mutex.h" | 25 | #include "core/hle/kernel/mutex.h" |
| 27 | #include "core/hle/kernel/process.h" | 26 | #include "core/hle/kernel/process.h" |
| 27 | #include "core/hle/kernel/readable_event.h" | ||
| 28 | #include "core/hle/kernel/resource_limit.h" | 28 | #include "core/hle/kernel/resource_limit.h" |
| 29 | #include "core/hle/kernel/scheduler.h" | 29 | #include "core/hle/kernel/scheduler.h" |
| 30 | #include "core/hle/kernel/shared_memory.h" | 30 | #include "core/hle/kernel/shared_memory.h" |
| 31 | #include "core/hle/kernel/svc.h" | 31 | #include "core/hle/kernel/svc.h" |
| 32 | #include "core/hle/kernel/svc_wrap.h" | 32 | #include "core/hle/kernel/svc_wrap.h" |
| 33 | #include "core/hle/kernel/thread.h" | 33 | #include "core/hle/kernel/thread.h" |
| 34 | #include "core/hle/kernel/writable_event.h" | ||
| 34 | #include "core/hle/lock.h" | 35 | #include "core/hle/lock.h" |
| 35 | #include "core/hle/result.h" | 36 | #include "core/hle/result.h" |
| 36 | #include "core/hle/service/service.h" | 37 | #include "core/hle/service/service.h" |
| @@ -1361,7 +1362,7 @@ static ResultCode ResetSignal(Handle handle) { | |||
| 1361 | LOG_DEBUG(Kernel_SVC, "called handle 0x{:08X}", handle); | 1362 | LOG_DEBUG(Kernel_SVC, "called handle 0x{:08X}", handle); |
| 1362 | 1363 | ||
| 1363 | const auto& handle_table = Core::CurrentProcess()->GetHandleTable(); | 1364 | const auto& handle_table = Core::CurrentProcess()->GetHandleTable(); |
| 1364 | auto event = handle_table.Get<Event>(handle); | 1365 | auto event = handle_table.Get<ReadableEvent>(handle); |
| 1365 | 1366 | ||
| 1366 | ASSERT(event != nullptr); | 1367 | ASSERT(event != nullptr); |
| 1367 | 1368 | ||
| @@ -1524,7 +1525,7 @@ static ResultCode ClearEvent(Handle handle) { | |||
| 1524 | LOG_TRACE(Kernel_SVC, "called, event=0x{:08X}", handle); | 1525 | LOG_TRACE(Kernel_SVC, "called, event=0x{:08X}", handle); |
| 1525 | 1526 | ||
| 1526 | const auto& handle_table = Core::CurrentProcess()->GetHandleTable(); | 1527 | const auto& handle_table = Core::CurrentProcess()->GetHandleTable(); |
| 1527 | SharedPtr<Event> evt = handle_table.Get<Event>(handle); | 1528 | SharedPtr<ReadableEvent> evt = handle_table.Get<ReadableEvent>(handle); |
| 1528 | if (evt == nullptr) { | 1529 | if (evt == nullptr) { |
| 1529 | LOG_ERROR(Kernel_SVC, "Event handle does not exist, handle=0x{:08X}", handle); | 1530 | LOG_ERROR(Kernel_SVC, "Event handle does not exist, handle=0x{:08X}", handle); |
| 1530 | return ERR_INVALID_HANDLE; | 1531 | return ERR_INVALID_HANDLE; |