From cb75b56e454a36190f07ee34b0e4e6ee6a7a66be Mon Sep 17 00:00:00 2001 From: Subv Date: Mon, 15 Jan 2018 18:30:49 -0500 Subject: NV: Implemented the nvdrv service, which uses the same interface as nvdrv:a --- src/core/CMakeLists.txt | 4 +- src/core/hle/service/nvdrv/interface.cpp | 69 ++++++++++++++++++++++++++++++++ src/core/hle/service/nvdrv/interface.h | 29 ++++++++++++++ src/core/hle/service/nvdrv/nvdrv.cpp | 6 ++- src/core/hle/service/nvdrv/nvdrv_a.cpp | 69 -------------------------------- src/core/hle/service/nvdrv/nvdrv_a.h | 29 -------------- 6 files changed, 104 insertions(+), 102 deletions(-) create mode 100644 src/core/hle/service/nvdrv/interface.cpp create mode 100644 src/core/hle/service/nvdrv/interface.h delete mode 100644 src/core/hle/service/nvdrv/nvdrv_a.cpp delete mode 100644 src/core/hle/service/nvdrv/nvdrv_a.h (limited to 'src/core') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f5c92a5aa..2eab81ad6 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -48,8 +48,8 @@ set(SRCS hle/service/nvdrv/devices/nvdisp_disp0.cpp hle/service/nvdrv/devices/nvhost_as_gpu.cpp hle/service/nvdrv/devices/nvmap.cpp + hle/service/nvdrv/interface.cpp hle/service/nvdrv/nvdrv.cpp - hle/service/nvdrv/nvdrv_a.cpp hle/service/pctl/pctl.cpp hle/service/pctl/pctl_a.cpp hle/service/service.cpp @@ -136,8 +136,8 @@ set(HEADERS hle/service/nvdrv/devices/nvdisp_disp0.h hle/service/nvdrv/devices/nvhost_as_gpu.h hle/service/nvdrv/devices/nvmap.h + hle/service/nvdrv/interface.h hle/service/nvdrv/nvdrv.h - hle/service/nvdrv/nvdrv_a.h hle/service/pctl/pctl.h hle/service/pctl/pctl_a.h hle/service/service.h diff --git a/src/core/hle/service/nvdrv/interface.cpp b/src/core/hle/service/nvdrv/interface.cpp new file mode 100644 index 000000000..0670ca155 --- /dev/null +++ b/src/core/hle/service/nvdrv/interface.cpp @@ -0,0 +1,69 @@ +// 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/nvdrv/interface.h" +#include "core/hle/service/nvdrv/nvdrv.h" + +namespace Service { +namespace Nvidia { + +void NVDRV::Open(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service, "(STUBBED) called"); + + auto buffer = ctx.BufferDescriptorA()[0]; + + std::string device_name = Memory::ReadCString(buffer.Address(), buffer.Size()); + + u32 fd = nvdrv->Open(device_name); + IPC::RequestBuilder rb{ctx, 4}; + rb.Push(RESULT_SUCCESS); + rb.Push(fd); + rb.Push(0); +} + +void NVDRV::Ioctl(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service, "(STUBBED) called"); + + IPC::RequestParser rp{ctx}; + u32 fd = rp.Pop(); + u32 command = rp.Pop(); + + auto input_buffer = ctx.BufferDescriptorA()[0]; + auto output_buffer = ctx.BufferDescriptorB()[0]; + + std::vector input(input_buffer.Size()); + std::vector output(output_buffer.Size()); + + Memory::ReadBlock(input_buffer.Address(), input.data(), input_buffer.Size()); + + u32 nv_result = nvdrv->Ioctl(fd, command, input, output); + + Memory::WriteBlock(output_buffer.Address(), output.data(), output_buffer.Size()); + + IPC::RequestBuilder rb{ctx, 3}; + rb.Push(RESULT_SUCCESS); + rb.Push(nv_result); +} + +void NVDRV::Initialize(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service, "(STUBBED) called"); + IPC::RequestBuilder rb{ctx, 3}; + rb.Push(RESULT_SUCCESS); + rb.Push(0); +} + +NVDRV::NVDRV(std::shared_ptr nvdrv, const char* name) + : ServiceFramework(name), nvdrv(std::move(nvdrv)) { + static const FunctionInfo functions[] = { + {0, &NVDRV::Open, "Open"}, + {1, &NVDRV::Ioctl, "Ioctl"}, + {3, &NVDRV::Initialize, "Initialize"}, + }; + RegisterHandlers(functions); +} + +} // namespace Nvidia +} // namespace Service diff --git a/src/core/hle/service/nvdrv/interface.h b/src/core/hle/service/nvdrv/interface.h new file mode 100644 index 000000000..8c95b7217 --- /dev/null +++ b/src/core/hle/service/nvdrv/interface.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 +#include "core/hle/service/nvdrv/nvdrv.h" +#include "core/hle/service/service.h" + +namespace Service { +namespace Nvidia { + +class NVDRV final : public ServiceFramework { +public: + NVDRV(std::shared_ptr nvdrv, const char* name); + ~NVDRV() = default; + +private: + void Open(Kernel::HLERequestContext& ctx); + void Ioctl(Kernel::HLERequestContext& ctx); + void Initialize(Kernel::HLERequestContext& ctx); + + std::shared_ptr nvdrv; +}; + +} // namespace Nvidia +} // namespace Service diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index be9946505..cf525a875 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -2,12 +2,13 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "core/hle/ipc_helpers.h" #include "core/hle/service/nvdrv/devices/nvdevice.h" #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" #include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h" #include "core/hle/service/nvdrv/devices/nvmap.h" #include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/nvdrv/nvdrv_a.h" +#include "core/hle/service/nvdrv/interface.h" namespace Service { namespace Nvidia { @@ -16,7 +17,8 @@ std::weak_ptr nvdrv; void InstallInterfaces(SM::ServiceManager& service_manager) { auto module_ = std::make_shared(); - std::make_shared(module_)->InstallAsService(service_manager); + std::make_shared(module_, "nvdrv")->InstallAsService(service_manager); + std::make_shared(module_, "nvdrv:a")->InstallAsService(service_manager); nvdrv = module_; } diff --git a/src/core/hle/service/nvdrv/nvdrv_a.cpp b/src/core/hle/service/nvdrv/nvdrv_a.cpp deleted file mode 100644 index 5d3e68792..000000000 --- a/src/core/hle/service/nvdrv/nvdrv_a.cpp +++ /dev/null @@ -1,69 +0,0 @@ -// 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/nvdrv/nvdrv.h" -#include "core/hle/service/nvdrv/nvdrv_a.h" - -namespace Service { -namespace Nvidia { - -void NVDRV_A::Open(Kernel::HLERequestContext& ctx) { - LOG_WARNING(Service, "(STUBBED) called"); - - auto buffer = ctx.BufferDescriptorA()[0]; - - std::string device_name = Memory::ReadCString(buffer.Address(), buffer.Size()); - - u32 fd = nvdrv->Open(device_name); - IPC::RequestBuilder rb{ctx, 4}; - rb.Push(RESULT_SUCCESS); - rb.Push(fd); - rb.Push(0); -} - -void NVDRV_A::Ioctl(Kernel::HLERequestContext& ctx) { - LOG_WARNING(Service, "(STUBBED) called"); - - IPC::RequestParser rp{ctx}; - u32 fd = rp.Pop(); - u32 command = rp.Pop(); - - auto input_buffer = ctx.BufferDescriptorA()[0]; - auto output_buffer = ctx.BufferDescriptorB()[0]; - - std::vector input(input_buffer.Size()); - std::vector output(output_buffer.Size()); - - Memory::ReadBlock(input_buffer.Address(), input.data(), input_buffer.Size()); - - u32 nv_result = nvdrv->Ioctl(fd, command, input, output); - - Memory::WriteBlock(output_buffer.Address(), output.data(), output_buffer.Size()); - - IPC::RequestBuilder rb{ctx, 3}; - rb.Push(RESULT_SUCCESS); - rb.Push(nv_result); -} - -void NVDRV_A::Initialize(Kernel::HLERequestContext& ctx) { - LOG_WARNING(Service, "(STUBBED) called"); - IPC::RequestBuilder rb{ctx, 3}; - rb.Push(RESULT_SUCCESS); - rb.Push(0); -} - -NVDRV_A::NVDRV_A(std::shared_ptr nvdrv) - : ServiceFramework("nvdrv:a"), nvdrv(std::move(nvdrv)) { - static const FunctionInfo functions[] = { - {0, &NVDRV_A::Open, "Open"}, - {1, &NVDRV_A::Ioctl, "Ioctl"}, - {3, &NVDRV_A::Initialize, "Initialize"}, - }; - RegisterHandlers(functions); -} - -} // namespace Nvidia -} // namespace Service diff --git a/src/core/hle/service/nvdrv/nvdrv_a.h b/src/core/hle/service/nvdrv/nvdrv_a.h deleted file mode 100644 index 743870555..000000000 --- a/src/core/hle/service/nvdrv/nvdrv_a.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2018 yuzu emulator team -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include -#include -#include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/service.h" - -namespace Service { -namespace Nvidia { - -class NVDRV_A final : public ServiceFramework { -public: - NVDRV_A(std::shared_ptr nvdrv); - ~NVDRV_A() = default; - -private: - void Open(Kernel::HLERequestContext& ctx); - void Ioctl(Kernel::HLERequestContext& ctx); - void Initialize(Kernel::HLERequestContext& ctx); - - std::shared_ptr nvdrv; -}; - -} // namespace Nvidia -} // namespace Service -- cgit v1.2.3