diff options
| author | 2016-03-12 21:47:41 -0500 | |
|---|---|---|
| committer | 2016-03-12 21:47:41 -0500 | |
| commit | 856a1d0386099f6311e4fb9cca345142fc22330a (patch) | |
| tree | 5c06aa00ad880a09ff1c227e0ed5da0901d3ef63 /src/core/hle/svc.cpp | |
| parent | svc: Remove unused ArbitrationType enum (diff) | |
| download | yuzu-856a1d0386099f6311e4fb9cca345142fc22330a.tar.gz yuzu-856a1d0386099f6311e4fb9cca345142fc22330a.tar.xz yuzu-856a1d0386099f6311e4fb9cca345142fc22330a.zip | |
svc: Move ResetType enum to the kernel event header
Diffstat (limited to 'src/core/hle/svc.cpp')
| -rw-r--r-- | src/core/hle/svc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 7a39b101d..ae54afb1c 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -661,7 +661,7 @@ static ResultCode QueryMemory(MemoryInfo* memory_info, PageInfo* page_info, u32 | |||
| 661 | static ResultCode CreateEvent(Handle* out_handle, u32 reset_type) { | 661 | static ResultCode CreateEvent(Handle* out_handle, u32 reset_type) { |
| 662 | using Kernel::Event; | 662 | using Kernel::Event; |
| 663 | 663 | ||
| 664 | SharedPtr<Event> evt = Kernel::Event::Create(static_cast<ResetType>(reset_type)); | 664 | SharedPtr<Event> evt = Event::Create(static_cast<Kernel::ResetType>(reset_type)); |
| 665 | CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(evt))); | 665 | CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(evt))); |
| 666 | 666 | ||
| 667 | LOG_TRACE(Kernel_SVC, "called reset_type=0x%08X : created handle=0x%08X", | 667 | LOG_TRACE(Kernel_SVC, "called reset_type=0x%08X : created handle=0x%08X", |
| @@ -707,7 +707,7 @@ static ResultCode ClearEvent(Handle handle) { | |||
| 707 | static ResultCode CreateTimer(Handle* out_handle, u32 reset_type) { | 707 | static ResultCode CreateTimer(Handle* out_handle, u32 reset_type) { |
| 708 | using Kernel::Timer; | 708 | using Kernel::Timer; |
| 709 | 709 | ||
| 710 | SharedPtr<Timer> timer = Timer::Create(static_cast<ResetType>(reset_type)); | 710 | SharedPtr<Timer> timer = Timer::Create(static_cast<Kernel::ResetType>(reset_type)); |
| 711 | CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(timer))); | 711 | CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(timer))); |
| 712 | 712 | ||
| 713 | LOG_TRACE(Kernel_SVC, "called reset_type=0x%08X : created handle=0x%08X", | 713 | LOG_TRACE(Kernel_SVC, "called reset_type=0x%08X : created handle=0x%08X", |