diff options
| author | 2021-01-02 09:00:05 -0500 | |
|---|---|---|
| committer | 2021-01-02 10:23:41 -0500 | |
| commit | a745d87971b2c9795e1b2c587bfe30b849b522fa (patch) | |
| tree | 61fb7dc24ebbf6e679deeba05278c5380cb35025 /src/core | |
| parent | Merge pull request #5209 from Morph1984/refactor-controller-connect (diff) | |
| download | yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.tar.gz yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.tar.xz yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.zip | |
general: Fix various spelling errors
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/kernel/memory/memory_block.h | 14 | ||||
| -rw-r--r-- | src/core/hle/kernel/memory/page_table.cpp | 12 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc_types.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/am/am.h | 2 | ||||
| -rw-r--r-- | src/core/settings.h | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/src/core/hle/kernel/memory/memory_block.h b/src/core/hle/kernel/memory/memory_block.h index 37fe19916..83acece1e 100644 --- a/src/core/hle/kernel/memory/memory_block.h +++ b/src/core/hle/kernel/memory/memory_block.h | |||
| @@ -73,12 +73,12 @@ enum class MemoryState : u32 { | |||
| 73 | ThreadLocal = | 73 | ThreadLocal = |
| 74 | static_cast<u32>(Svc::MemoryState::ThreadLocal) | FlagMapped | FlagReferenceCounted, | 74 | static_cast<u32>(Svc::MemoryState::ThreadLocal) | FlagMapped | FlagReferenceCounted, |
| 75 | 75 | ||
| 76 | Transfered = static_cast<u32>(Svc::MemoryState::Transfered) | FlagsMisc | | 76 | Transferred = static_cast<u32>(Svc::MemoryState::Transferred) | FlagsMisc | |
| 77 | FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc | | 77 | FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc | |
| 78 | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, | 78 | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, |
| 79 | 79 | ||
| 80 | SharedTransfered = static_cast<u32>(Svc::MemoryState::SharedTransfered) | FlagsMisc | | 80 | SharedTransferred = static_cast<u32>(Svc::MemoryState::SharedTransferred) | FlagsMisc | |
| 81 | FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, | 81 | FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, |
| 82 | 82 | ||
| 83 | SharedCode = static_cast<u32>(Svc::MemoryState::SharedCode) | FlagMapped | | 83 | SharedCode = static_cast<u32>(Svc::MemoryState::SharedCode) | FlagMapped | |
| 84 | FlagReferenceCounted | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, | 84 | FlagReferenceCounted | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, |
| @@ -111,8 +111,8 @@ static_assert(static_cast<u32>(MemoryState::AliasCodeData) == 0x03FFBD09); | |||
| 111 | static_assert(static_cast<u32>(MemoryState::Ipc) == 0x005C3C0A); | 111 | static_assert(static_cast<u32>(MemoryState::Ipc) == 0x005C3C0A); |
| 112 | static_assert(static_cast<u32>(MemoryState::Stack) == 0x005C3C0B); | 112 | static_assert(static_cast<u32>(MemoryState::Stack) == 0x005C3C0B); |
| 113 | static_assert(static_cast<u32>(MemoryState::ThreadLocal) == 0x0040200C); | 113 | static_assert(static_cast<u32>(MemoryState::ThreadLocal) == 0x0040200C); |
| 114 | static_assert(static_cast<u32>(MemoryState::Transfered) == 0x015C3C0D); | 114 | static_assert(static_cast<u32>(MemoryState::Transferred) == 0x015C3C0D); |
| 115 | static_assert(static_cast<u32>(MemoryState::SharedTransfered) == 0x005C380E); | 115 | static_assert(static_cast<u32>(MemoryState::SharedTransferred) == 0x005C380E); |
| 116 | static_assert(static_cast<u32>(MemoryState::SharedCode) == 0x0040380F); | 116 | static_assert(static_cast<u32>(MemoryState::SharedCode) == 0x0040380F); |
| 117 | static_assert(static_cast<u32>(MemoryState::Inaccessible) == 0x00000010); | 117 | static_assert(static_cast<u32>(MemoryState::Inaccessible) == 0x00000010); |
| 118 | static_assert(static_cast<u32>(MemoryState::NonSecureIpc) == 0x005C3811); | 118 | static_assert(static_cast<u32>(MemoryState::NonSecureIpc) == 0x005C3811); |
diff --git a/src/core/hle/kernel/memory/page_table.cpp b/src/core/hle/kernel/memory/page_table.cpp index f3e8bc333..080886554 100644 --- a/src/core/hle/kernel/memory/page_table.cpp +++ b/src/core/hle/kernel/memory/page_table.cpp | |||
| @@ -1007,8 +1007,8 @@ constexpr VAddr PageTable::GetRegionAddress(MemoryState state) const { | |||
| 1007 | case MemoryState::Shared: | 1007 | case MemoryState::Shared: |
| 1008 | case MemoryState::AliasCode: | 1008 | case MemoryState::AliasCode: |
| 1009 | case MemoryState::AliasCodeData: | 1009 | case MemoryState::AliasCodeData: |
| 1010 | case MemoryState::Transfered: | 1010 | case MemoryState::Transferred: |
| 1011 | case MemoryState::SharedTransfered: | 1011 | case MemoryState::SharedTransferred: |
| 1012 | case MemoryState::SharedCode: | 1012 | case MemoryState::SharedCode: |
| 1013 | case MemoryState::GeneratedCode: | 1013 | case MemoryState::GeneratedCode: |
| 1014 | case MemoryState::CodeOut: | 1014 | case MemoryState::CodeOut: |
| @@ -1042,8 +1042,8 @@ constexpr std::size_t PageTable::GetRegionSize(MemoryState state) const { | |||
| 1042 | case MemoryState::Shared: | 1042 | case MemoryState::Shared: |
| 1043 | case MemoryState::AliasCode: | 1043 | case MemoryState::AliasCode: |
| 1044 | case MemoryState::AliasCodeData: | 1044 | case MemoryState::AliasCodeData: |
| 1045 | case MemoryState::Transfered: | 1045 | case MemoryState::Transferred: |
| 1046 | case MemoryState::SharedTransfered: | 1046 | case MemoryState::SharedTransferred: |
| 1047 | case MemoryState::SharedCode: | 1047 | case MemoryState::SharedCode: |
| 1048 | case MemoryState::GeneratedCode: | 1048 | case MemoryState::GeneratedCode: |
| 1049 | case MemoryState::CodeOut: | 1049 | case MemoryState::CodeOut: |
| @@ -1080,8 +1080,8 @@ constexpr bool PageTable::CanContain(VAddr addr, std::size_t size, MemoryState s | |||
| 1080 | case MemoryState::AliasCodeData: | 1080 | case MemoryState::AliasCodeData: |
| 1081 | case MemoryState::Stack: | 1081 | case MemoryState::Stack: |
| 1082 | case MemoryState::ThreadLocal: | 1082 | case MemoryState::ThreadLocal: |
| 1083 | case MemoryState::Transfered: | 1083 | case MemoryState::Transferred: |
| 1084 | case MemoryState::SharedTransfered: | 1084 | case MemoryState::SharedTransferred: |
| 1085 | case MemoryState::SharedCode: | 1085 | case MemoryState::SharedCode: |
| 1086 | case MemoryState::GeneratedCode: | 1086 | case MemoryState::GeneratedCode: |
| 1087 | case MemoryState::CodeOut: | 1087 | case MemoryState::CodeOut: |
diff --git a/src/core/hle/kernel/svc_types.h b/src/core/hle/kernel/svc_types.h index 986724beb..11e1d8e2d 100644 --- a/src/core/hle/kernel/svc_types.h +++ b/src/core/hle/kernel/svc_types.h | |||
| @@ -23,8 +23,8 @@ enum class MemoryState : u32 { | |||
| 23 | Ipc = 0x0A, | 23 | Ipc = 0x0A, |
| 24 | Stack = 0x0B, | 24 | Stack = 0x0B, |
| 25 | ThreadLocal = 0x0C, | 25 | ThreadLocal = 0x0C, |
| 26 | Transfered = 0x0D, | 26 | Transferred = 0x0D, |
| 27 | SharedTransfered = 0x0E, | 27 | SharedTransferred = 0x0E, |
| 28 | SharedCode = 0x0F, | 28 | SharedCode = 0x0F, |
| 29 | Inaccessible = 0x10, | 29 | Inaccessible = 0x10, |
| 30 | NonSecureIpc = 0x11, | 30 | NonSecureIpc = 0x11, |
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index cb13210e5..c9808060a 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp | |||
| @@ -560,14 +560,14 @@ void ISelfController::GetAccumulatedSuspendedTickChangedEvent(Kernel::HLERequest | |||
| 560 | 560 | ||
| 561 | AppletMessageQueue::AppletMessageQueue(Kernel::KernelCore& kernel) { | 561 | AppletMessageQueue::AppletMessageQueue(Kernel::KernelCore& kernel) { |
| 562 | on_new_message = | 562 | on_new_message = |
| 563 | Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OnMessageRecieved"); | 563 | Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OnMessageReceived"); |
| 564 | on_operation_mode_changed = | 564 | on_operation_mode_changed = |
| 565 | Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OperationModeChanged"); | 565 | Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OperationModeChanged"); |
| 566 | } | 566 | } |
| 567 | 567 | ||
| 568 | AppletMessageQueue::~AppletMessageQueue() = default; | 568 | AppletMessageQueue::~AppletMessageQueue() = default; |
| 569 | 569 | ||
| 570 | const std::shared_ptr<Kernel::ReadableEvent>& AppletMessageQueue::GetMesssageRecieveEvent() const { | 570 | const std::shared_ptr<Kernel::ReadableEvent>& AppletMessageQueue::GetMessageReceiveEvent() const { |
| 571 | return on_new_message.readable; | 571 | return on_new_message.readable; |
| 572 | } | 572 | } |
| 573 | 573 | ||
| @@ -675,7 +675,7 @@ void ICommonStateGetter::GetEventHandle(Kernel::HLERequestContext& ctx) { | |||
| 675 | 675 | ||
| 676 | IPC::ResponseBuilder rb{ctx, 2, 1}; | 676 | IPC::ResponseBuilder rb{ctx, 2, 1}; |
| 677 | rb.Push(RESULT_SUCCESS); | 677 | rb.Push(RESULT_SUCCESS); |
| 678 | rb.PushCopyObjects(msg_queue->GetMesssageRecieveEvent()); | 678 | rb.PushCopyObjects(msg_queue->GetMessageReceiveEvent()); |
| 679 | } | 679 | } |
| 680 | 680 | ||
| 681 | void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) { | 681 | void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) { |
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index b1da0d081..f51aca1af 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h | |||
| @@ -55,7 +55,7 @@ public: | |||
| 55 | explicit AppletMessageQueue(Kernel::KernelCore& kernel); | 55 | explicit AppletMessageQueue(Kernel::KernelCore& kernel); |
| 56 | ~AppletMessageQueue(); | 56 | ~AppletMessageQueue(); |
| 57 | 57 | ||
| 58 | const std::shared_ptr<Kernel::ReadableEvent>& GetMesssageRecieveEvent() const; | 58 | const std::shared_ptr<Kernel::ReadableEvent>& GetMessageReceiveEvent() const; |
| 59 | const std::shared_ptr<Kernel::ReadableEvent>& GetOperationModeChangedEvent() const; | 59 | const std::shared_ptr<Kernel::ReadableEvent>& GetOperationModeChangedEvent() const; |
| 60 | void PushMessage(AppletMessage msg); | 60 | void PushMessage(AppletMessage msg); |
| 61 | AppletMessage PopMessage(); | 61 | AppletMessage PopMessage(); |
diff --git a/src/core/settings.h b/src/core/settings.h index 0cd3c0c84..1cb7ff7f5 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -221,7 +221,7 @@ struct Values { | |||
| 221 | bool disable_macro_jit; | 221 | bool disable_macro_jit; |
| 222 | bool extended_logging; | 222 | bool extended_logging; |
| 223 | 223 | ||
| 224 | // Misceallaneous | 224 | // Miscellaneous |
| 225 | std::string log_filter; | 225 | std::string log_filter; |
| 226 | bool use_dev_keys; | 226 | bool use_dev_keys; |
| 227 | 227 | ||