diff options
| author |  David Marcec | 2019-09-22 12:21:07 +1000 |
|---|---|---|
| committer | David Marcec | 2019-09-22 12:21:07 +1000 |
| commit | d3783fcc5231b468d41e689458788c365d157b8e (patch) | |
| tree | 68a6af3b5e81d037abc87ddb36f8a9f1a7a4d594 | |
| parent | disable clang-format temp (diff) | |
| download | yuzu-d3783fcc5231b468d41e689458788c365d157b8e.tar.gz yuzu-d3783fcc5231b468d41e689458788c365d157b8e.tar.xz yuzu-d3783fcc5231b468d41e689458788c365d157b8e.zip | |
Use clang-format provided by build server
| -rw-r--r-- | src/core/hle/service/nvdrv/interface.cpp | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/src/core/hle/service/nvdrv/interface.cpp b/src/core/hle/service/nvdrv/interface.cpp index 699494fcd..56cfc02c5 100644 --- a/src/core/hle/service/nvdrv/interface.cpp +++ b/src/core/hle/service/nvdrv/interface.cpp | |||
| @@ -60,26 +60,24 @@ void NVDRV::IoctlBase(Kernel::HLERequestContext& ctx, IoctlVersion version) { | |||
| 60 | 60 | ||
| 61 | if (ctrl.must_delay) { | 61 | if (ctrl.must_delay) { |
| 62 | ctrl.fresh_call = false; | 62 | ctrl.fresh_call = false; |
| 63 | // clang-format off | 63 | ctx.SleepClientThread("NVServices::DelayedResponse", ctrl.timeout, |
| 64 | ctx.SleepClientThread( | 64 | [=](Kernel::SharedPtr<Kernel::Thread> thread, |
| 65 | "NVServices::DelayedResponse", ctrl.timeout, | 65 | Kernel::HLERequestContext& ctx, |
| 66 | [=](Kernel::SharedPtr<Kernel::Thread> thread, Kernel::HLERequestContext& ctx, | 66 | Kernel::ThreadWakeupReason reason) { |
| 67 | Kernel::ThreadWakeupReason reason) { | 67 | IoctlCtrl ctrl2{ctrl}; |
| 68 | IoctlCtrl ctrl2{ctrl}; | 68 | std::vector<u8> tmp_output = output; |
| 69 | std::vector<u8> tmp_output = output; | 69 | std::vector<u8> tmp_output2 = output2; |
| 70 | std::vector<u8> tmp_output2 = output2; | 70 | u32 result = nvdrv->Ioctl(fd, command, input, input2, tmp_output, |
| 71 | u32 result = nvdrv->Ioctl(fd, command, input, input2, tmp_output, tmp_output2, | 71 | tmp_output2, ctrl2, version); |
| 72 | ctrl2, version); | 72 | ctx.WriteBuffer(tmp_output, 0); |
| 73 | ctx.WriteBuffer(tmp_output, 0); | 73 | if (version == IoctlVersion::Version3) { |
| 74 | if (version == IoctlVersion::Version3) { | 74 | ctx.WriteBuffer(tmp_output2, 1); |
| 75 | ctx.WriteBuffer(tmp_output2, 1); | 75 | } |
| 76 | } | 76 | IPC::ResponseBuilder rb{ctx, 3}; |
| 77 | IPC::ResponseBuilder rb{ctx, 3}; | 77 | rb.Push(RESULT_SUCCESS); |
| 78 | rb.Push(RESULT_SUCCESS); | 78 | rb.Push(result); |
| 79 | rb.Push(result); | 79 | }, |
| 80 | }, | 80 | nvdrv->GetEventWriteable(ctrl.event_id)); |
| 81 | nvdrv->GetEventWriteable(ctrl.event_id)); | ||
| 82 | // clang-format on | ||
| 83 | } else { | 81 | } else { |
| 84 | ctx.WriteBuffer(output); | 82 | ctx.WriteBuffer(output); |
| 85 | if (version == IoctlVersion::Version3) { | 83 | if (version == IoctlVersion::Version3) { |