diff options
author | Lioncash <mathew1800@gmail.com> | 2018-08-02 04:40:00 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-08-02 05:34:42 +0200 |
commit | bf45092c616987a3b58b7a859811938f885aa4d1 (patch) | |
tree | 805c60b2692d6a700bea69e5181f9010065134f8 /src/core/hle/service | |
parent | Merge pull request #888 from lioncash/caps (diff) | |
download | yuzu-bf45092c616987a3b58b7a859811938f885aa4d1.tar yuzu-bf45092c616987a3b58b7a859811938f885aa4d1.tar.gz yuzu-bf45092c616987a3b58b7a859811938f885aa4d1.tar.bz2 yuzu-bf45092c616987a3b58b7a859811938f885aa4d1.tar.lz yuzu-bf45092c616987a3b58b7a859811938f885aa4d1.tar.xz yuzu-bf45092c616987a3b58b7a859811938f885aa4d1.tar.zst yuzu-bf45092c616987a3b58b7a859811938f885aa4d1.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.cpp | 5 | ||||
-rw-r--r-- | src/core/hle/service/service.h | 3 | ||||
-rw-r--r-- | src/core/hle/service/sm/sm.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/service/nvflinger/buffer_queue.cpp b/src/core/hle/service/nvflinger/buffer_queue.cpp index 7132b18ad..adf180509 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue.cpp @@ -4,9 +4,8 @@ #include <algorithm> -#include "common/alignment.h" -#include "common/scope_exit.h" -#include "core/core_timing.h" +#include "common/assert.h" +#include "common/logging/log.h" #include "core/hle/service/nvflinger/buffer_queue.h" namespace Service { diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 180f22703..046c5e18d 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -8,10 +8,9 @@ #include <string> #include <unordered_map> #include <boost/container/flat_map.hpp> -#include "common/bit_field.h" #include "common/common_types.h" #include "core/hle/kernel/hle_ipc.h" -#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/object.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Namespace Service diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index e2a00e4f6..e8ea62f08 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -4,9 +4,11 @@ #pragma once +#include <memory> #include <string> #include <unordered_map> -#include "core/hle/kernel/kernel.h" + +#include "core/hle/kernel/object.h" #include "core/hle/result.h" #include "core/hle/service/service.h" @@ -19,6 +21,8 @@ class SessionRequestHandler; namespace Service::SM { +class Controller; + /// Interface to "sm:" service class SM final : public ServiceFramework<SM> { public: @@ -32,8 +36,6 @@ private: std::shared_ptr<ServiceManager> service_manager; }; -class Controller; - constexpr ResultCode ERR_SERVICE_NOT_REGISTERED(-1); constexpr ResultCode ERR_MAX_CONNECTIONS_REACHED(-1); constexpr ResultCode ERR_INVALID_NAME_SIZE(-1); |