diff options
| author | 2016-02-25 19:21:50 -0500 | |
|---|---|---|
| committer | 2016-02-25 19:21:50 -0500 | |
| commit | af7282b5ea8ed3ebfb47f35f6ac8212cfcb4c4fd (patch) | |
| tree | 1ae5c0281f70ff811ea2370610745b3957060fa5 /src/core/hle/kernel | |
| parent | Merge pull request #1422 from vgturtle127/patch-1 (diff) | |
| parent | AudioCore: Skeleton Implementation (diff) | |
| download | yuzu-af7282b5ea8ed3ebfb47f35f6ac8212cfcb4c4fd.tar.gz yuzu-af7282b5ea8ed3ebfb47f35f6ac8212cfcb4c4fd.tar.xz yuzu-af7282b5ea8ed3ebfb47f35f6ac8212cfcb4c4fd.zip | |
Merge pull request #1386 from MerryMage/audio-core-skeleton
Audio Core: Skeleton
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/memory.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp index 0cfb43fc7..862643448 100644 --- a/src/core/hle/kernel/memory.cpp +++ b/src/core/hle/kernel/memory.cpp | |||
| @@ -7,6 +7,8 @@ | |||
| 7 | #include <utility> | 7 | #include <utility> |
| 8 | #include <vector> | 8 | #include <vector> |
| 9 | 9 | ||
| 10 | #include "audio_core/audio_core.h" | ||
| 11 | |||
| 10 | #include "common/common_types.h" | 12 | #include "common/common_types.h" |
| 11 | #include "common/logging/log.h" | 13 | #include "common/logging/log.h" |
| 12 | 14 | ||
| @@ -107,7 +109,6 @@ struct MemoryArea { | |||
| 107 | static MemoryArea memory_areas[] = { | 109 | static MemoryArea memory_areas[] = { |
| 108 | {SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, "Shared Memory"}, // Shared memory | 110 | {SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, "Shared Memory"}, // Shared memory |
| 109 | {VRAM_VADDR, VRAM_SIZE, "VRAM"}, // Video memory (VRAM) | 111 | {VRAM_VADDR, VRAM_SIZE, "VRAM"}, // Video memory (VRAM) |
| 110 | {DSP_RAM_VADDR, DSP_RAM_SIZE, "DSP RAM"}, // DSP memory | ||
| 111 | {TLS_AREA_VADDR, TLS_AREA_SIZE, "TLS Area"}, // TLS memory | 112 | {TLS_AREA_VADDR, TLS_AREA_SIZE, "TLS Area"}, // TLS memory |
| 112 | }; | 113 | }; |
| 113 | 114 | ||
| @@ -133,6 +134,8 @@ void InitLegacyAddressSpace(Kernel::VMManager& address_space) { | |||
| 133 | auto shared_page_vma = address_space.MapBackingMemory(SHARED_PAGE_VADDR, | 134 | auto shared_page_vma = address_space.MapBackingMemory(SHARED_PAGE_VADDR, |
| 134 | (u8*)&SharedPage::shared_page, SHARED_PAGE_SIZE, MemoryState::Shared).MoveFrom(); | 135 | (u8*)&SharedPage::shared_page, SHARED_PAGE_SIZE, MemoryState::Shared).MoveFrom(); |
| 135 | address_space.Reprotect(shared_page_vma, VMAPermission::Read); | 136 | address_space.Reprotect(shared_page_vma, VMAPermission::Read); |
| 137 | |||
| 138 | AudioCore::AddAddressSpace(address_space); | ||
| 136 | } | 139 | } |
| 137 | 140 | ||
| 138 | } // namespace | 141 | } // namespace |