diff options
| author | 2018-05-29 22:35:41 -0400 | |
|---|---|---|
| committer | 2018-05-29 22:35:41 -0400 | |
| commit | 0658973a4e2df90b6676510e6b788bc84d0f072d (patch) | |
| tree | 886d4567a7d474c5f37b498ca11f23af6470d77d /src | |
| parent | gl_rasterize_cache: Invert order of tex format RGB565. (diff) | |
| download | yuzu-0658973a4e2df90b6676510e6b788bc84d0f072d.tar.gz yuzu-0658973a4e2df90b6676510e6b788bc84d0f072d.tar.xz yuzu-0658973a4e2df90b6676510e6b788bc84d0f072d.zip | |
nvhost_ctrl: Stub out IocCtrlEventWaitAsyncCommand.
Diffstat (limited to 'src')
| -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< | |||
| 16 | case IoctlCommand::IocGetConfigCommand: | 16 | case IoctlCommand::IocGetConfigCommand: |
| 17 | return NvOsGetConfigU32(input, output); | 17 | return NvOsGetConfigU32(input, output); |
| 18 | case IoctlCommand::IocCtrlEventWaitCommand: | 18 | case IoctlCommand::IocCtrlEventWaitCommand: |
| 19 | return IocCtrlEventWait(input, output); | 19 | return IocCtrlEventWait(input, output, false); |
| 20 | case IoctlCommand::IocCtrlEventWaitAsyncCommand: | ||
| 21 | return IocCtrlEventWait(input, output, true); | ||
| 20 | } | 22 | } |
| 21 | UNIMPLEMENTED_MSG("Unimplemented ioctl"); | 23 | UNIMPLEMENTED_MSG("Unimplemented ioctl"); |
| 22 | return 0; | 24 | return 0; |
| @@ -45,11 +47,13 @@ u32 nvhost_ctrl::NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& | |||
| 45 | return 0; | 47 | return 0; |
| 46 | } | 48 | } |
| 47 | 49 | ||
| 48 | u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output) { | 50 | u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output, |
| 51 | bool is_async) { | ||
| 49 | IocCtrlEventWaitParams params{}; | 52 | IocCtrlEventWaitParams params{}; |
| 50 | std::memcpy(¶ms, input.data(), sizeof(params)); | 53 | std::memcpy(¶ms, input.data(), sizeof(params)); |
| 51 | NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, syncpt_id={} threshold={} timeout={}", | 54 | NGLOG_WARNING(Service_NVDRV, |
| 52 | params.syncpt_id, params.threshold, params.timeout); | 55 | "(STUBBED) called, syncpt_id={}, threshold={}, timeout={}, is_async={}", |
| 56 | params.syncpt_id, params.threshold, params.timeout, is_async); | ||
| 53 | 57 | ||
| 54 | // TODO(Subv): Implement actual syncpt waiting. | 58 | // TODO(Subv): Implement actual syncpt waiting. |
| 55 | params.value = 0; | 59 | 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: | |||
| 134 | 134 | ||
| 135 | u32 NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output); | 135 | u32 NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output); |
| 136 | 136 | ||
| 137 | u32 IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output); | 137 | u32 IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output, bool is_async); |
| 138 | }; | 138 | }; |
| 139 | 139 | ||
| 140 | } // namespace Service::Nvidia::Devices | 140 | } // namespace Service::Nvidia::Devices |