summaryrefslogtreecommitdiffstats
path: root/src/core/mem_map.h
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-02-08 14:38:00 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-04-06 01:14:33 +0200
commit34b009cf38643dc8ac45a366d24208d36a2eb2f9 (patch)
treeffd88b43959d9a46a2f4155413dc893356fe66bc /src/core/mem_map.h
parentMerge pull request #680 from archshift/bg-color (diff)
downloadyuzu-34b009cf38643dc8ac45a366d24208d36a2eb2f9.tar
yuzu-34b009cf38643dc8ac45a366d24208d36a2eb2f9.tar.gz
yuzu-34b009cf38643dc8ac45a366d24208d36a2eb2f9.tar.bz2
yuzu-34b009cf38643dc8ac45a366d24208d36a2eb2f9.tar.lz
yuzu-34b009cf38643dc8ac45a366d24208d36a2eb2f9.tar.xz
yuzu-34b009cf38643dc8ac45a366d24208d36a2eb2f9.tar.zst
yuzu-34b009cf38643dc8ac45a366d24208d36a2eb2f9.zip
Diffstat (limited to 'src/core/mem_map.h')
-rw-r--r--src/core/mem_map.h26
1 files changed, 10 insertions, 16 deletions
diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index bce99dffa..ff730593e 100644
--- a/src/core/mem_map.h
+++ b/src/core/mem_map.h
@@ -27,10 +27,16 @@ enum : u32 {
MPCORE_PRIV_PADDR_END = (MPCORE_PRIV_PADDR + MPCORE_PRIV_SIZE),
FCRAM_SIZE = 0x08000000, ///< FCRAM size
- FCRAM_PADDR = 0x20000000, ///< FCRAM physical address
- FCRAM_PADDR_END = (FCRAM_PADDR + FCRAM_SIZE), ///< FCRAM end of physical space
- FCRAM_VADDR = 0x08000000, ///< FCRAM virtual address
- FCRAM_VADDR_END = (FCRAM_VADDR + FCRAM_SIZE), ///< FCRAM end of virtual space
+ FCRAM_PADDR = 0x20000000, ///< FCRAM physical address
+ FCRAM_PADDR_END = (FCRAM_PADDR + FCRAM_SIZE),
+
+ HEAP_SIZE = FCRAM_SIZE, ///< Application heap size
+ HEAP_VADDR = 0x08000000,
+ HEAP_VADDR_END = (HEAP_VADDR + HEAP_SIZE),
+
+ HEAP_LINEAR_SIZE = FCRAM_SIZE,
+ HEAP_LINEAR_VADDR = 0x14000000,
+ HEAP_LINEAR_VADDR_END = (HEAP_LINEAR_VADDR + HEAP_LINEAR_SIZE),
AXI_WRAM_SIZE = 0x00080000, ///< AXI WRAM size
AXI_WRAM_PADDR = 0x1FF80000, ///< AXI WRAM physical address
@@ -65,18 +71,6 @@ enum : u32 {
SYSTEM_MEMORY_VADDR = 0x04000000,
SYSTEM_MEMORY_VADDR_END = (SYSTEM_MEMORY_VADDR + SYSTEM_MEMORY_SIZE),
- HEAP_SIZE = FCRAM_SIZE, ///< Application heap size
- //HEAP_PADDR = HEAP_GSP_SIZE,
- //HEAP_PADDR_END = (HEAP_PADDR + HEAP_SIZE),
- HEAP_VADDR = 0x08000000,
- HEAP_VADDR_END = (HEAP_VADDR + HEAP_SIZE),
-
- HEAP_LINEAR_SIZE = 0x08000000, ///< Linear heap size... TODO: Define correctly?
- HEAP_LINEAR_VADDR = 0x14000000,
- HEAP_LINEAR_VADDR_END = (HEAP_LINEAR_VADDR + HEAP_LINEAR_SIZE),
- HEAP_LINEAR_PADDR = 0x00000000,
- HEAP_LINEAR_PADDR_END = (HEAP_LINEAR_PADDR + HEAP_LINEAR_SIZE),
-
HARDWARE_IO_SIZE = 0x01000000,
HARDWARE_IO_PADDR = 0x10000000, ///< IO physical address start
HARDWARE_IO_VADDR = 0x1EC00000, ///< IO virtual address start