From f9259c03832eff2d71279802af56d14c14b69844 Mon Sep 17 00:00:00 2001 From: David Marcec Date: Thu, 19 Sep 2019 15:37:25 +1000 Subject: Initial implementation of Ioctl2 & Ioctl3 Purpose of Ioctl2 and Ioctl3 is to prevent the passing of raw pointers through ioctls --- src/core/hle/service/nvdrv/nvdrv.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/core/hle/service/nvdrv/nvdrv.cpp') diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 2011a226a..307a7e928 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -71,13 +71,14 @@ u32 Module::Open(const std::string& device_name) { return fd; } -u32 Module::Ioctl(u32 fd, u32 command, const std::vector& input, std::vector& output, - IoctlCtrl& ctrl) { +u32 Module::Ioctl(u32 fd, u32 command, const std::vector& input, const std::vector& input2, + std::vector& output, std::vector& output2, IoctlCtrl& ctrl, + IoctlVersion version) { auto itr = open_files.find(fd); ASSERT_MSG(itr != open_files.end(), "Tried to talk to an invalid device"); auto& device = itr->second; - return device->ioctl({command}, input, output, ctrl); + return device->ioctl({command}, input, input2, output, output2, ctrl, version); } ResultCode Module::Close(u32 fd) { -- cgit v1.2.3