diff options
| author | 2014-04-17 18:40:42 -0400 | |
|---|---|---|
| committer | 2014-04-17 18:40:42 -0400 | |
| commit | ae99574b6dd2f21960bd42e0bb9a1978e18413d4 (patch) | |
| tree | b3b03484e87c67ed6008eb142706f2b126f75197 /src/core/mem_map.h | |
| parent | fixed framebuffer color order (diff) | |
| download | yuzu-ae99574b6dd2f21960bd42e0bb9a1978e18413d4.tar.gz yuzu-ae99574b6dd2f21960bd42e0bb9a1978e18413d4.tar.xz yuzu-ae99574b6dd2f21960bd42e0bb9a1978e18413d4.zip | |
cleaned up memory interfaces a lot, removed some hackish stuff
Diffstat (limited to 'src/core/mem_map.h')
| -rw-r--r-- | src/core/mem_map.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/mem_map.h b/src/core/mem_map.h index d0308fa5c..82cfdece5 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h | |||
| @@ -17,8 +17,7 @@ enum { | |||
| 17 | MEM_VRAM_SIZE = 0x00600000, ///< VRAM size | 17 | MEM_VRAM_SIZE = 0x00600000, ///< VRAM size |
| 18 | MEM_DSP_SIZE = 0x00080000, ///< DSP memory size | 18 | MEM_DSP_SIZE = 0x00080000, ///< DSP memory size |
| 19 | MEM_AXI_WRAM_SIZE = 0x00080000, ///< AXI WRAM size | 19 | MEM_AXI_WRAM_SIZE = 0x00080000, ///< AXI WRAM size |
| 20 | MEM_FCRAM_SIZE = 0x08000000, ///< FCRAM size... Really 0x07E00000, but power of 2 | 20 | MEM_FCRAM_SIZE = 0x08000000, ///< FCRAM size |
| 21 | // works much better | ||
| 22 | MEM_SCRATCHPAD_SIZE = 0x00004000, ///< Typical stack size - TODO: Read from exheader | 21 | MEM_SCRATCHPAD_SIZE = 0x00004000, ///< Typical stack size - TODO: Read from exheader |
| 23 | 22 | ||
| 24 | MEM_VRAM_MASK = 0x007FFFFF, | 23 | MEM_VRAM_MASK = 0x007FFFFF, |
| @@ -52,7 +51,6 @@ extern u8 *g_base; | |||
| 52 | // 32-bit: Same as the corresponding physical/virtual pointers. | 51 | // 32-bit: Same as the corresponding physical/virtual pointers. |
| 53 | extern u8* g_fcram; ///< Main memory | 52 | extern u8* g_fcram; ///< Main memory |
| 54 | extern u8* g_vram; ///< Video memory (VRAM) | 53 | extern u8* g_vram; ///< Video memory (VRAM) |
| 55 | extern u8* g_scratchpad; ///< Stack memory | ||
| 56 | 54 | ||
| 57 | void Init(); | 55 | void Init(); |
| 58 | void Shutdown(); | 56 | void Shutdown(); |