summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/k_memory_block.h14
-rw-r--r--src/core/hle/kernel/k_page_table_base.cpp12
-rw-r--r--src/core/hle/kernel/k_transfer_memory.cpp8
-rw-r--r--src/core/hle/kernel/svc/svc_transfer_memory.cpp4
-rw-r--r--src/core/hle/kernel/svc_types.h4
5 files changed, 21 insertions, 21 deletions
diff --git a/src/core/hle/kernel/k_memory_block.h b/src/core/hle/kernel/k_memory_block.h
index ef3f61321..d2b7e9a66 100644
--- a/src/core/hle/kernel/k_memory_block.h
+++ b/src/core/hle/kernel/k_memory_block.h
@@ -81,12 +81,12 @@ enum class KMemoryState : u32 {
81 81
82 ThreadLocal = static_cast<u32>(Svc::MemoryState::ThreadLocal) | FlagLinearMapped, 82 ThreadLocal = static_cast<u32>(Svc::MemoryState::ThreadLocal) | FlagLinearMapped,
83 83
84 Transfered = static_cast<u32>(Svc::MemoryState::Transfered) | FlagsMisc | 84 Transferred = static_cast<u32>(Svc::MemoryState::Transferred) | FlagsMisc |
85 FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc | 85 FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc |
86 FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, 86 FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
87 87
88 SharedTransfered = static_cast<u32>(Svc::MemoryState::SharedTransfered) | FlagsMisc | 88 SharedTransferred = static_cast<u32>(Svc::MemoryState::SharedTransferred) | FlagsMisc |
89 FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, 89 FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
90 90
91 SharedCode = static_cast<u32>(Svc::MemoryState::SharedCode) | FlagMapped | 91 SharedCode = static_cast<u32>(Svc::MemoryState::SharedCode) | FlagMapped |
92 FlagReferenceCounted | FlagLinearMapped | FlagCanUseNonSecureIpc | 92 FlagReferenceCounted | FlagLinearMapped | FlagCanUseNonSecureIpc |
@@ -130,8 +130,8 @@ static_assert(static_cast<u32>(KMemoryState::AliasCodeData) == 0x0FFFBD09);
130static_assert(static_cast<u32>(KMemoryState::Ipc) == 0x045C3C0A); 130static_assert(static_cast<u32>(KMemoryState::Ipc) == 0x045C3C0A);
131static_assert(static_cast<u32>(KMemoryState::Stack) == 0x045C3C0B); 131static_assert(static_cast<u32>(KMemoryState::Stack) == 0x045C3C0B);
132static_assert(static_cast<u32>(KMemoryState::ThreadLocal) == 0x0400000C); 132static_assert(static_cast<u32>(KMemoryState::ThreadLocal) == 0x0400000C);
133static_assert(static_cast<u32>(KMemoryState::Transfered) == 0x055C3C0D); 133static_assert(static_cast<u32>(KMemoryState::Transferred) == 0x055C3C0D);
134static_assert(static_cast<u32>(KMemoryState::SharedTransfered) == 0x045C380E); 134static_assert(static_cast<u32>(KMemoryState::SharedTransferred) == 0x045C380E);
135static_assert(static_cast<u32>(KMemoryState::SharedCode) == 0x0440380F); 135static_assert(static_cast<u32>(KMemoryState::SharedCode) == 0x0440380F);
136static_assert(static_cast<u32>(KMemoryState::Inaccessible) == 0x00000010); 136static_assert(static_cast<u32>(KMemoryState::Inaccessible) == 0x00000010);
137static_assert(static_cast<u32>(KMemoryState::NonSecureIpc) == 0x045C3811); 137static_assert(static_cast<u32>(KMemoryState::NonSecureIpc) == 0x045C3811);
diff --git a/src/core/hle/kernel/k_page_table_base.cpp b/src/core/hle/kernel/k_page_table_base.cpp
index 8c1549559..73fbda331 100644
--- a/src/core/hle/kernel/k_page_table_base.cpp
+++ b/src/core/hle/kernel/k_page_table_base.cpp
@@ -486,8 +486,8 @@ KProcessAddress KPageTableBase::GetRegionAddress(Svc::MemoryState state) const {
486 case Svc::MemoryState::Shared: 486 case Svc::MemoryState::Shared:
487 case Svc::MemoryState::AliasCode: 487 case Svc::MemoryState::AliasCode:
488 case Svc::MemoryState::AliasCodeData: 488 case Svc::MemoryState::AliasCodeData:
489 case Svc::MemoryState::Transfered: 489 case Svc::MemoryState::Transferred:
490 case Svc::MemoryState::SharedTransfered: 490 case Svc::MemoryState::SharedTransferred:
491 case Svc::MemoryState::SharedCode: 491 case Svc::MemoryState::SharedCode:
492 case Svc::MemoryState::GeneratedCode: 492 case Svc::MemoryState::GeneratedCode:
493 case Svc::MemoryState::CodeOut: 493 case Svc::MemoryState::CodeOut:
@@ -522,8 +522,8 @@ size_t KPageTableBase::GetRegionSize(Svc::MemoryState state) const {
522 case Svc::MemoryState::Shared: 522 case Svc::MemoryState::Shared:
523 case Svc::MemoryState::AliasCode: 523 case Svc::MemoryState::AliasCode:
524 case Svc::MemoryState::AliasCodeData: 524 case Svc::MemoryState::AliasCodeData:
525 case Svc::MemoryState::Transfered: 525 case Svc::MemoryState::Transferred:
526 case Svc::MemoryState::SharedTransfered: 526 case Svc::MemoryState::SharedTransferred:
527 case Svc::MemoryState::SharedCode: 527 case Svc::MemoryState::SharedCode:
528 case Svc::MemoryState::GeneratedCode: 528 case Svc::MemoryState::GeneratedCode:
529 case Svc::MemoryState::CodeOut: 529 case Svc::MemoryState::CodeOut:
@@ -564,8 +564,8 @@ bool KPageTableBase::CanContain(KProcessAddress addr, size_t size, Svc::MemorySt
564 case Svc::MemoryState::AliasCodeData: 564 case Svc::MemoryState::AliasCodeData:
565 case Svc::MemoryState::Stack: 565 case Svc::MemoryState::Stack:
566 case Svc::MemoryState::ThreadLocal: 566 case Svc::MemoryState::ThreadLocal:
567 case Svc::MemoryState::Transfered: 567 case Svc::MemoryState::Transferred:
568 case Svc::MemoryState::SharedTransfered: 568 case Svc::MemoryState::SharedTransferred:
569 case Svc::MemoryState::SharedCode: 569 case Svc::MemoryState::SharedCode:
570 case Svc::MemoryState::GeneratedCode: 570 case Svc::MemoryState::GeneratedCode:
571 case Svc::MemoryState::CodeOut: 571 case Svc::MemoryState::CodeOut:
diff --git a/src/core/hle/kernel/k_transfer_memory.cpp b/src/core/hle/kernel/k_transfer_memory.cpp
index 0e2e11743..cbb1b02bb 100644
--- a/src/core/hle/kernel/k_transfer_memory.cpp
+++ b/src/core/hle/kernel/k_transfer_memory.cpp
@@ -76,8 +76,8 @@ Result KTransferMemory::Map(KProcessAddress address, size_t size, Svc::MemoryPer
76 76
77 // Map the memory. 77 // Map the memory.
78 const KMemoryState state = (m_owner_perm == Svc::MemoryPermission::None) 78 const KMemoryState state = (m_owner_perm == Svc::MemoryPermission::None)
79 ? KMemoryState::Transfered 79 ? KMemoryState::Transferred
80 : KMemoryState::SharedTransfered; 80 : KMemoryState::SharedTransferred;
81 R_TRY(GetCurrentProcess(m_kernel).GetPageTable().MapPageGroup( 81 R_TRY(GetCurrentProcess(m_kernel).GetPageTable().MapPageGroup(
82 address, *m_page_group, state, KMemoryPermission::UserReadWrite)); 82 address, *m_page_group, state, KMemoryPermission::UserReadWrite));
83 83
@@ -96,8 +96,8 @@ Result KTransferMemory::Unmap(KProcessAddress address, size_t size) {
96 96
97 // Unmap the memory. 97 // Unmap the memory.
98 const KMemoryState state = (m_owner_perm == Svc::MemoryPermission::None) 98 const KMemoryState state = (m_owner_perm == Svc::MemoryPermission::None)
99 ? KMemoryState::Transfered 99 ? KMemoryState::Transferred
100 : KMemoryState::SharedTransfered; 100 : KMemoryState::SharedTransferred;
101 R_TRY(GetCurrentProcess(m_kernel).GetPageTable().UnmapPageGroup(address, *m_page_group, state)); 101 R_TRY(GetCurrentProcess(m_kernel).GetPageTable().UnmapPageGroup(address, *m_page_group, state));
102 102
103 // Mark ourselves as unmapped. 103 // Mark ourselves as unmapped.
diff --git a/src/core/hle/kernel/svc/svc_transfer_memory.cpp b/src/core/hle/kernel/svc/svc_transfer_memory.cpp
index 1f97121b3..671bca23f 100644
--- a/src/core/hle/kernel/svc/svc_transfer_memory.cpp
+++ b/src/core/hle/kernel/svc/svc_transfer_memory.cpp
@@ -90,7 +90,7 @@ Result MapTransferMemory(Core::System& system, Handle trmem_handle, uint64_t add
90 // Verify that the mapping is in range. 90 // Verify that the mapping is in range.
91 R_UNLESS(GetCurrentProcess(system.Kernel()) 91 R_UNLESS(GetCurrentProcess(system.Kernel())
92 .GetPageTable() 92 .GetPageTable()
93 .CanContain(address, size, KMemoryState::Transfered), 93 .CanContain(address, size, KMemoryState::Transferred),
94 ResultInvalidMemoryRegion); 94 ResultInvalidMemoryRegion);
95 95
96 // Map the transfer memory. 96 // Map the transfer memory.
@@ -117,7 +117,7 @@ Result UnmapTransferMemory(Core::System& system, Handle trmem_handle, uint64_t a
117 // Verify that the mapping is in range. 117 // Verify that the mapping is in range.
118 R_UNLESS(GetCurrentProcess(system.Kernel()) 118 R_UNLESS(GetCurrentProcess(system.Kernel())
119 .GetPageTable() 119 .GetPageTable()
120 .CanContain(address, size, KMemoryState::Transfered), 120 .CanContain(address, size, KMemoryState::Transferred),
121 ResultInvalidMemoryRegion); 121 ResultInvalidMemoryRegion);
122 122
123 // Unmap the transfer memory. 123 // Unmap the transfer memory.
diff --git a/src/core/hle/kernel/svc_types.h b/src/core/hle/kernel/svc_types.h
index 50de02e36..ab432ea78 100644
--- a/src/core/hle/kernel/svc_types.h
+++ b/src/core/hle/kernel/svc_types.h
@@ -27,8 +27,8 @@ enum class MemoryState : u32 {
27 Ipc = 0x0A, 27 Ipc = 0x0A,
28 Stack = 0x0B, 28 Stack = 0x0B,
29 ThreadLocal = 0x0C, 29 ThreadLocal = 0x0C,
30 Transfered = 0x0D, 30 Transferred = 0x0D,
31 SharedTransfered = 0x0E, 31 SharedTransferred = 0x0E,
32 SharedCode = 0x0F, 32 SharedCode = 0x0F,
33 Inaccessible = 0x10, 33 Inaccessible = 0x10,
34 NonSecureIpc = 0x11, 34 NonSecureIpc = 0x11,