diff options
| author | 2018-01-20 00:48:02 -0700 | |
|---|---|---|
| committer | 2018-01-20 16:45:11 -0700 | |
| commit | 096be1663682f38d572e9816e3350e0dc9f13168 (patch) | |
| tree | a2f695170d9a3e0e98cebf823087cdb65d5af00f /src/core/hle/kernel | |
| parent | CMake: Conditionally turn on bundled libs for MSVC (diff) | |
| download | yuzu-096be1663682f38d572e9816e3350e0dc9f13168.tar.gz yuzu-096be1663682f38d572e9816e3350e0dc9f13168.tar.xz yuzu-096be1663682f38d572e9816e3350e0dc9f13168.zip | |
Format: Run the new clang format on everything
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/address_arbiter.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/client_port.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/client_port.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/client_session.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/client_session.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/condition_variable.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/event.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/handle_table.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/handle_table.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/kernel/resource_limit.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/resource_limit.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/server_port.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/server_port.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/server_session.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/session.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/session.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/shared_memory.h | 10 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 10 | ||||
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/timer.h | 2 |
22 files changed, 32 insertions, 31 deletions
diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h index 1d24401b1..f902ddf2d 100644 --- a/src/core/hle/kernel/address_arbiter.h +++ b/src/core/hle/kernel/address_arbiter.h | |||
| @@ -57,4 +57,4 @@ private: | |||
| 57 | ~AddressArbiter() override; | 57 | ~AddressArbiter() override; |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | } // namespace FileSys | 60 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp index ce5d94e99..fb2b6f7a3 100644 --- a/src/core/hle/kernel/client_port.cpp +++ b/src/core/hle/kernel/client_port.cpp | |||
| @@ -39,4 +39,4 @@ ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() { | |||
| 39 | return MakeResult(std::get<SharedPtr<ClientSession>>(sessions)); | 39 | return MakeResult(std::get<SharedPtr<ClientSession>>(sessions)); |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | } // namespace | 42 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/client_port.h b/src/core/hle/kernel/client_port.h index 8f7d6ac44..a829aeb6d 100644 --- a/src/core/hle/kernel/client_port.h +++ b/src/core/hle/kernel/client_port.h | |||
| @@ -47,4 +47,4 @@ private: | |||
| 47 | ~ClientPort() override; | 47 | ~ClientPort() override; |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | } // namespace | 50 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/client_session.cpp b/src/core/hle/kernel/client_session.cpp index 646a5cc64..72773d8b1 100644 --- a/src/core/hle/kernel/client_session.cpp +++ b/src/core/hle/kernel/client_session.cpp | |||
| @@ -48,4 +48,4 @@ ResultCode ClientSession::SendSyncRequest(SharedPtr<Thread> thread) { | |||
| 48 | return server->HandleSyncRequest(std::move(thread)); | 48 | return server->HandleSyncRequest(std::move(thread)); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | } // namespace | 51 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/client_session.h b/src/core/hle/kernel/client_session.h index 671174ec4..d6ab4f893 100644 --- a/src/core/hle/kernel/client_session.h +++ b/src/core/hle/kernel/client_session.h | |||
| @@ -45,4 +45,4 @@ private: | |||
| 45 | ~ClientSession() override; | 45 | ~ClientSession() override; |
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | } // namespace | 48 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/condition_variable.h b/src/core/hle/kernel/condition_variable.h index 0610a284f..0d54031cb 100644 --- a/src/core/hle/kernel/condition_variable.h +++ b/src/core/hle/kernel/condition_variable.h | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <queue> | ||
| 8 | #include <string> | 7 | #include <string> |
| 8 | #include <queue> | ||
| 9 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 10 | #include "core/hle/kernel/kernel.h" | 10 | #include "core/hle/kernel/kernel.h" |
| 11 | #include "core/hle/kernel/wait_object.h" | 11 | #include "core/hle/kernel/wait_object.h" |
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 23f9df0d6..9cae2369f 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp | |||
| @@ -52,4 +52,4 @@ void Event::WakeupAllWaitingThreads() { | |||
| 52 | signaled = false; | 52 | signaled = false; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | } // namespace | 55 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h index cc41abb85..e5c924a75 100644 --- a/src/core/hle/kernel/event.h +++ b/src/core/hle/kernel/event.h | |||
| @@ -49,4 +49,4 @@ private: | |||
| 49 | ~Event() override; | 49 | ~Event() override; |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | } // namespace | 52 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/handle_table.cpp b/src/core/hle/kernel/handle_table.cpp index 12506e64c..74d3d0514 100644 --- a/src/core/hle/kernel/handle_table.cpp +++ b/src/core/hle/kernel/handle_table.cpp | |||
| @@ -104,4 +104,4 @@ void HandleTable::Clear() { | |||
| 104 | next_free_slot = 0; | 104 | next_free_slot = 0; |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | } // namespace | 107 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/handle_table.h b/src/core/hle/kernel/handle_table.h index dba5573a8..935cc22b5 100644 --- a/src/core/hle/kernel/handle_table.h +++ b/src/core/hle/kernel/handle_table.h | |||
| @@ -130,4 +130,4 @@ private: | |||
| 130 | 130 | ||
| 131 | extern HandleTable g_handle_table; | 131 | extern HandleTable g_handle_table; |
| 132 | 132 | ||
| 133 | } // namespace | 133 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 3899dad09..ecf32c18a 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp | |||
| @@ -99,9 +99,8 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) { | |||
| 99 | 99 | ||
| 100 | data_payload_offset = rp.GetCurrentOffset(); | 100 | data_payload_offset = rp.GetCurrentOffset(); |
| 101 | 101 | ||
| 102 | if (domain_message_header && | 102 | if (domain_message_header && domain_message_header->command == |
| 103 | domain_message_header->command == | 103 | IPC::DomainMessageHeader::CommandType::CloseVirtualHandle) { |
| 104 | IPC::DomainMessageHeader::CommandType::CloseVirtualHandle) { | ||
| 105 | // CloseVirtualHandle command does not have SFC* or any data | 104 | // CloseVirtualHandle command does not have SFC* or any data |
| 106 | return; | 105 | return; |
| 107 | } | 106 | } |
diff --git a/src/core/hle/kernel/resource_limit.cpp b/src/core/hle/kernel/resource_limit.cpp index 517dc47a8..0149a3ed6 100644 --- a/src/core/hle/kernel/resource_limit.cpp +++ b/src/core/hle/kernel/resource_limit.cpp | |||
| @@ -151,4 +151,4 @@ void ResourceLimitsInit() { | |||
| 151 | 151 | ||
| 152 | void ResourceLimitsShutdown() {} | 152 | void ResourceLimitsShutdown() {} |
| 153 | 153 | ||
| 154 | } // namespace | 154 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h index 42874eb8d..1a0ca11f1 100644 --- a/src/core/hle/kernel/resource_limit.h +++ b/src/core/hle/kernel/resource_limit.h | |||
| @@ -123,4 +123,4 @@ void ResourceLimitsInit(); | |||
| 123 | // Destroys the resource limits | 123 | // Destroys the resource limits |
| 124 | void ResourceLimitsShutdown(); | 124 | void ResourceLimitsShutdown(); |
| 125 | 125 | ||
| 126 | } // namespace | 126 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/server_port.cpp b/src/core/hle/kernel/server_port.cpp index 49a9cdfa3..0b7061403 100644 --- a/src/core/hle/kernel/server_port.cpp +++ b/src/core/hle/kernel/server_port.cpp | |||
| @@ -50,4 +50,4 @@ std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> ServerPort::CreatePortP | |||
| 50 | return std::make_tuple(std::move(server_port), std::move(client_port)); | 50 | return std::make_tuple(std::move(server_port), std::move(client_port)); |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | } // namespace | 53 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/server_port.h b/src/core/hle/kernel/server_port.h index 6fe7c7f2f..9ef4ecc35 100644 --- a/src/core/hle/kernel/server_port.h +++ b/src/core/hle/kernel/server_port.h | |||
| @@ -72,4 +72,4 @@ private: | |||
| 72 | ~ServerPort() override; | 72 | ~ServerPort() override; |
| 73 | }; | 73 | }; |
| 74 | 74 | ||
| 75 | } // namespace | 75 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/server_session.h b/src/core/hle/kernel/server_session.h index f4360ddf3..6ff4ef8c1 100644 --- a/src/core/hle/kernel/server_session.h +++ b/src/core/hle/kernel/server_session.h | |||
| @@ -113,4 +113,4 @@ private: | |||
| 113 | * in the command buffer. | 113 | * in the command buffer. |
| 114 | */ | 114 | */ |
| 115 | ResultCode TranslateHLERequest(ServerSession* server_session); | 115 | ResultCode TranslateHLERequest(ServerSession* server_session); |
| 116 | } | 116 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/session.cpp b/src/core/hle/kernel/session.cpp index 8a2a7e3fd..642914744 100644 --- a/src/core/hle/kernel/session.cpp +++ b/src/core/hle/kernel/session.cpp | |||
| @@ -9,4 +9,4 @@ namespace Kernel { | |||
| 9 | 9 | ||
| 10 | Session::Session() {} | 10 | Session::Session() {} |
| 11 | Session::~Session() {} | 11 | Session::~Session() {} |
| 12 | } | 12 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h index 2cf319e99..e69b034a7 100644 --- a/src/core/hle/kernel/session.h +++ b/src/core/hle/kernel/session.h | |||
| @@ -24,4 +24,4 @@ public: | |||
| 24 | ServerSession* server = nullptr; ///< The server endpoint of the session. | 24 | ServerSession* server = nullptr; ///< The server endpoint of the session. |
| 25 | SharedPtr<ClientPort> port; ///< The port that this session is associated with (optional). | 25 | SharedPtr<ClientPort> port; ///< The port that this session is associated with (optional). |
| 26 | }; | 26 | }; |
| 27 | } | 27 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index 93a6f2182..e948819c0 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h | |||
| @@ -98,10 +98,10 @@ public: | |||
| 98 | ResultCode Unmap(Process* target_process, VAddr address); | 98 | ResultCode Unmap(Process* target_process, VAddr address); |
| 99 | 99 | ||
| 100 | /** | 100 | /** |
| 101 | * Gets a pointer to the shared memory block | 101 | * Gets a pointer to the shared memory block |
| 102 | * @param offset Offset from the start of the shared memory block to get pointer | 102 | * @param offset Offset from the start of the shared memory block to get pointer |
| 103 | * @return Pointer to the shared memory block from the specified offset | 103 | * @return Pointer to the shared memory block from the specified offset |
| 104 | */ | 104 | */ |
| 105 | u8* GetPointer(u32 offset = 0); | 105 | u8* GetPointer(u32 offset = 0); |
| 106 | 106 | ||
| 107 | /// Process that created this shared memory block. | 107 | /// Process that created this shared memory block. |
| @@ -129,4 +129,4 @@ private: | |||
| 129 | ~SharedMemory() override; | 129 | ~SharedMemory() override; |
| 130 | }; | 130 | }; |
| 131 | 131 | ||
| 132 | } // namespace | 132 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index d267b6c2e..516309036 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -255,8 +255,9 @@ static ResultCode CancelSynchronization(Handle thread_handle) { | |||
| 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 ArbitrateLock(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, |
| 259 | "requesting_current_thread_handle=0x%08X", | 259 | "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, " |
| 260 | "requesting_current_thread_handle=0x%08X", | ||
| 260 | holding_thread_handle, mutex_addr, requesting_thread_handle); | 261 | holding_thread_handle, mutex_addr, requesting_thread_handle); |
| 261 | 262 | ||
| 262 | SharedPtr<Thread> holding_thread = g_handle_table.Get<Thread>(holding_thread_handle); | 263 | SharedPtr<Thread> holding_thread = g_handle_table.Get<Thread>(holding_thread_handle); |
| @@ -546,8 +547,9 @@ static ResultCode CreateThread(Handle* out_handle, VAddr entry_point, u64 arg, V | |||
| 546 | 547 | ||
| 547 | Core::System::GetInstance().PrepareReschedule(); | 548 | Core::System::GetInstance().PrepareReschedule(); |
| 548 | 549 | ||
| 549 | LOG_TRACE(Kernel_SVC, "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, " | 550 | LOG_TRACE(Kernel_SVC, |
| 550 | "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", | 551 | "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, " |
| 552 | "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", | ||
| 551 | entry_point, name.c_str(), arg, stack_top, priority, processor_id, *out_handle); | 553 | entry_point, name.c_str(), arg, stack_top, priority, processor_id, *out_handle); |
| 552 | 554 | ||
| 553 | return RESULT_SUCCESS; | 555 | return RESULT_SUCCESS; |
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index a93a6c87a..8da745634 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp | |||
| @@ -111,4 +111,4 @@ void TimersInit() { | |||
| 111 | 111 | ||
| 112 | void TimersShutdown() {} | 112 | void TimersShutdown() {} |
| 113 | 113 | ||
| 114 | } // namespace | 114 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index 82552372d..82d19cefc 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h | |||
| @@ -76,4 +76,4 @@ void TimersInit(); | |||
| 76 | /// Tears down the timer variables | 76 | /// Tears down the timer variables |
| 77 | void TimersShutdown(); | 77 | void TimersShutdown(); |
| 78 | 78 | ||
| 79 | } // namespace | 79 | } // namespace Kernel |