diff options
| author | 2016-07-30 18:19:00 +0200 | |
|---|---|---|
| committer | 2016-08-02 16:45:15 +0200 | |
| commit | a94fb932ff8a326a2e85ab3814663af565313ec5 (patch) | |
| tree | a56b18ae8e62bfe3dff6a2948264e1918eafcada /src/core/hle/service | |
| parent | Input GUI: Add tab to remap controls (#1900) (diff) | |
| download | yuzu-a94fb932ff8a326a2e85ab3814663af565313ec5.tar.gz yuzu-a94fb932ff8a326a2e85ab3814663af565313ec5.tar.xz yuzu-a94fb932ff8a326a2e85ab3814663af565313ec5.zip | |
fix #1942 and adds a few IPC functions for descriptors
Diffstat (limited to 'src/core/hle/service')
| -rw-r--r-- | src/core/hle/service/apt/apt.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/cam/cam.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/csnd_snd.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/srv.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp index c009e6c98..5af0d49ba 100644 --- a/src/core/hle/service/apt/apt.cpp +++ b/src/core/hle/service/apt/apt.cpp | |||
| @@ -53,7 +53,7 @@ void Initialize(Service::Interface* self) { | |||
| 53 | u32 app_id = cmd_buff[1]; | 53 | u32 app_id = cmd_buff[1]; |
| 54 | u32 flags = cmd_buff[2]; | 54 | u32 flags = cmd_buff[2]; |
| 55 | 55 | ||
| 56 | cmd_buff[2] = IPC::MoveHandleDesc(2); | 56 | cmd_buff[2] = IPC::CopyHandleDesc(2); |
| 57 | cmd_buff[3] = Kernel::g_handle_table.Create(notification_event).MoveFrom(); | 57 | cmd_buff[3] = Kernel::g_handle_table.Create(notification_event).MoveFrom(); |
| 58 | cmd_buff[4] = Kernel::g_handle_table.Create(parameter_event).MoveFrom(); | 58 | cmd_buff[4] = Kernel::g_handle_table.Create(parameter_event).MoveFrom(); |
| 59 | 59 | ||
| @@ -96,7 +96,7 @@ void GetSharedFont(Service::Interface* self) { | |||
| 96 | // the real APT service calculates this address by scanning the entire address space (using svcQueryMemory) | 96 | // the real APT service calculates this address by scanning the entire address space (using svcQueryMemory) |
| 97 | // and searches for an allocation of the same size as the Shared Font. | 97 | // and searches for an allocation of the same size as the Shared Font. |
| 98 | cmd_buff[2] = target_address; | 98 | cmd_buff[2] = target_address; |
| 99 | cmd_buff[3] = IPC::MoveHandleDesc(); | 99 | cmd_buff[3] = IPC::CopyHandleDesc(); |
| 100 | cmd_buff[4] = Kernel::g_handle_table.Create(shared_font_mem).MoveFrom(); | 100 | cmd_buff[4] = Kernel::g_handle_table.Create(shared_font_mem).MoveFrom(); |
| 101 | } | 101 | } |
| 102 | 102 | ||
diff --git a/src/core/hle/service/cam/cam.cpp b/src/core/hle/service/cam/cam.cpp index 9df48a650..6edcf9610 100644 --- a/src/core/hle/service/cam/cam.cpp +++ b/src/core/hle/service/cam/cam.cpp | |||
| @@ -51,7 +51,7 @@ void GetVsyncInterruptEvent(Service::Interface* self) { | |||
| 51 | 51 | ||
| 52 | cmd_buff[0] = IPC::MakeHeader(0x5, 1, 2); | 52 | cmd_buff[0] = IPC::MakeHeader(0x5, 1, 2); |
| 53 | cmd_buff[1] = RESULT_SUCCESS.raw; | 53 | cmd_buff[1] = RESULT_SUCCESS.raw; |
| 54 | cmd_buff[2] = IPC::MoveHandleDesc(); | 54 | cmd_buff[2] = IPC::CopyHandleDesc(); |
| 55 | cmd_buff[3] = Kernel::g_handle_table.Create(vsync_interrupt_error_event).MoveFrom(); | 55 | cmd_buff[3] = Kernel::g_handle_table.Create(vsync_interrupt_error_event).MoveFrom(); |
| 56 | 56 | ||
| 57 | LOG_WARNING(Service_CAM, "(STUBBED) called, port=%d", port); | 57 | LOG_WARNING(Service_CAM, "(STUBBED) called, port=%d", port); |
| @@ -64,7 +64,7 @@ void GetBufferErrorInterruptEvent(Service::Interface* self) { | |||
| 64 | 64 | ||
| 65 | cmd_buff[0] = IPC::MakeHeader(0x6, 1, 2); | 65 | cmd_buff[0] = IPC::MakeHeader(0x6, 1, 2); |
| 66 | cmd_buff[1] = RESULT_SUCCESS.raw; | 66 | cmd_buff[1] = RESULT_SUCCESS.raw; |
| 67 | cmd_buff[2] = IPC::MoveHandleDesc(); | 67 | cmd_buff[2] = IPC::CopyHandleDesc(); |
| 68 | cmd_buff[3] = Kernel::g_handle_table.Create(interrupt_error_event).MoveFrom(); | 68 | cmd_buff[3] = Kernel::g_handle_table.Create(interrupt_error_event).MoveFrom(); |
| 69 | 69 | ||
| 70 | LOG_WARNING(Service_CAM, "(STUBBED) called, port=%d", port); | 70 | LOG_WARNING(Service_CAM, "(STUBBED) called, port=%d", port); |
| @@ -85,7 +85,7 @@ void SetReceiving(Service::Interface* self) { | |||
| 85 | 85 | ||
| 86 | cmd_buff[0] = IPC::MakeHeader(0x7, 1, 2); | 86 | cmd_buff[0] = IPC::MakeHeader(0x7, 1, 2); |
| 87 | cmd_buff[1] = RESULT_SUCCESS.raw; | 87 | cmd_buff[1] = RESULT_SUCCESS.raw; |
| 88 | cmd_buff[2] = IPC::MoveHandleDesc(); | 88 | cmd_buff[2] = IPC::CopyHandleDesc(); |
| 89 | cmd_buff[3] = Kernel::g_handle_table.Create(completion_event).MoveFrom(); | 89 | cmd_buff[3] = Kernel::g_handle_table.Create(completion_event).MoveFrom(); |
| 90 | 90 | ||
| 91 | LOG_WARNING(Service_CAM, "(STUBBED) called, addr=0x%X, port=%d, image_size=%d, trans_unit=%d", | 91 | LOG_WARNING(Service_CAM, "(STUBBED) called, addr=0x%X, port=%d, image_size=%d, trans_unit=%d", |
diff --git a/src/core/hle/service/csnd_snd.cpp b/src/core/hle/service/csnd_snd.cpp index d2bb8941c..913c8dc09 100644 --- a/src/core/hle/service/csnd_snd.cpp +++ b/src/core/hle/service/csnd_snd.cpp | |||
| @@ -51,7 +51,7 @@ void Initialize(Service::Interface* self) { | |||
| 51 | mutex = Kernel::Mutex::Create(false); | 51 | mutex = Kernel::Mutex::Create(false); |
| 52 | 52 | ||
| 53 | cmd_buff[1] = RESULT_SUCCESS.raw; | 53 | cmd_buff[1] = RESULT_SUCCESS.raw; |
| 54 | cmd_buff[2] = IPC::MoveHandleDesc(2); | 54 | cmd_buff[2] = IPC::CopyHandleDesc(2); |
| 55 | cmd_buff[3] = Kernel::g_handle_table.Create(mutex).MoveFrom(); | 55 | cmd_buff[3] = Kernel::g_handle_table.Create(mutex).MoveFrom(); |
| 56 | cmd_buff[4] = Kernel::g_handle_table.Create(shared_memory).MoveFrom(); | 56 | cmd_buff[4] = Kernel::g_handle_table.Create(shared_memory).MoveFrom(); |
| 57 | } | 57 | } |
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp index 8bd36d5ea..3c05f836b 100644 --- a/src/core/hle/service/srv.cpp +++ b/src/core/hle/service/srv.cpp | |||
| @@ -57,7 +57,7 @@ static void EnableNotification(Service::Interface* self) { | |||
| 57 | 57 | ||
| 58 | cmd_buff[0] = IPC::MakeHeader(0x2, 0x1, 0x2); // 0x20042 | 58 | cmd_buff[0] = IPC::MakeHeader(0x2, 0x1, 0x2); // 0x20042 |
| 59 | cmd_buff[1] = RESULT_SUCCESS.raw; // No error | 59 | cmd_buff[1] = RESULT_SUCCESS.raw; // No error |
| 60 | cmd_buff[2] = IPC::TransferHandleDesc(); | 60 | cmd_buff[2] = IPC::CopyHandleDesc(1); |
| 61 | cmd_buff[3] = Kernel::g_handle_table.Create(event_handle).MoveFrom(); | 61 | cmd_buff[3] = Kernel::g_handle_table.Create(event_handle).MoveFrom(); |
| 62 | LOG_WARNING(Service_SRV, "(STUBBED) called"); | 62 | LOG_WARNING(Service_SRV, "(STUBBED) called"); |
| 63 | } | 63 | } |