diff options
author | bunnei <bunneidev@gmail.com> | 2016-12-17 07:20:47 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2016-12-22 05:48:14 +0100 |
commit | 5ac5cbeab7387b2eabd4618291e223fd7189bb8b (patch) | |
tree | e035f870b86f930876a5ced2c1e2be9f6a087a91 /src/core/hle | |
parent | core: Remove HLE module, consolidate code & various cleanups. (diff) | |
download | yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.tar yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.tar.gz yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.tar.bz2 yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.tar.lz yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.tar.xz yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.tar.zst yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.zip |
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; } /// The unique system identifier hash, also known as ID0 -static constexpr char SYSTEM_ID[]{ "00000000000000000000000000000000" }; +static constexpr char SYSTEM_ID[]{"00000000000000000000000000000000"}; /// The scrambled SD card CID, also known as ID1 -static constexpr char SDCARD_ID[]{ "00000000000000000000000000000000" }; +static constexpr char SDCARD_ID[]{"00000000000000000000000000000000"}; namespace Service { 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 } /// Maps a memory block to specified address -static ResultCode MapMemoryBlock(Kernel::Handle handle, u32 addr, u32 permissions, u32 other_permissions) { +static ResultCode MapMemoryBlock(Kernel::Handle handle, u32 addr, u32 permissions, + u32 other_permissions) { using Kernel::SharedMemory; using Kernel::MemoryPermission; @@ -295,8 +296,8 @@ static ResultCode WaitSynchronization1(Kernel::Handle handle, s64 nano_seconds) } /// Wait for the given handles to synchronize, timeout after the specified nanoseconds -static ResultCode WaitSynchronizationN(s32* out, Kernel::Handle* handles, s32 handle_count, bool wait_all, - s64 nano_seconds) { +static ResultCode WaitSynchronizationN(s32* out, Kernel::Handle* handles, s32 handle_count, + bool wait_all, s64 nano_seconds) { Kernel::Thread* thread = Kernel::GetCurrentThread(); // Check if 'handles' is invalid @@ -507,8 +508,8 @@ static ResultCode GetResourceLimitCurrentValues(s64* values, Kernel::Handle reso } /// Get resource limit max values -static ResultCode GetResourceLimitLimitValues(s64* values, Kernel::Handle resource_limit_handle, u32* names, - u32 name_count) { +static ResultCode GetResourceLimitLimitValues(s64* values, Kernel::Handle resource_limit_handle, + u32* names, u32 name_count) { LOG_TRACE(Kernel_SVC, "called resource_limit=%08X, names=%p, name_count=%d", resource_limit_handle, names, name_count); @@ -860,8 +861,8 @@ static s64 GetSystemTick() { } /// Creates a memory block at the specified address with the specified permissions and size -static ResultCode CreateMemoryBlock(Kernel::Handle* out_handle, u32 addr, u32 size, u32 my_permission, - u32 other_permission) { +static ResultCode CreateMemoryBlock(Kernel::Handle* out_handle, u32 addr, u32 size, + u32 my_permission, u32 other_permission) { using Kernel::SharedMemory; if (size % Memory::PAGE_SIZE != 0) @@ -912,8 +913,8 @@ static ResultCode CreateMemoryBlock(Kernel::Handle* out_handle, u32 addr, u32 si return RESULT_SUCCESS; } -static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client_port, const char* name, - u32 max_sessions) { +static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client_port, + const char* name, u32 max_sessions) { // TODO(Subv): Implement named ports. ASSERT_MSG(name == nullptr, "Named ports are currently unimplemented"); |