diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-02-27 19:46:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-27 19:46:10 -0500 |
| commit | 22432668be6d34b5a5275bcc631cadf512f36bf9 (patch) | |
| tree | 88aeebd3448ad8fa701914839c0b1f3c876c62ac /src/core/hle/service/hid/hid.cpp | |
| parent | 50575c317e9d92d5c269bf7920cbbd286d50f476 (diff) | |
| parent | 975186ad4d7c67b22f580986979d0520530b41c3 (diff) | |
Merge pull request #9859 from liamwhite/tmem-use
service: avoid direct pointer access of transfer memory objects
Diffstat (limited to 'src/core/hle/service/hid/hid.cpp')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 8c99cec06..0da67235f 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -1861,7 +1861,7 @@ void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { .ActivateController(); applet_resource->GetController<Controller_ConsoleSixAxis>(HidController::ConsoleSixAxisSensor) - .SetTransferMemoryPointer(system.Memory().GetPointer(t_mem_1->GetSourceAddress())); + .SetTransferMemoryAddress(t_mem_1->GetSourceAddress()); LOG_WARNING(Service_HID, "called, t_mem_1_handle=0x{:08X}, t_mem_2_handle=0x{:08X}, " @@ -2148,8 +2148,7 @@ void Hid::WritePalmaWaveEntry(Kernel::HLERequestContext& ctx) { connection_handle.npad_id, wave_set, unknown, t_mem_handle, t_mem_size, size); applet_resource->GetController<Controller_Palma>(HidController::Palma) - .WritePalmaWaveEntry(connection_handle, wave_set, - system.Memory().GetPointer(t_mem->GetSourceAddress()), t_mem_size); + .WritePalmaWaveEntry(connection_handle, wave_set, t_mem->GetSourceAddress(), t_mem_size); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); |