diff options
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 6401af35a..45da842ef 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -57,7 +57,7 @@ static ResultCode UnmapMemory(VAddr dst_addr, VAddr src_addr, u64 size) { | |||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | /// Connect to an OS service given the port name, returns the handle to the port to out | 59 | /// Connect to an OS service given the port name, returns the handle to the port to out |
| 60 | static ResultCode ConnectToPort(Handle* out_handle, VAddr port_name_address) { | 60 | static ResultCode ConnectToNamedPort(Handle* out_handle, VAddr port_name_address) { |
| 61 | if (!Memory::IsValidVirtualAddress(port_name_address)) | 61 | if (!Memory::IsValidVirtualAddress(port_name_address)) |
| 62 | return ERR_NOT_FOUND; | 62 | return ERR_NOT_FOUND; |
| 63 | 63 | ||
| @@ -253,8 +253,8 @@ static ResultCode CancelSynchronization(Handle thread_handle) { | |||
| 253 | } | 253 | } |
| 254 | 254 | ||
| 255 | /// Attempts to locks a mutex, creating it if it does not already exist | 255 | /// Attempts to locks a mutex, creating it if it does not already exist |
| 256 | static ResultCode LockMutex(Handle holding_thread_handle, VAddr mutex_addr, | 256 | static ResultCode ArbitrateLock(Handle holding_thread_handle, VAddr mutex_addr, |
| 257 | Handle requesting_thread_handle) { | 257 | Handle requesting_thread_handle) { |
| 258 | LOG_TRACE(Kernel_SVC, "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, " | 258 | LOG_TRACE(Kernel_SVC, "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, " |
| 259 | "requesting_current_thread_handle=0x%08X", | 259 | "requesting_current_thread_handle=0x%08X", |
| 260 | holding_thread_handle, mutex_addr, requesting_thread_handle); | 260 | holding_thread_handle, mutex_addr, requesting_thread_handle); |
| @@ -277,7 +277,7 @@ static ResultCode LockMutex(Handle holding_thread_handle, VAddr mutex_addr, | |||
| 277 | } | 277 | } |
| 278 | 278 | ||
| 279 | /// Unlock a mutex | 279 | /// Unlock a mutex |
| 280 | static ResultCode UnlockMutex(VAddr mutex_addr) { | 280 | static ResultCode ArbitrateUnlock(VAddr mutex_addr) { |
| 281 | LOG_TRACE(Kernel_SVC, "called mutex_addr=0x%llx", mutex_addr); | 281 | LOG_TRACE(Kernel_SVC, "called mutex_addr=0x%llx", mutex_addr); |
| 282 | 282 | ||
| 283 | SharedPtr<Mutex> mutex = g_object_address_table.Get<Mutex>(mutex_addr); | 283 | SharedPtr<Mutex> mutex = g_object_address_table.Get<Mutex>(mutex_addr); |
| @@ -774,12 +774,12 @@ static const FunctionDef SVC_Table[] = { | |||
| 774 | {0x17, SvcWrap<ResetSignal>, "ResetSignal"}, | 774 | {0x17, SvcWrap<ResetSignal>, "ResetSignal"}, |
| 775 | {0x18, SvcWrap<WaitSynchronization>, "WaitSynchronization"}, | 775 | {0x18, SvcWrap<WaitSynchronization>, "WaitSynchronization"}, |
| 776 | {0x19, SvcWrap<CancelSynchronization>, "CancelSynchronization"}, | 776 | {0x19, SvcWrap<CancelSynchronization>, "CancelSynchronization"}, |
| 777 | {0x1A, SvcWrap<LockMutex>, "LockMutex"}, | 777 | {0x1A, SvcWrap<ArbitrateLock>, "ArbitrateLock"}, |
| 778 | {0x1B, SvcWrap<UnlockMutex>, "UnlockMutex"}, | 778 | {0x1B, SvcWrap<ArbitrateUnlock>, "ArbitrateUnlock"}, |
| 779 | {0x1C, SvcWrap<WaitProcessWideKeyAtomic>, "WaitProcessWideKeyAtomic"}, | 779 | {0x1C, SvcWrap<WaitProcessWideKeyAtomic>, "WaitProcessWideKeyAtomic"}, |
| 780 | {0x1D, SvcWrap<SignalProcessWideKey>, "SignalProcessWideKey"}, | 780 | {0x1D, SvcWrap<SignalProcessWideKey>, "SignalProcessWideKey"}, |
| 781 | {0x1E, SvcWrap<GetSystemTick>, "GetSystemTick"}, | 781 | {0x1E, SvcWrap<GetSystemTick>, "GetSystemTick"}, |
| 782 | {0x1F, SvcWrap<ConnectToPort>, "ConnectToPort"}, | 782 | {0x1F, SvcWrap<ConnectToNamedPort>, "ConnectToNamedPort"}, |
| 783 | {0x20, nullptr, "SendSyncRequestLight"}, | 783 | {0x20, nullptr, "SendSyncRequestLight"}, |
| 784 | {0x21, SvcWrap<SendSyncRequest>, "SendSyncRequest"}, | 784 | {0x21, SvcWrap<SendSyncRequest>, "SendSyncRequest"}, |
| 785 | {0x22, nullptr, "SendSyncRequestWithUserBuffer"}, | 785 | {0x22, nullptr, "SendSyncRequestWithUserBuffer"}, |
| @@ -823,8 +823,8 @@ static const FunctionDef SVC_Table[] = { | |||
| 823 | {0x48, nullptr, "Unknown"}, | 823 | {0x48, nullptr, "Unknown"}, |
| 824 | {0x49, nullptr, "Unknown"}, | 824 | {0x49, nullptr, "Unknown"}, |
| 825 | {0x4A, nullptr, "Unknown"}, | 825 | {0x4A, nullptr, "Unknown"}, |
| 826 | {0x4B, nullptr, "Unknown"}, | 826 | {0x4B, nullptr, "CreateJitMemory"}, |
| 827 | {0x4C, nullptr, "Unknown"}, | 827 | {0x4C, nullptr, "MapJitMemory"}, |
| 828 | {0x4D, nullptr, "SleepSystem"}, | 828 | {0x4D, nullptr, "SleepSystem"}, |
| 829 | {0x4E, nullptr, "ReadWriteRegister"}, | 829 | {0x4E, nullptr, "ReadWriteRegister"}, |
| 830 | {0x4F, nullptr, "SetProcessActivity"}, | 830 | {0x4F, nullptr, "SetProcessActivity"}, |