summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/svc.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2021-04-24 02:40:31 -0700
committerGravatar bunnei2021-05-05 16:40:53 -0700
commit4b03e6e776e6421c2b2c290b0822b9e5a8556a4c (patch)
tree87c2925a7adf4109a77b4f015cd36d803d4221fc /src/core/hle/kernel/svc.cpp
parenthle: kernel: KClassToken: Ensure class tokens are correct. (diff)
downloadyuzu-4b03e6e776e6421c2b2c290b0822b9e5a8556a4c.tar.gz
yuzu-4b03e6e776e6421c2b2c290b0822b9e5a8556a4c.tar.xz
yuzu-4b03e6e776e6421c2b2c290b0822b9e5a8556a4c.zip
hle: kernel: Migrate to KHandleTable.
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
-rw-r--r--src/core/hle/kernel/svc.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 156c565b0..d3293a1fe 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -21,12 +21,12 @@
21#include "core/core_timing.h" 21#include "core/core_timing.h"
22#include "core/core_timing_util.h" 22#include "core/core_timing_util.h"
23#include "core/cpu_manager.h" 23#include "core/cpu_manager.h"
24#include "core/hle/kernel/handle_table.h"
25#include "core/hle/kernel/k_address_arbiter.h" 24#include "core/hle/kernel/k_address_arbiter.h"
26#include "core/hle/kernel/k_client_port.h" 25#include "core/hle/kernel/k_client_port.h"
27#include "core/hle/kernel/k_client_session.h" 26#include "core/hle/kernel/k_client_session.h"
28#include "core/hle/kernel/k_condition_variable.h" 27#include "core/hle/kernel/k_condition_variable.h"
29#include "core/hle/kernel/k_event.h" 28#include "core/hle/kernel/k_event.h"
29#include "core/hle/kernel/k_handle_table.h"
30#include "core/hle/kernel/k_memory_block.h" 30#include "core/hle/kernel/k_memory_block.h"
31#include "core/hle/kernel/k_memory_layout.h" 31#include "core/hle/kernel/k_memory_layout.h"
32#include "core/hle/kernel/k_page_table.h" 32#include "core/hle/kernel/k_page_table.h"
@@ -839,10 +839,10 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, Handle
839 } 839 }
840 840
841 KProcess* const current_process = system.Kernel().CurrentProcess(); 841 KProcess* const current_process = system.Kernel().CurrentProcess();
842 HandleTable& handle_table = current_process->GetHandleTable(); 842 KHandleTable& handle_table = current_process->GetHandleTable();
843 const auto resource_limit = current_process->GetResourceLimit(); 843 const auto resource_limit = current_process->GetResourceLimit();
844 if (!resource_limit) { 844 if (!resource_limit) {
845 *result = KernelHandle::InvalidHandle; 845 *result = Svc::InvalidHandle;
846 // Yes, the kernel considers this a successful operation. 846 // Yes, the kernel considers this a successful operation.
847 return RESULT_SUCCESS; 847 return RESULT_SUCCESS;
848 } 848 }
@@ -1993,7 +1993,7 @@ static ResultCode SignalEvent(Core::System& system, Handle event_handle) {
1993 LOG_DEBUG(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle); 1993 LOG_DEBUG(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle);
1994 1994
1995 // Get the current handle table. 1995 // Get the current handle table.
1996 const HandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); 1996 const KHandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();
1997 1997
1998 // Get the writable event. 1998 // Get the writable event.
1999 KScopedAutoObject writable_event = handle_table.GetObject<KWritableEvent>(event_handle); 1999 KScopedAutoObject writable_event = handle_table.GetObject<KWritableEvent>(event_handle);