diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-01-02 15:00:05 +0100 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-01-02 16:23:41 +0100 |
| commit | a745d87971b2c9795e1b2c587bfe30b849b522fa (patch) | |
| tree | 61fb7dc24ebbf6e679deeba05278c5380cb35025 /src/core/hle/kernel/memory/memory_block.h | |
| parent | Merge pull request #5209 from Morph1984/refactor-controller-connect (diff) | |
| download | yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.tar yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.tar.gz yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.tar.bz2 yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.tar.lz yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.tar.xz yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.tar.zst yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/memory/memory_block.h | 14 |
1 files changed, 7 insertions, 7 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 { ThreadLocal = static_cast<u32>(Svc::MemoryState::ThreadLocal) | FlagMapped | FlagReferenceCounted, - Transfered = static_cast<u32>(Svc::MemoryState::Transfered) | FlagsMisc | - FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc | - FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, + Transferred = static_cast<u32>(Svc::MemoryState::Transferred) | FlagsMisc | + FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc | + FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, - SharedTransfered = static_cast<u32>(Svc::MemoryState::SharedTransfered) | FlagsMisc | - FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, + SharedTransferred = static_cast<u32>(Svc::MemoryState::SharedTransferred) | FlagsMisc | + FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, SharedCode = static_cast<u32>(Svc::MemoryState::SharedCode) | FlagMapped | FlagReferenceCounted | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, @@ -111,8 +111,8 @@ static_assert(static_cast<u32>(MemoryState::AliasCodeData) == 0x03FFBD09); static_assert(static_cast<u32>(MemoryState::Ipc) == 0x005C3C0A); static_assert(static_cast<u32>(MemoryState::Stack) == 0x005C3C0B); static_assert(static_cast<u32>(MemoryState::ThreadLocal) == 0x0040200C); -static_assert(static_cast<u32>(MemoryState::Transfered) == 0x015C3C0D); -static_assert(static_cast<u32>(MemoryState::SharedTransfered) == 0x005C380E); +static_assert(static_cast<u32>(MemoryState::Transferred) == 0x015C3C0D); +static_assert(static_cast<u32>(MemoryState::SharedTransferred) == 0x005C380E); static_assert(static_cast<u32>(MemoryState::SharedCode) == 0x0040380F); static_assert(static_cast<u32>(MemoryState::Inaccessible) == 0x00000010); static_assert(static_cast<u32>(MemoryState::NonSecureIpc) == 0x005C3811); |