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/hle/service/nvdrv/nvdrv_a.cpp | 69 ---------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 src/core/hle/service/nvdrv/nvdrv_a.cpp (limited to 'src/core/hle/service/nvdrv/nvdrv_a.cpp') 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 -- cgit v1.2.3