diff options
author | bunnei <bunneidev@gmail.com> | 2018-02-02 18:00:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-02 18:00:31 +0100 |
commit | 19098021560e66659aae5e0318faa09637fc8174 (patch) | |
tree | 6e7f22a1f10eb09757ba61341e82268a1795bd30 /src/core/hle | |
parent | Merge pull request #152 from shinyquagsire23/sharedmem-valid-bounds (diff) | |
parent | Services/vi: add vi:s and vi:u services (diff) | |
download | yuzu-19098021560e66659aae5e0318faa09637fc8174.tar yuzu-19098021560e66659aae5e0318faa09637fc8174.tar.gz yuzu-19098021560e66659aae5e0318faa09637fc8174.tar.bz2 yuzu-19098021560e66659aae5e0318faa09637fc8174.tar.lz yuzu-19098021560e66659aae5e0318faa09637fc8174.tar.xz yuzu-19098021560e66659aae5e0318faa09637fc8174.tar.zst yuzu-19098021560e66659aae5e0318faa09637fc8174.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/service/vi/vi.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/service/vi/vi_s.cpp | 31 | ||||
-rw-r--r-- | src/core/hle/service/vi/vi_s.h | 29 | ||||
-rw-r--r-- | src/core/hle/service/vi/vi_u.cpp | 31 | ||||
-rw-r--r-- | src/core/hle/service/vi/vi_u.h | 29 |
5 files changed, 124 insertions, 0 deletions
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 3b993f36c..e32ea1fb8 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -11,6 +11,8 @@ #include "core/hle/service/nvflinger/buffer_queue.h" #include "core/hle/service/vi/vi.h" #include "core/hle/service/vi/vi_m.h" +#include "core/hle/service/vi/vi_s.h" +#include "core/hle/service/vi/vi_u.h" #include "video_core/renderer_base.h" #include "video_core/video_core.h" @@ -756,6 +758,8 @@ IApplicationDisplayService::IApplicationDisplayService( void InstallInterfaces(SM::ServiceManager& service_manager, std::shared_ptr<NVFlinger::NVFlinger> nv_flinger) { std::make_shared<VI_M>(nv_flinger)->InstallAsService(service_manager); + std::make_shared<VI_S>(nv_flinger)->InstallAsService(service_manager); + std::make_shared<VI_U>(nv_flinger)->InstallAsService(service_manager); } } // namespace VI diff --git a/src/core/hle/service/vi/vi_s.cpp b/src/core/hle/service/vi/vi_s.cpp new file mode 100644 index 000000000..dc2848a9c --- /dev/null +++ b/src/core/hle/service/vi/vi_s.cpp @@ -0,0 +1,31 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "common/logging/log.h" +#include "core/hle/ipc_helpers.h" +#include "core/hle/service/vi/vi.h" +#include "core/hle/service/vi/vi_s.h" + +namespace Service { +namespace VI { + +void VI_S::GetDisplayService(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service, "(STUBBED) called"); + + IPC::ResponseBuilder rb{ctx, 2, 0, 1}; + rb.Push(RESULT_SUCCESS); + rb.PushIpcInterface<IApplicationDisplayService>(nv_flinger); +} + +VI_S::VI_S(std::shared_ptr<NVFlinger::NVFlinger> nv_flinger) + : ServiceFramework("vi:s"), nv_flinger(std::move(nv_flinger)) { + static const FunctionInfo functions[] = { + {1, &VI_S::GetDisplayService, "GetDisplayService"}, + {3, nullptr, "GetDisplayServiceWithProxyNameExchange"}, + }; + RegisterHandlers(functions); +} + +} // namespace VI +} // namespace Service diff --git a/src/core/hle/service/vi/vi_s.h b/src/core/hle/service/vi/vi_s.h new file mode 100644 index 000000000..6978fd700 --- /dev/null +++ b/src/core/hle/service/vi/vi_s.h @@ -0,0 +1,29 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include <memory> +#include "core/hle/service/service.h" + +namespace Service { +namespace NVFlinger { +class NVFlinger; +} + +namespace VI { + +class VI_S final : public ServiceFramework<VI_S> { +public: + VI_S(std::shared_ptr<NVFlinger::NVFlinger> nv_flinger); + ~VI_S() = default; + +private: + void GetDisplayService(Kernel::HLERequestContext& ctx); + + std::shared_ptr<NVFlinger::NVFlinger> nv_flinger; +}; + +} // namespace VI +} // namespace Service diff --git a/src/core/hle/service/vi/vi_u.cpp b/src/core/hle/service/vi/vi_u.cpp new file mode 100644 index 000000000..95c4d9fd7 --- /dev/null +++ b/src/core/hle/service/vi/vi_u.cpp @@ -0,0 +1,31 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "common/logging/log.h" +#include "core/hle/ipc_helpers.h" +#include "core/hle/service/vi/vi.h" +#include "core/hle/service/vi/vi_u.h" + +namespace Service { +namespace VI { + +void VI_U::GetDisplayService(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service, "(STUBBED) called"); + + IPC::ResponseBuilder rb{ctx, 2, 0, 1}; + rb.Push(RESULT_SUCCESS); + rb.PushIpcInterface<IApplicationDisplayService>(nv_flinger); +} + +VI_U::VI_U(std::shared_ptr<NVFlinger::NVFlinger> nv_flinger) + : ServiceFramework("vi:u"), nv_flinger(std::move(nv_flinger)) { + static const FunctionInfo functions[] = { + {0, &VI_U::GetDisplayService, "GetDisplayService"}, + {3, nullptr, "GetDisplayServiceWithProxyNameExchange"}, + }; + RegisterHandlers(functions); +} + +} // namespace VI +} // namespace Service diff --git a/src/core/hle/service/vi/vi_u.h b/src/core/hle/service/vi/vi_u.h new file mode 100644 index 000000000..b3e9c094d --- /dev/null +++ b/src/core/hle/service/vi/vi_u.h @@ -0,0 +1,29 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include <memory> +#include "core/hle/service/service.h" + +namespace Service { +namespace NVFlinger { +class NVFlinger; +} + +namespace VI { + +class VI_U final : public ServiceFramework<VI_U> { +public: + VI_U(std::shared_ptr<NVFlinger::NVFlinger> nv_flinger); + ~VI_U() = default; + +private: + void GetDisplayService(Kernel::HLERequestContext& ctx); + + std::shared_ptr<NVFlinger::NVFlinger> nv_flinger; +}; + +} // namespace VI +} // namespace Service |