diff options
| author | Chloe Marcec <dmarcecguzman@gmail.com> | 2020-11-24 06:40:23 +0100 |
|---|---|---|
| committer | Chloe Marcec <dmarcecguzman@gmail.com> | 2020-11-24 06:40:23 +0100 |
| commit | ab25d1fe9a7e3678b868855eecd402eec2efd1d6 (patch) | |
| tree | 0807e2c296751459e259026ab8dd47f095725f28 /src/core/hle/service/nvdrv/devices/nvhost_ctrl.h | |
| parent | Fix warnings in core/frontend/input.h with [[maybe_unused]] (diff) | |
| download | yuzu-ab25d1fe9a7e3678b868855eecd402eec2efd1d6.tar yuzu-ab25d1fe9a7e3678b868855eecd402eec2efd1d6.tar.gz yuzu-ab25d1fe9a7e3678b868855eecd402eec2efd1d6.tar.bz2 yuzu-ab25d1fe9a7e3678b868855eecd402eec2efd1d6.tar.lz yuzu-ab25d1fe9a7e3678b868855eecd402eec2efd1d6.tar.xz yuzu-ab25d1fe9a7e3678b868855eecd402eec2efd1d6.tar.zst yuzu-ab25d1fe9a7e3678b868855eecd402eec2efd1d6.zip | |
Diffstat (limited to 'src/core/hle/service/nvdrv/devices/nvhost_ctrl.h')
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h index c5aa1362a..107168e21 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h @@ -18,11 +18,13 @@ public: SyncpointManager& syncpoint_manager); ~nvhost_ctrl() override; - NvResult Ioctl1(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override; + NvResult Ioctl1(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output, + IoctlCtrl& ctrl) override; NvResult Ioctl2(Ioctl command, const std::vector<u8>& input, - const std::vector<u8>& inline_input, std::vector<u8>& output) override; + const std::vector<u8>& inline_input, std::vector<u8>& output, + IoctlCtrl& ctrl) override; NvResult Ioctl3(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output, - std::vector<u8>& inline_output) override; + std::vector<u8>& inline_output, IoctlCtrl& ctrl) override; private: struct IocSyncptReadParams { @@ -121,7 +123,8 @@ private: static_assert(sizeof(IocCtrlEventKill) == 8, "IocCtrlEventKill is incorrect size"); NvResult NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output); - NvResult IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output, bool is_async); + NvResult IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output, bool is_async, + IoctlCtrl& ctrl); NvResult IocCtrlEventRegister(const std::vector<u8>& input, std::vector<u8>& output); NvResult IocCtrlEventUnregister(const std::vector<u8>& input, std::vector<u8>& output); NvResult IocCtrlClearEventWait(const std::vector<u8>& input, std::vector<u8>& output); |