diff options
| author | bunnei <bunneidev@gmail.com> | 2023-01-30 21:17:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-30 21:17:09 +0100 |
| commit | ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a (patch) | |
| tree | 54b6ce04e859b1dee33f4331f392c0d645f4db43 /src/core/hle/service/nvdrv/nvdrv.cpp | |
| parent | Merge pull request #9701 from german77/common_protocol (diff) | |
| parent | hle_ipc: Use thread_local ReadBuffer (diff) | |
| download | yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.gz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.bz2 yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.lz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.xz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.zst yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.zip | |
Diffstat (limited to 'src/core/hle/service/nvdrv/nvdrv.cpp')
| -rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 6fc8565c0..52d27e755 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -124,7 +124,7 @@ DeviceFD Module::Open(const std::string& device_name) { return fd; } -NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input, +NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output) { if (fd < 0) { LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd); @@ -141,8 +141,8 @@ NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input return itr->second->Ioctl1(fd, command, input, output); } -NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input, - const std::vector<u8>& inline_input, std::vector<u8>& output) { +NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input, + std::span<const u8> inline_input, std::vector<u8>& output) { if (fd < 0) { LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd); return NvResult::InvalidState; @@ -158,7 +158,7 @@ NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input return itr->second->Ioctl2(fd, command, input, inline_input, output); } -NvResult Module::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input, +NvResult Module::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output, std::vector<u8>& inline_output) { if (fd < 0) { LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd); |