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/nvhost_ctrl.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/nvhost_ctrl.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h index dd2e7888a..0b56d7070 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h @@ -25,12 +25,12 @@ public: NvCore::Container& core); ~nvhost_ctrl() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input, - std::span<const u8> inline_input, std::vector<u8>& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output, - std::vector<u8>& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input, + const std::vector<u8>& inline_input, std::vector<u8>& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input, + std::vector<u8>& output, std::vector<u8>& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -186,13 +186,13 @@ private: static_assert(sizeof(IocCtrlEventUnregisterBatchParams) == 8, "IocCtrlEventKill is incorrect size"); - NvResult NvOsGetConfigU32(std::span<const u8> input, std::vector<u8>& output); - NvResult IocCtrlEventWait(std::span<const u8> input, std::vector<u8>& output, + NvResult NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output); + NvResult IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output, bool is_allocation); - NvResult IocCtrlEventRegister(std::span<const u8> input, std::vector<u8>& output); - NvResult IocCtrlEventUnregister(std::span<const u8> input, std::vector<u8>& output); - NvResult IocCtrlEventUnregisterBatch(std::span<const u8> input, std::vector<u8>& output); - NvResult IocCtrlClearEventWait(std::span<const u8> input, std::vector<u8>& output); + NvResult IocCtrlEventRegister(const std::vector<u8>& input, std::vector<u8>& output); + NvResult IocCtrlEventUnregister(const std::vector<u8>& input, std::vector<u8>& output); + NvResult IocCtrlEventUnregisterBatch(const std::vector<u8>& input, std::vector<u8>& output); + NvResult IocCtrlClearEventWait(const std::vector<u8>& input, std::vector<u8>& output); NvResult FreeEvent(u32 slot); |