diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-19 04:03:15 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-19 04:03:15 +0200 |
commit | 723dc644faa6e29250d1b7fa914dfb7c75d8aec5 (patch) | |
tree | c7ad927e2cbe1424046e279b3212ac895f4b1e87 /src/core/hle/service/ir | |
parent | ResultVal: Add an rvalue overload of Unwrap() (diff) | |
download | yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.gz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.bz2 yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.lz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.xz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.zst yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.zip |
Diffstat (limited to 'src/core/hle/service/ir')
-rw-r--r-- | src/core/hle/service/ir/ir_rst.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/service/ir/ir_user.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/ir/ir_rst.cpp b/src/core/hle/service/ir/ir_rst.cpp index 0de698003..837413f93 100644 --- a/src/core/hle/service/ir/ir_rst.cpp +++ b/src/core/hle/service/ir/ir_rst.cpp @@ -145,8 +145,8 @@ static void GetHandles(Interface* self) { IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x01, 0, 0); IPC::RequestBuilder rb = rp.MakeBuilder(1, 3); rb.Push(RESULT_SUCCESS); - rb.PushMoveHandles(Kernel::g_handle_table.Create(Service::IR::shared_memory).MoveFrom(), - Kernel::g_handle_table.Create(Service::IR::update_event).MoveFrom()); + rb.PushMoveHandles(Kernel::g_handle_table.Create(Service::IR::shared_memory).Unwrap(), + Kernel::g_handle_table.Create(Service::IR::update_event).Unwrap()); } /** diff --git a/src/core/hle/service/ir/ir_user.cpp b/src/core/hle/service/ir/ir_user.cpp index fdecdce64..fbdf7a465 100644 --- a/src/core/hle/service/ir/ir_user.cpp +++ b/src/core/hle/service/ir/ir_user.cpp @@ -337,7 +337,7 @@ void GetReceiveEvent(Interface* self) { IPC::RequestBuilder rb(Kernel::GetCommandBuffer(), 0x0A, 1, 2); rb.Push(RESULT_SUCCESS); - rb.PushCopyHandles(Kernel::g_handle_table.Create(Service::IR::receive_event).MoveFrom()); + rb.PushCopyHandles(Kernel::g_handle_table.Create(Service::IR::receive_event).Unwrap()); LOG_INFO(Service_IR, "called"); } @@ -354,7 +354,7 @@ void GetSendEvent(Interface* self) { IPC::RequestBuilder rb(Kernel::GetCommandBuffer(), 0x0B, 1, 2); rb.Push(RESULT_SUCCESS); - rb.PushCopyHandles(Kernel::g_handle_table.Create(Service::IR::send_event).MoveFrom()); + rb.PushCopyHandles(Kernel::g_handle_table.Create(Service::IR::send_event).Unwrap()); LOG_INFO(Service_IR, "called"); } @@ -394,7 +394,7 @@ static void GetConnectionStatusEvent(Interface* self) { IPC::RequestBuilder rb(Kernel::GetCommandBuffer(), 0x0C, 1, 2); rb.Push(RESULT_SUCCESS); - rb.PushCopyHandles(Kernel::g_handle_table.Create(Service::IR::conn_status_event).MoveFrom()); + rb.PushCopyHandles(Kernel::g_handle_table.Create(Service::IR::conn_status_event).Unwrap()); LOG_INFO(Service_IR, "called"); } |