diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-12-26 17:46:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-26 17:46:11 +0100 |
commit | de1e5584b32edcc5b43dd7b5757ee4b361f9f70c (patch) | |
tree | a11721530b76fa281f0793ed8469fd9a847f5489 /src/core/hle/service/hid/hid_server.cpp | |
parent | Merge pull request #12471 from FearlessTobi/port-7146 (diff) | |
parent | am/jit: reference memory instance from context (diff) | |
download | yuzu-de1e5584b32edcc5b43dd7b5757ee4b361f9f70c.tar yuzu-de1e5584b32edcc5b43dd7b5757ee4b361f9f70c.tar.gz yuzu-de1e5584b32edcc5b43dd7b5757ee4b361f9f70c.tar.bz2 yuzu-de1e5584b32edcc5b43dd7b5757ee4b361f9f70c.tar.lz yuzu-de1e5584b32edcc5b43dd7b5757ee4b361f9f70c.tar.xz yuzu-de1e5584b32edcc5b43dd7b5757ee4b361f9f70c.tar.zst yuzu-de1e5584b32edcc5b43dd7b5757ee4b361f9f70c.zip |
Diffstat (limited to 'src/core/hle/service/hid/hid_server.cpp')
-rw-r--r-- | src/core/hle/service/hid/hid_server.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/hle/service/hid/hid_server.cpp b/src/core/hle/service/hid/hid_server.cpp index 06a01c02c..3174672af 100644 --- a/src/core/hle/service/hid/hid_server.cpp +++ b/src/core/hle/service/hid/hid_server.cpp @@ -1850,8 +1850,7 @@ void IHidServer::InitializeSevenSixAxisSensor(HLERequestContext& ctx) { ASSERT_MSG(t_mem_1_size == 0x1000, "t_mem_1_size is not 0x1000 bytes"); ASSERT_MSG(t_mem_2_size == 0x7F000, "t_mem_2_size is not 0x7F000 bytes"); - auto t_mem_1 = system.ApplicationProcess()->GetHandleTable().GetObject<Kernel::KTransferMemory>( - t_mem_1_handle); + auto t_mem_1 = ctx.GetObjectFromHandle<Kernel::KTransferMemory>(t_mem_1_handle); if (t_mem_1.IsNull()) { LOG_ERROR(Service_HID, "t_mem_1 is a nullptr for handle=0x{:08X}", t_mem_1_handle); @@ -1860,8 +1859,7 @@ void IHidServer::InitializeSevenSixAxisSensor(HLERequestContext& ctx) { return; } - auto t_mem_2 = system.ApplicationProcess()->GetHandleTable().GetObject<Kernel::KTransferMemory>( - t_mem_2_handle); + auto t_mem_2 = ctx.GetObjectFromHandle<Kernel::KTransferMemory>(t_mem_2_handle); if (t_mem_2.IsNull()) { LOG_ERROR(Service_HID, "t_mem_2 is a nullptr for handle=0x{:08X}", t_mem_2_handle); @@ -2142,8 +2140,7 @@ void IHidServer::WritePalmaWaveEntry(HLERequestContext& ctx) { ASSERT_MSG(t_mem_size == 0x3000, "t_mem_size is not 0x3000 bytes"); - auto t_mem = system.ApplicationProcess()->GetHandleTable().GetObject<Kernel::KTransferMemory>( - t_mem_handle); + auto t_mem = ctx.GetObjectFromHandle<Kernel::KTransferMemory>(t_mem_handle); if (t_mem.IsNull()) { LOG_ERROR(Service_HID, "t_mem is a nullptr for handle=0x{:08X}", t_mem_handle); |