GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-27 15:45:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support Ioctl3 without the inline output buffer

Browse Source 
This is used by Project Diva for GET_VA_REGIONS
This commit is contained in:
Billy Laws 2021-02-20 17:23:57 +00:00 committed by ◱ Mark
parent c489da610e
commit 9d5138bef1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/cpp/skyline/services/nvdrv/INvDrvServices.cpp
View File

@ -125,10 +125,14 @@ namespace skyline::service::nvdrv {
// Strip the permissions from the command leaving only the ID // Strip the permissions from the command leaving only the ID
cmd &= 0xFFFF; cmd &= 0xFFFF;
if (request.inputBuf.empty() || request.outputBuf.size() < 2) if (request.inputBuf.empty() || request.outputBuf.empty()) {
throw exception("Inadequate amount of buffers for IOCTL3: I - {}, O - {}", request.inputBuf.size(), request.outputBuf.size()); throw exception("Inadequate amount of buffers for IOCTL3: I - {}, O - {}", request.inputBuf.size(), request.outputBuf.size());
else if (request.inputBuf[0].data() != request.outputBuf[0].data()) } else if (request.inputBuf[0].data() != request.outputBuf[0].data()) {
throw exception("IOCTL3 Input Buffer (0x{:X}) != Output Buffer (0x{:X}) [Output Buffer #2: 0x{:X}]", request.inputBuf[0].data(), request.outputBuf[0].data(), request.outputBuf[1].data()); if (request.outputBuf.size() >= 2)
throw exception("IOCTL3 Input Buffer (0x{:X}) != Output Buffer (0x{:X}) [Output Buffer #2: 0x{:X}]", request.inputBuf[0].data(), request.outputBuf[0].data(), request.outputBuf[1].data());
else
throw exception("IOCTL3 Input Buffer (0x{:X}) != Output Buffer (0x{:X})", request.inputBuf[0].data(), request.outputBuf[0].data());
}
span<u8> buffer{}; span<u8> buffer{};
if (request.inputBuf[0].size() >= request.outputBuf[0].size()) if (request.inputBuf[0].size() >= request.outputBuf[0].size())
@ -136,7 +140,8 @@ namespace skyline::service::nvdrv {
else else
buffer = request.outputBuf[0]; buffer = request.outputBuf[0];
response.Push(device->HandleIoctl(cmd, device::IoctlType::Ioctl3, buffer, request.outputBuf[1]));
response.Push(device->HandleIoctl(cmd, device::IoctlType::Ioctl3, buffer, request.outputBuf.size() >= 2 ? request.outputBuf[1] : span<u8>()));
return {}; return {};
} }