diff options
author | bunnei <bunneidev@gmail.com> | 2023-02-03 04:04:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-03 04:04:50 +0100 |
commit | 25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd (patch) | |
tree | a86c945d2e8789250005ac38ebbb36c48e95b30c /src/core/hle/service/nvdrv/devices/nvdevice.h | |
parent | Merge pull request #9704 from liamwhite/das (diff) | |
parent | Revert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer" (diff) | |
download | yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.gz yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.bz2 yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.lz yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.xz yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.zst yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvdevice.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvdevice.h b/src/core/hle/service/nvdrv/devices/nvdevice.h index c562e04d2..204b0e757 100644 --- a/src/core/hle/service/nvdrv/devices/nvdevice.h +++ b/src/core/hle/service/nvdrv/devices/nvdevice.h @@ -3,9 +3,7 @@ #pragma once -#include <span> #include <vector> - #include "common/common_types.h" #include "core/hle/service/nvdrv/nvdata.h" @@ -33,7 +31,7 @@ public: * @param output A buffer where the output data will be written to. * @returns The result code of the ioctl. */ - virtual NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input, + virtual NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) = 0; /** @@ -44,8 +42,8 @@ public: * @param output A buffer where the output data will be written to. * @returns The result code of the ioctl. */ - virtual NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input, - std::span<const u8> inline_input, std::vector<u8>& output) = 0; + virtual NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input, + const std::vector<u8>& inline_input, std::vector<u8>& output) = 0; /** * Handles an ioctl3 request. @@ -55,7 +53,7 @@ public: * @param inline_output A buffer where the inlined output data will be written to. * @returns The result code of the ioctl. */ - virtual NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, + virtual NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input, std::vector<u8>& output, std::vector<u8>& inline_output) = 0; /** |