diff options
Diffstat (limited to 'src/core/mem_map.h')
| -rw-r--r-- | src/core/mem_map.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/mem_map.h b/src/core/mem_map.h index f17afb60d..7b750f848 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h | |||
| @@ -57,11 +57,11 @@ enum : u32 { | |||
| 57 | HEAP_VADDR = 0x08000000, | 57 | HEAP_VADDR = 0x08000000, |
| 58 | HEAP_VADDR_END = (HEAP_VADDR + HEAP_SIZE), | 58 | HEAP_VADDR_END = (HEAP_VADDR + HEAP_SIZE), |
| 59 | 59 | ||
| 60 | HEAP_GSP_SIZE = 0x02000000, ///< GSP heap size... TODO: Define correctly? | 60 | HEAP_LINEAR_SIZE = 0x08000000, ///< Linear heap size... TODO: Define correctly? |
| 61 | HEAP_GSP_VADDR = 0x14000000, | 61 | HEAP_LINEAR_VADDR = 0x14000000, |
| 62 | HEAP_GSP_VADDR_END = (HEAP_GSP_VADDR + HEAP_GSP_SIZE), | 62 | HEAP_LINEAR_VADDR_END = (HEAP_LINEAR_VADDR + HEAP_LINEAR_SIZE), |
| 63 | HEAP_GSP_PADDR = 0x00000000, | 63 | HEAP_LINEAR_PADDR = 0x00000000, |
| 64 | HEAP_GSP_PADDR_END = (HEAP_GSP_PADDR + HEAP_GSP_SIZE), | 64 | HEAP_LINEAR_PADDR_END = (HEAP_LINEAR_PADDR + HEAP_LINEAR_SIZE), |
| 65 | 65 | ||
| 66 | HARDWARE_IO_SIZE = 0x01000000, | 66 | HARDWARE_IO_SIZE = 0x01000000, |
| 67 | HARDWARE_IO_PADDR = 0x10000000, ///< IO physical address start | 67 | HARDWARE_IO_PADDR = 0x10000000, ///< IO physical address start |
| @@ -112,7 +112,7 @@ extern u8 *g_base; | |||
| 112 | // These are guaranteed to point to "low memory" addresses (sub-32-bit). | 112 | // These are guaranteed to point to "low memory" addresses (sub-32-bit). |
| 113 | // 64-bit: Pointers to low-mem (sub-0x10000000) mirror | 113 | // 64-bit: Pointers to low-mem (sub-0x10000000) mirror |
| 114 | // 32-bit: Same as the corresponding physical/virtual pointers. | 114 | // 32-bit: Same as the corresponding physical/virtual pointers. |
| 115 | extern u8* g_heap_gsp; ///< GSP heap (main memory) | 115 | extern u8* g_heap_linear; ///< Linear heap (main memory) |
| 116 | extern u8* g_heap; ///< Application heap (main memory) | 116 | extern u8* g_heap; ///< Application heap (main memory) |
| 117 | extern u8* g_vram; ///< Video memory (VRAM) | 117 | extern u8* g_vram; ///< Video memory (VRAM) |
| 118 | extern u8* g_shared_mem; ///< Shared memory | 118 | extern u8* g_shared_mem; ///< Shared memory |
| @@ -159,7 +159,7 @@ u32 MapBlock_Heap(u32 size, u32 operation, u32 permissions); | |||
| 159 | * @param operation Memory map operation type | 159 | * @param operation Memory map operation type |
| 160 | * @param permissions Control memory permissions | 160 | * @param permissions Control memory permissions |
| 161 | */ | 161 | */ |
| 162 | u32 MapBlock_HeapGSP(u32 size, u32 operation, u32 permissions); | 162 | u32 MapBlock_HeapLinear(u32 size, u32 operation, u32 permissions); |
| 163 | 163 | ||
| 164 | inline const char* GetCharPointer(const VAddr address) { | 164 | inline const char* GetCharPointer(const VAddr address) { |
| 165 | return (const char *)GetPointer(address); | 165 | return (const char *)GetPointer(address); |