diff options
| author | 2015-05-29 18:00:17 -0700 | |
|---|---|---|
| committer | 2015-05-29 18:00:17 -0700 | |
| commit | 8a04c65e20ba1f5c472c026b7a558e1d54324306 (patch) | |
| tree | c11c0c6a472184f25479b0679748ee71653a2985 /src/core/memory_setup.h | |
| parent | Merge pull request #818 from linkmauve/no-trailing-whitespace (diff) | |
| parent | Memmap: Remove unused global pointers to memory areas (diff) | |
| download | yuzu-8a04c65e20ba1f5c472c026b7a558e1d54324306.tar.gz yuzu-8a04c65e20ba1f5c472c026b7a558e1d54324306.tar.xz yuzu-8a04c65e20ba1f5c472c026b7a558e1d54324306.zip | |
Merge pull request #810 from yuriks/memmap
Kernel: Add VMManager to manage process address spaces
Diffstat (limited to 'src/core/memory_setup.h')
| -rw-r--r-- | src/core/memory_setup.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/memory_setup.h b/src/core/memory_setup.h index 46263495f..361bfc816 100644 --- a/src/core/memory_setup.h +++ b/src/core/memory_setup.h | |||
| @@ -6,8 +6,13 @@ | |||
| 6 | 6 | ||
| 7 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 8 | 8 | ||
| 9 | #include "core/memory.h" | ||
| 10 | |||
| 9 | namespace Memory { | 11 | namespace Memory { |
| 10 | 12 | ||
| 13 | const u32 PAGE_MASK = PAGE_SIZE - 1; | ||
| 14 | const int PAGE_BITS = 12; | ||
| 15 | |||
| 11 | void InitMemoryMap(); | 16 | void InitMemoryMap(); |
| 12 | 17 | ||
| 13 | /** | 18 | /** |
| @@ -26,4 +31,6 @@ void MapMemoryRegion(VAddr base, u32 size, u8* target); | |||
| 26 | */ | 31 | */ |
| 27 | void MapIoRegion(VAddr base, u32 size); | 32 | void MapIoRegion(VAddr base, u32 size); |
| 28 | 33 | ||
| 34 | void UnmapRegion(VAddr base, u32 size); | ||
| 35 | |||
| 29 | } | 36 | } |