diff options
| author | 2018-10-06 16:49:01 +1000 | |
|---|---|---|
| committer | 2018-10-06 16:49:01 +1000 | |
| commit | f84b9ed4e8c38928e8e1bb57c2914256375b5af4 (patch) | |
| tree | 248a593e98e8a14ed4a111dc9ad5241aa639784c /src/core/hle/kernel | |
| parent | Merge pull request #1447 from lioncash/mutex (diff) | |
| download | yuzu-f84b9ed4e8c38928e8e1bb57c2914256375b5af4.tar.gz yuzu-f84b9ed4e8c38928e8e1bb57c2914256375b5af4.tar.xz yuzu-f84b9ed4e8c38928e8e1bb57c2914256375b5af4.zip | |
Ported #4296 from citra
This will allow us to easily remove the use of "NFC" in "System"
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/client_port.h | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/server_port.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/core/hle/kernel/client_port.h b/src/core/hle/kernel/client_port.h index f3dfebbb1..a82b29417 100644 --- a/src/core/hle/kernel/client_port.h +++ b/src/core/hle/kernel/client_port.h | |||
| @@ -7,13 +7,13 @@ | |||
| 7 | #include <string> | 7 | #include <string> |
| 8 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 9 | #include "core/hle/kernel/object.h" | 9 | #include "core/hle/kernel/object.h" |
| 10 | #include "core/hle/kernel/server_port.h" | ||
| 10 | #include "core/hle/result.h" | 11 | #include "core/hle/result.h" |
| 11 | 12 | ||
| 12 | namespace Kernel { | 13 | namespace Kernel { |
| 13 | 14 | ||
| 14 | class ClientSession; | 15 | class ClientSession; |
| 15 | class KernelCore; | 16 | class KernelCore; |
| 16 | class ServerPort; | ||
| 17 | 17 | ||
| 18 | class ClientPort final : public Object { | 18 | class ClientPort final : public Object { |
| 19 | public: | 19 | public: |
| @@ -30,6 +30,10 @@ public: | |||
| 30 | return HANDLE_TYPE; | 30 | return HANDLE_TYPE; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | SharedPtr<ServerPort> GetServerPort() const { | ||
| 34 | return server_port; | ||
| 35 | } | ||
| 36 | |||
| 33 | /** | 37 | /** |
| 34 | * Creates a new Session pair, adds the created ServerSession to the associated ServerPort's | 38 | * Creates a new Session pair, adds the created ServerSession to the associated ServerPort's |
| 35 | * list of pending sessions, and signals the ServerPort, causing any threads | 39 | * list of pending sessions, and signals the ServerPort, causing any threads |
diff --git a/src/core/hle/kernel/server_port.h b/src/core/hle/kernel/server_port.h index 62fb51349..e52f8245f 100644 --- a/src/core/hle/kernel/server_port.h +++ b/src/core/hle/kernel/server_port.h | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include "common/common_types.h" | 11 | #include "common/common_types.h" |
| 12 | #include "core/hle/kernel/object.h" | 12 | #include "core/hle/kernel/object.h" |
| 13 | #include "core/hle/kernel/wait_object.h" | 13 | #include "core/hle/kernel/wait_object.h" |
| 14 | #include "core/hle/result.h" | ||
| 14 | 15 | ||
| 15 | namespace Kernel { | 16 | namespace Kernel { |
| 16 | 17 | ||