summaryrefslogtreecommitdiff
path: root/src/core/memory_setup.h
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-05-29 18:00:17 -0700
committerGravatar Yuri Kunde Schlesner2015-05-29 18:00:17 -0700
commit8a04c65e20ba1f5c472c026b7a558e1d54324306 (patch)
treec11c0c6a472184f25479b0679748ee71653a2985 /src/core/memory_setup.h
parentMerge pull request #818 from linkmauve/no-trailing-whitespace (diff)
parentMemmap: Remove unused global pointers to memory areas (diff)
downloadyuzu-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.h7
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
9namespace Memory { 11namespace Memory {
10 12
13const u32 PAGE_MASK = PAGE_SIZE - 1;
14const int PAGE_BITS = 12;
15
11void InitMemoryMap(); 16void InitMemoryMap();
12 17
13/** 18/**
@@ -26,4 +31,6 @@ void MapMemoryRegion(VAddr base, u32 size, u8* target);
26 */ 31 */
27void MapIoRegion(VAddr base, u32 size); 32void MapIoRegion(VAddr base, u32 size);
28 33
34void UnmapRegion(VAddr base, u32 size);
35
29} 36}