summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-01-23 16:01:31 -0500
committerGravatar bunnei2018-01-24 22:18:51 -0500
commit932fa94af747a59fa6f69aab6dff1fd9a802def4 (patch)
tree6c0d143f87f642af2e7f8a71051ee840932875d4 /src
parentaudout:u OpenAudioOut and IAudioOut (#138) (diff)
downloadyuzu-932fa94af747a59fa6f69aab6dff1fd9a802def4.tar.gz
yuzu-932fa94af747a59fa6f69aab6dff1fd9a802def4.tar.xz
yuzu-932fa94af747a59fa6f69aab6dff1fd9a802def4.zip
handle_table: Remove ConvertSessionToDomain.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/handle_table.cpp10
-rw-r--r--src/core/hle/kernel/handle_table.h7
2 files changed, 0 insertions, 17 deletions
diff --git a/src/core/hle/kernel/handle_table.cpp b/src/core/hle/kernel/handle_table.cpp
index 74d3d0514..3beb55753 100644
--- a/src/core/hle/kernel/handle_table.cpp
+++ b/src/core/hle/kernel/handle_table.cpp
@@ -5,12 +5,10 @@
5#include <utility> 5#include <utility>
6#include "common/assert.h" 6#include "common/assert.h"
7#include "common/logging/log.h" 7#include "common/logging/log.h"
8#include "core/hle/kernel/client_session.h"
9#include "core/hle/kernel/errors.h" 8#include "core/hle/kernel/errors.h"
10#include "core/hle/kernel/handle_table.h" 9#include "core/hle/kernel/handle_table.h"
11#include "core/hle/kernel/kernel.h" 10#include "core/hle/kernel/kernel.h"
12#include "core/hle/kernel/process.h" 11#include "core/hle/kernel/process.h"
13#include "core/hle/kernel/session.h"
14#include "core/hle/kernel/thread.h" 12#include "core/hle/kernel/thread.h"
15 13
16namespace Kernel { 14namespace Kernel {
@@ -55,14 +53,6 @@ ResultVal<Handle> HandleTable::Duplicate(Handle handle) {
55 return Create(std::move(object)); 53 return Create(std::move(object));
56} 54}
57 55
58void HandleTable::ConvertSessionToDomain(const Session& session, SharedPtr<Object> domain) {
59 for (auto& object : objects) {
60 if (DynamicObjectCast<ClientSession>(object) == session.client) {
61 object = domain;
62 }
63 }
64}
65
66ResultCode HandleTable::Close(Handle handle) { 56ResultCode HandleTable::Close(Handle handle) {
67 if (!IsValid(handle)) 57 if (!IsValid(handle))
68 return ERR_INVALID_HANDLE; 58 return ERR_INVALID_HANDLE;
diff --git a/src/core/hle/kernel/handle_table.h b/src/core/hle/kernel/handle_table.h
index 935cc22b5..ba968c666 100644
--- a/src/core/hle/kernel/handle_table.h
+++ b/src/core/hle/kernel/handle_table.h
@@ -17,8 +17,6 @@ enum KernelHandle : Handle {
17 CurrentProcess = 0xFFFF8001, 17 CurrentProcess = 0xFFFF8001,
18}; 18};
19 19
20class Session;
21
22/** 20/**
23 * This class allows the creation of Handles, which are references to objects that can be tested 21 * This class allows the creation of Handles, which are references to objects that can be tested
24 * for validity and looked up. Here they are used to pass references to kernel objects to/from the 22 * for validity and looked up. Here they are used to pass references to kernel objects to/from the
@@ -62,11 +60,6 @@ public:
62 ResultVal<Handle> Duplicate(Handle handle); 60 ResultVal<Handle> Duplicate(Handle handle);
63 61
64 /** 62 /**
65 * Convert all handles of the specified Session to the specified Domain.
66 */
67 void ConvertSessionToDomain(const Session& session, SharedPtr<Object> domain);
68
69 /**
70 * Closes a handle, removing it from the table and decreasing the object's ref-count. 63 * Closes a handle, removing it from the table and decreasing the object's ref-count.
71 * @return `RESULT_SUCCESS` or one of the following errors: 64 * @return `RESULT_SUCCESS` or one of the following errors:
72 * - `ERR_INVALID_HANDLE`: an invalid handle was passed in. 65 * - `ERR_INVALID_HANDLE`: an invalid handle was passed in.