prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor ioctl so nv_result isn't needed

Browse Source
This commit is contained in:
David Marcec
2018-02-05 01:25:25 -08:00
parent b440232d61
commit 1fd1581201
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/hle/service/nvdrv/interface.cpp
View File

@@ -32,14 +32,15 @@ void NVDRV::Ioctl(Kernel::HLERequestContext& ctx) {
u32 fd = rp.Pop<u32>(); u32 fd = rp.Pop<u32>();
u32 command = rp.Pop<u32>(); u32 command = rp.Pop<u32>();
u32 nv_result = 0x0; IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
if (ctx.BufferDescriptorA()[0].Size() != 0) { if (ctx.BufferDescriptorA()[0].Size() != 0) {
auto input_buffer = ctx.BufferDescriptorA()[0]; auto input_buffer = ctx.BufferDescriptorA()[0];
auto output_buffer = ctx.BufferDescriptorB()[0]; auto output_buffer = ctx.BufferDescriptorB()[0];
std::vector<u8> input(input_buffer.Size()); std::vector<u8> input(input_buffer.Size());
std::vector<u8> output(output_buffer.Size()); std::vector<u8> output(output_buffer.Size());
Memory::ReadBlock(input_buffer.Address(), input.data(), input_buffer.Size()); Memory::ReadBlock(input_buffer.Address(), input.data(), input_buffer.Size());
nv_result = nvdrv->Ioctl(fd, command, input, output); rb.Push(nvdrv->Ioctl(fd, command, input, output));
Memory::WriteBlock(output_buffer.Address(), output.data(), output_buffer.Size()); Memory::WriteBlock(output_buffer.Address(), output.data(), output_buffer.Size());
} else { } else {
auto input_buffer = ctx.BufferDescriptorX()[0]; auto input_buffer = ctx.BufferDescriptorX()[0];
@@ -47,13 +48,9 @@ void NVDRV::Ioctl(Kernel::HLERequestContext& ctx) {
std::vector<u8> input(input_buffer.size); std::vector<u8> input(input_buffer.size);
std::vector<u8> output(output_buffer.size); std::vector<u8> output(output_buffer.size);
Memory::ReadBlock(input_buffer.Address(), input.data(), input_buffer.size); Memory::ReadBlock(input_buffer.Address(), input.data(), input_buffer.size);
nv_result = nvdrv->Ioctl(fd, command, input, output); rb.Push(nvdrv->Ioctl(fd, command, input, output));
Memory::WriteBlock(output_buffer.Address(), output.data(), output_buffer.size); Memory::WriteBlock(output_buffer.Address(), output.data(), output_buffer.size);
} }
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
rb.Push(nv_result);
} }
void NVDRV::Close(Kernel::HLERequestContext& ctx) { void NVDRV::Close(Kernel::HLERequestContext& ctx) {