diff options
| author | 2023-02-13 11:21:43 -0500 | |
|---|---|---|
| committer | 2023-02-13 19:03:12 -0500 | |
| commit | ceda2d280e8a3030c1e23083c5cea9158387fe4c (patch) | |
| tree | 8041460840ed81d4cb74d87eecfb8fb720cdfa15 /src/core/hle/service/nvdrv | |
| parent | kernel: use GetCurrentProcess (diff) | |
| download | yuzu-ceda2d280e8a3030c1e23083c5cea9158387fe4c.tar.gz yuzu-ceda2d280e8a3030c1e23083c5cea9158387fe4c.tar.xz yuzu-ceda2d280e8a3030c1e23083c5cea9158387fe4c.zip | |
general: rename CurrentProcess to ApplicationProcess
Diffstat (limited to 'src/core/hle/service/nvdrv')
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvmap.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 0cdde82a7..e12025560 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | |||
| @@ -150,9 +150,9 @@ NvResult nvhost_ctrl::IocCtrlEventWait(std::span<const u8> input, std::vector<u8 | |||
| 150 | const auto check_failing = [&]() { | 150 | const auto check_failing = [&]() { |
| 151 | if (events[slot].fails > 2) { | 151 | if (events[slot].fails > 2) { |
| 152 | { | 152 | { |
| 153 | auto lk = system.StallProcesses(); | 153 | auto lk = system.StallApplication(); |
| 154 | host1x_syncpoint_manager.WaitHost(fence_id, target_value); | 154 | host1x_syncpoint_manager.WaitHost(fence_id, target_value); |
| 155 | system.UnstallProcesses(); | 155 | system.UnstallApplication(); |
| 156 | } | 156 | } |
| 157 | params.value.raw = target_value; | 157 | params.value.raw = target_value; |
| 158 | return true; | 158 | return true; |
diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp index 29c1e0f01..277afe0b4 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.cpp +++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp | |||
| @@ -127,7 +127,7 @@ NvResult nvmap::IocAlloc(std::span<const u8> input, std::vector<u8>& output) { | |||
| 127 | return result; | 127 | return result; |
| 128 | } | 128 | } |
| 129 | bool is_out_io{}; | 129 | bool is_out_io{}; |
| 130 | ASSERT(system.CurrentProcess() | 130 | ASSERT(system.ApplicationProcess() |
| 131 | ->PageTable() | 131 | ->PageTable() |
| 132 | .LockForMapDeviceAddressSpace(&is_out_io, handle_description->address, | 132 | .LockForMapDeviceAddressSpace(&is_out_io, handle_description->address, |
| 133 | handle_description->size, | 133 | handle_description->size, |
| @@ -254,7 +254,7 @@ NvResult nvmap::IocFree(std::span<const u8> input, std::vector<u8>& output) { | |||
| 254 | 254 | ||
| 255 | if (auto freeInfo{file.FreeHandle(params.handle, false)}) { | 255 | if (auto freeInfo{file.FreeHandle(params.handle, false)}) { |
| 256 | if (freeInfo->can_unlock) { | 256 | if (freeInfo->can_unlock) { |
| 257 | ASSERT(system.CurrentProcess() | 257 | ASSERT(system.ApplicationProcess() |
| 258 | ->PageTable() | 258 | ->PageTable() |
| 259 | .UnlockForDeviceAddressSpace(freeInfo->address, freeInfo->size) | 259 | .UnlockForDeviceAddressSpace(freeInfo->address, freeInfo->size) |
| 260 | .IsSuccess()); | 260 | .IsSuccess()); |