diff options
author | bunnei <bunneidev@gmail.com> | 2020-11-26 06:48:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-26 06:48:57 +0100 |
commit | ebcee03b0c4e02a58eeee6152950e20ab2769283 (patch) | |
tree | a65975463e513253e4340b5b54807bfd15fe0b96 /src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp | |
parent | Merge pull request #5003 from jbeich/clang (diff) | |
parent | nvservices: Reintroducee IoctlCtrl (diff) | |
download | yuzu-ebcee03b0c4e02a58eeee6152950e20ab2769283.tar yuzu-ebcee03b0c4e02a58eeee6152950e20ab2769283.tar.gz yuzu-ebcee03b0c4e02a58eeee6152950e20ab2769283.tar.bz2 yuzu-ebcee03b0c4e02a58eeee6152950e20ab2769283.tar.lz yuzu-ebcee03b0c4e02a58eeee6152950e20ab2769283.tar.xz yuzu-ebcee03b0c4e02a58eeee6152950e20ab2769283.tar.zst yuzu-ebcee03b0c4e02a58eeee6152950e20ab2769283.zip |
Diffstat (limited to 'src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp index 2d7ea433c..647f5907e 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp @@ -16,7 +16,7 @@ nvhost_ctrl_gpu::nvhost_ctrl_gpu(Core::System& system) : nvdevice(system) {} nvhost_ctrl_gpu::~nvhost_ctrl_gpu() = default; NvResult nvhost_ctrl_gpu::Ioctl1(Ioctl command, const std::vector<u8>& input, - std::vector<u8>& output) { + std::vector<u8>& output, IoctlCtrl& ctrl) { switch (command.group) { case 'G': switch (command.cmd) { @@ -48,13 +48,15 @@ NvResult nvhost_ctrl_gpu::Ioctl1(Ioctl command, const std::vector<u8>& input, } NvResult nvhost_ctrl_gpu::Ioctl2(Ioctl command, const std::vector<u8>& input, - const std::vector<u8>& inline_input, std::vector<u8>& output) { + const std::vector<u8>& inline_input, std::vector<u8>& output, + IoctlCtrl& ctrl) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } NvResult nvhost_ctrl_gpu::Ioctl3(Ioctl command, const std::vector<u8>& input, - std::vector<u8>& output, std::vector<u8>& inline_output) { + std::vector<u8>& output, std::vector<u8>& inline_output, + IoctlCtrl& ctrl) { switch (command.group) { case 'G': switch (command.cmd) { @@ -162,7 +164,7 @@ NvResult nvhost_ctrl_gpu::GetCharacteristics(const std::vector<u8>& input, std:: params.gpu_characteristics_buf_size = 0xA0; params.gpu_characteristics_buf_addr = 0xdeadbeef; // Cannot be 0 (UNUSED) - std::memcpy(output.data(), input.data(), output.size()); + std::memcpy(output.data(), ¶ms, output.size()); std::memcpy(inline_output.data(), ¶ms.gc, inline_output.size()); return NvResult::Success; } |