From 524c12a5f8fd1fcc9355351d1bcb08bfafaeb940 Mon Sep 17 00:00:00 2001 From: mailwl Date: Fri, 2 Feb 2018 12:59:50 +0300 Subject: Services/vi: add vi:s and vi:u services --- src/core/CMakeLists.txt | 4 ++++ src/core/hle/service/vi/vi.cpp | 4 ++++ src/core/hle/service/vi/vi_s.cpp | 31 +++++++++++++++++++++++++++++++ src/core/hle/service/vi/vi_s.h | 29 +++++++++++++++++++++++++++++ src/core/hle/service/vi/vi_u.cpp | 31 +++++++++++++++++++++++++++++++ src/core/hle/service/vi/vi_u.h | 29 +++++++++++++++++++++++++++++ 6 files changed, 128 insertions(+) create mode 100644 src/core/hle/service/vi/vi_s.cpp create mode 100644 src/core/hle/service/vi/vi_s.h create mode 100644 src/core/hle/service/vi/vi_u.cpp create mode 100644 src/core/hle/service/vi/vi_u.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 70a38ff6c..2e32ff35b 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -159,6 +159,10 @@ add_library(core STATIC hle/service/vi/vi.h hle/service/vi/vi_m.cpp hle/service/vi/vi_m.h + hle/service/vi/vi_s.cpp + hle/service/vi/vi_s.h + hle/service/vi/vi_u.cpp + hle/service/vi/vi_u.h hle/shared_page.cpp hle/shared_page.h hw/hw.cpp 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 nv_flinger) { std::make_shared(nv_flinger)->InstallAsService(service_manager); + std::make_shared(nv_flinger)->InstallAsService(service_manager); + std::make_shared(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(nv_flinger); +} + +VI_S::VI_S(std::shared_ptr 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 +#include "core/hle/service/service.h" + +namespace Service { +namespace NVFlinger { +class NVFlinger; +} + +namespace VI { + +class VI_S final : public ServiceFramework { +public: + VI_S(std::shared_ptr nv_flinger); + ~VI_S() = default; + +private: + void GetDisplayService(Kernel::HLERequestContext& ctx); + + std::shared_ptr 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(nv_flinger); +} + +VI_U::VI_U(std::shared_ptr 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 +#include "core/hle/service/service.h" + +namespace Service { +namespace NVFlinger { +class NVFlinger; +} + +namespace VI { + +class VI_U final : public ServiceFramework { +public: + VI_U(std::shared_ptr nv_flinger); + ~VI_U() = default; + +private: + void GetDisplayService(Kernel::HLERequestContext& ctx); + + std::shared_ptr nv_flinger; +}; + +} // namespace VI +} // namespace Service -- cgit v1.2.3