diff options
| author | 2016-12-17 01:20:47 -0500 | |
|---|---|---|
| committer | 2016-12-21 23:48:14 -0500 | |
| commit | 5ac5cbeab7387b2eabd4618291e223fd7189bb8b (patch) | |
| tree | e035f870b86f930876a5ced2c1e2be9f6a087a91 /src/core/hle | |
| parent | core: Remove HLE module, consolidate code & various cleanups. (diff) | |
| download | yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.tar.gz yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.tar.xz yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.zip | |
Address clang-format issues.
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/fs/archive.h | 4 | ||||
| -rw-r--r-- | src/core/hle/svc.cpp | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h index 0aa373f40..519c1f3a9 100644 --- a/src/core/hle/service/fs/archive.h +++ b/src/core/hle/service/fs/archive.h | |||
| @@ -17,9 +17,9 @@ class FileBackend; | |||
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | /// The unique system identifier hash, also known as ID0 | 19 | /// The unique system identifier hash, also known as ID0 |
| 20 | static constexpr char SYSTEM_ID[]{ "00000000000000000000000000000000" }; | 20 | static constexpr char SYSTEM_ID[]{"00000000000000000000000000000000"}; |
| 21 | /// The scrambled SD card CID, also known as ID1 | 21 | /// The scrambled SD card CID, also known as ID1 |
| 22 | static constexpr char SDCARD_ID[]{ "00000000000000000000000000000000" }; | 22 | static constexpr char SDCARD_ID[]{"00000000000000000000000000000000"}; |
| 23 | 23 | ||
| 24 | namespace Service { | 24 | namespace Service { |
| 25 | namespace FS { | 25 | namespace FS { |
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 5a52525c6..1f89ccfd5 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -166,7 +166,8 @@ static ResultCode ControlMemory(u32* out_addr, u32 operation, u32 addr0, u32 add | |||
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | /// Maps a memory block to specified address | 168 | /// Maps a memory block to specified address |
| 169 | static ResultCode MapMemoryBlock(Kernel::Handle handle, u32 addr, u32 permissions, u32 other_permissions) { | 169 | static ResultCode MapMemoryBlock(Kernel::Handle handle, u32 addr, u32 permissions, |
| 170 | u32 other_permissions) { | ||
| 170 | using Kernel::SharedMemory; | 171 | using Kernel::SharedMemory; |
| 171 | using Kernel::MemoryPermission; | 172 | using Kernel::MemoryPermission; |
| 172 | 173 | ||
| @@ -295,8 +296,8 @@ static ResultCode WaitSynchronization1(Kernel::Handle handle, s64 nano_seconds) | |||
| 295 | } | 296 | } |
| 296 | 297 | ||
| 297 | /// Wait for the given handles to synchronize, timeout after the specified nanoseconds | 298 | /// Wait for the given handles to synchronize, timeout after the specified nanoseconds |
| 298 | static ResultCode WaitSynchronizationN(s32* out, Kernel::Handle* handles, s32 handle_count, bool wait_all, | 299 | static ResultCode WaitSynchronizationN(s32* out, Kernel::Handle* handles, s32 handle_count, |
| 299 | s64 nano_seconds) { | 300 | bool wait_all, s64 nano_seconds) { |
| 300 | Kernel::Thread* thread = Kernel::GetCurrentThread(); | 301 | Kernel::Thread* thread = Kernel::GetCurrentThread(); |
| 301 | 302 | ||
| 302 | // Check if 'handles' is invalid | 303 | // Check if 'handles' is invalid |
| @@ -507,8 +508,8 @@ static ResultCode GetResourceLimitCurrentValues(s64* values, Kernel::Handle reso | |||
| 507 | } | 508 | } |
| 508 | 509 | ||
| 509 | /// Get resource limit max values | 510 | /// Get resource limit max values |
| 510 | static ResultCode GetResourceLimitLimitValues(s64* values, Kernel::Handle resource_limit_handle, u32* names, | 511 | static ResultCode GetResourceLimitLimitValues(s64* values, Kernel::Handle resource_limit_handle, |
| 511 | u32 name_count) { | 512 | u32* names, u32 name_count) { |
| 512 | LOG_TRACE(Kernel_SVC, "called resource_limit=%08X, names=%p, name_count=%d", | 513 | LOG_TRACE(Kernel_SVC, "called resource_limit=%08X, names=%p, name_count=%d", |
| 513 | resource_limit_handle, names, name_count); | 514 | resource_limit_handle, names, name_count); |
| 514 | 515 | ||
| @@ -860,8 +861,8 @@ static s64 GetSystemTick() { | |||
| 860 | } | 861 | } |
| 861 | 862 | ||
| 862 | /// Creates a memory block at the specified address with the specified permissions and size | 863 | /// Creates a memory block at the specified address with the specified permissions and size |
| 863 | static ResultCode CreateMemoryBlock(Kernel::Handle* out_handle, u32 addr, u32 size, u32 my_permission, | 864 | static ResultCode CreateMemoryBlock(Kernel::Handle* out_handle, u32 addr, u32 size, |
| 864 | u32 other_permission) { | 865 | u32 my_permission, u32 other_permission) { |
| 865 | using Kernel::SharedMemory; | 866 | using Kernel::SharedMemory; |
| 866 | 867 | ||
| 867 | if (size % Memory::PAGE_SIZE != 0) | 868 | if (size % Memory::PAGE_SIZE != 0) |
| @@ -912,8 +913,8 @@ static ResultCode CreateMemoryBlock(Kernel::Handle* out_handle, u32 addr, u32 si | |||
| 912 | return RESULT_SUCCESS; | 913 | return RESULT_SUCCESS; |
| 913 | } | 914 | } |
| 914 | 915 | ||
| 915 | static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client_port, const char* name, | 916 | static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client_port, |
| 916 | u32 max_sessions) { | 917 | const char* name, u32 max_sessions) { |
| 917 | // TODO(Subv): Implement named ports. | 918 | // TODO(Subv): Implement named ports. |
| 918 | ASSERT_MSG(name == nullptr, "Named ports are currently unimplemented"); | 919 | ASSERT_MSG(name == nullptr, "Named ports are currently unimplemented"); |
| 919 | 920 | ||