diff options
author | David <25727384+ogniK5377@users.noreply.github.com> | 2018-02-06 03:19:31 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-02-06 03:19:31 +0100 |
commit | d129905a665ce329089338b4e468da84b3dab5d6 (patch) | |
tree | 6606df27c05539b67fd5b6e36e4ed671496904ae /src/core/hle/service/nvdrv/interface.cpp | |
parent | Merge pull request #164 from ogniK5377/libnx_sm_fix (diff) | |
download | yuzu-d129905a665ce329089338b4e468da84b3dab5d6.tar yuzu-d129905a665ce329089338b4e468da84b3dab5d6.tar.gz yuzu-d129905a665ce329089338b4e468da84b3dab5d6.tar.bz2 yuzu-d129905a665ce329089338b4e468da84b3dab5d6.tar.lz yuzu-d129905a665ce329089338b4e468da84b3dab5d6.tar.xz yuzu-d129905a665ce329089338b4e468da84b3dab5d6.tar.zst yuzu-d129905a665ce329089338b4e468da84b3dab5d6.zip |
Diffstat (limited to 'src/core/hle/service/nvdrv/interface.cpp')
-rw-r--r-- | src/core/hle/service/nvdrv/interface.cpp | 60 |
1 files changed, 43 insertions, 17 deletions
diff --git a/src/core/hle/service/nvdrv/interface.cpp b/src/core/hle/service/nvdrv/interface.cpp index af8fa44c9..0edb64cc3 100644 --- a/src/core/hle/service/nvdrv/interface.cpp +++ b/src/core/hle/service/nvdrv/interface.cpp @@ -4,6 +4,7 @@ #include "common/logging/log.h" #include "core/hle/ipc_helpers.h" +#include "core/hle/kernel/event.h" #include "core/hle/service/nvdrv/interface.h" #include "core/hle/service/nvdrv/nvdrv.h" @@ -11,7 +12,7 @@ namespace Service { namespace Nvidia { void NVDRV::Open(Kernel::HLERequestContext& ctx) { - LOG_WARNING(Service_NVDRV, "(STUBBED) called"); + LOG_DEBUG(Service_NVDRV, "called"); auto buffer = ctx.BufferDescriptorA()[0]; @@ -25,31 +26,35 @@ void NVDRV::Open(Kernel::HLERequestContext& ctx) { } void NVDRV::Ioctl(Kernel::HLERequestContext& ctx) { - LOG_WARNING(Service_NVDRV, "(STUBBED) called"); + LOG_DEBUG(Service_NVDRV, "called"); IPC::RequestParser rp{ctx}; u32 fd = rp.Pop<u32>(); u32 command = rp.Pop<u32>(); - auto input_buffer = ctx.BufferDescriptorA()[0]; - auto output_buffer = ctx.BufferDescriptorB()[0]; - - std::vector<u8> input(input_buffer.Size()); - std::vector<u8> 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::ResponseBuilder rb{ctx, 3}; rb.Push(RESULT_SUCCESS); - rb.Push(nv_result); + if (ctx.BufferDescriptorA()[0].Size() != 0) { + auto input_buffer = ctx.BufferDescriptorA()[0]; + auto output_buffer = ctx.BufferDescriptorB()[0]; + std::vector<u8> input(input_buffer.Size()); + std::vector<u8> output(output_buffer.Size()); + Memory::ReadBlock(input_buffer.Address(), input.data(), input_buffer.Size()); + rb.Push(nvdrv->Ioctl(fd, command, input, output)); + Memory::WriteBlock(output_buffer.Address(), output.data(), output_buffer.Size()); + } else { + auto input_buffer = ctx.BufferDescriptorX()[0]; + auto output_buffer = ctx.BufferDescriptorC()[0]; + std::vector<u8> input(input_buffer.size); + std::vector<u8> output(output_buffer.size); + Memory::ReadBlock(input_buffer.Address(), input.data(), input_buffer.size); + rb.Push(nvdrv->Ioctl(fd, command, input, output)); + Memory::WriteBlock(output_buffer.Address(), output.data(), output_buffer.size); + } } void NVDRV::Close(Kernel::HLERequestContext& ctx) { - LOG_WARNING(Service_NVDRV, "(STUBBED) called"); + LOG_DEBUG(Service_NVDRV, "called"); IPC::RequestParser rp{ctx}; u32 fd = rp.Pop<u32>(); @@ -67,16 +72,35 @@ void NVDRV::Initialize(Kernel::HLERequestContext& ctx) { rb.Push<u32>(0); } +void NVDRV::QueryEvent(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + u32 fd = rp.Pop<u32>(); + u32 event_id = rp.Pop<u32>(); + LOG_WARNING(Service_NVDRV, "(STUBBED) called, fd=%x, event_id=%x", fd, event_id); + + IPC::ResponseBuilder rb{ctx, 2, 1}; + rb.Push(RESULT_SUCCESS); + auto event = Kernel::Event::Create(Kernel::ResetType::Pulse, "NVEvent"); + event->Signal(); + rb.PushCopyObjects(event); +} + void NVDRV::SetClientPID(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; pid = rp.Pop<u64>(); - LOG_INFO(Service_NVDRV, "called, pid=0x%lx", pid); + LOG_WARNING(Service_NVDRV, "(STUBBED) called, pid=0x%lx", pid); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(RESULT_SUCCESS); rb.Push<u32>(0); } +void NVDRV::FinishInitialize(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service_NVDRV, "(STUBBED) called"); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); +} + NVDRV::NVDRV(std::shared_ptr<Module> nvdrv, const char* name) : ServiceFramework(name), nvdrv(std::move(nvdrv)) { static const FunctionInfo functions[] = { @@ -84,7 +108,9 @@ NVDRV::NVDRV(std::shared_ptr<Module> nvdrv, const char* name) {1, &NVDRV::Ioctl, "Ioctl"}, {2, &NVDRV::Close, "Close"}, {3, &NVDRV::Initialize, "Initialize"}, + {4, &NVDRV::QueryEvent, "QueryEvent"}, {8, &NVDRV::SetClientPID, "SetClientPID"}, + {13, &NVDRV::FinishInitialize, "FinishInitialize"}, }; RegisterHandlers(functions); } |