diff options
| author | bunnei <bunneidev@gmail.com> | 2018-05-30 04:35:41 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-05-30 04:35:41 +0200 |
| commit | 0658973a4e2df90b6676510e6b788bc84d0f072d (patch) | |
| tree | 886d4567a7d474c5f37b498ca11f23af6470d77d | |
| parent | gl_rasterize_cache: Invert order of tex format RGB565. (diff) | |
| download | yuzu-0658973a4e2df90b6676510e6b788bc84d0f072d.tar yuzu-0658973a4e2df90b6676510e6b788bc84d0f072d.tar.gz yuzu-0658973a4e2df90b6676510e6b788bc84d0f072d.tar.bz2 yuzu-0658973a4e2df90b6676510e6b788bc84d0f072d.tar.lz yuzu-0658973a4e2df90b6676510e6b788bc84d0f072d.tar.xz yuzu-0658973a4e2df90b6676510e6b788bc84d0f072d.tar.zst yuzu-0658973a4e2df90b6676510e6b788bc84d0f072d.zip | |
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 12 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl.h | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index e979b9707..a2d3584e5 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -16,7 +16,9 @@ u32 nvhost_ctrl::ioctl(Ioctl command, const std::vector<u8>& input, std::vector< case IoctlCommand::IocGetConfigCommand: return NvOsGetConfigU32(input, output); case IoctlCommand::IocCtrlEventWaitCommand: - return IocCtrlEventWait(input, output); + return IocCtrlEventWait(input, output, false); + case IoctlCommand::IocCtrlEventWaitAsyncCommand: + return IocCtrlEventWait(input, output, true); } UNIMPLEMENTED_MSG("Unimplemented ioctl"); return 0; @@ -45,11 +47,13 @@ u32 nvhost_ctrl::NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& return 0; } -u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output) { +u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output, + bool is_async) { IocCtrlEventWaitParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); - NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, syncpt_id={} threshold={} timeout={}", - params.syncpt_id, params.threshold, params.timeout); + NGLOG_WARNING(Service_NVDRV, + "(STUBBED) called, syncpt_id={}, threshold={}, timeout={}, is_async={}", + params.syncpt_id, params.threshold, params.timeout, is_async); // TODO(Subv): Implement actual syncpt waiting. params.value = 0; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h index aa9b5a14b..b2a5de65f 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h @@ -134,7 +134,7 @@ private: u32 NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output); - u32 IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output); + u32 IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output, bool is_async); }; } // namespace Service::Nvidia::Devices |