diff options
| author |  archshift | 2014-04-28 19:44:43 -0700 |
|---|---|---|
| committer | archshift | 2014-04-28 19:44:43 -0700 |
| commit | 237d079aad97aefcddc991157bf3ac50aa64b7f6 (patch) | |
| tree | cad4e7082fb3c97ecf9d8a6818722308154aa76a /src/core/mem_map.h | |
| parent | IT'S ALIVE! (diff) | |
| parent | added FAQ link to README.md (diff) | |
| download | yuzu-237d079aad97aefcddc991157bf3ac50aa64b7f6.tar.gz yuzu-237d079aad97aefcddc991157bf3ac50aa64b7f6.tar.xz yuzu-237d079aad97aefcddc991157bf3ac50aa64b7f6.zip | |
Merge commit upstream/master into issue-7-fix
Diffstat (limited to 'src/core/mem_map.h')
| -rw-r--r-- | src/core/mem_map.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/mem_map.h b/src/core/mem_map.h index c744e377e..509fc8fd9 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h | |||
| @@ -47,6 +47,8 @@ enum { | |||
| 47 | FCRAM_PADDR_END = (FCRAM_PADDR + FCRAM_SIZE), ///< FCRAM end of physical space | 47 | FCRAM_PADDR_END = (FCRAM_PADDR + FCRAM_SIZE), ///< FCRAM end of physical space |
| 48 | FCRAM_VADDR = 0x08000000, ///< FCRAM virtual address | 48 | FCRAM_VADDR = 0x08000000, ///< FCRAM virtual address |
| 49 | FCRAM_VADDR_END = (FCRAM_VADDR + FCRAM_SIZE), ///< FCRAM end of virtual space | 49 | FCRAM_VADDR_END = (FCRAM_VADDR + FCRAM_SIZE), ///< FCRAM end of virtual space |
| 50 | FRAM_VADDR_FW0B = 0xF0000000, ///< FCRAM adress for firmare FW0B | ||
| 51 | FRAM_VADDR_FW0B_END = (FRAM_VADDR_FW0B + FCRAM_SIZE), ///< FCRAM adress end for FW0B | ||
| 50 | 52 | ||
| 51 | HARDWARE_IO_PADDR = 0x10000000, ///< IO physical address start | 53 | HARDWARE_IO_PADDR = 0x10000000, ///< IO physical address start |
| 52 | HARDWARE_IO_VADDR = 0x1EC00000, ///< IO virtual address start | 54 | HARDWARE_IO_VADDR = 0x1EC00000, ///< IO virtual address start |