diff options
| author |  Weiyi Wang | 2017-06-21 20:34:12 +0300 |
|---|---|---|
| committer |  GitHub | 2017-06-21 20:34:12 +0300 |
| commit | c4f0927a62b0f31cf9ab6c0fe760c491e6c9b3db (patch) | |
| tree | a861dcb99fc789a22a6df9878fceae3b63cf0a18 /src/core/memory.h | |
| parent | Merge pull request #2790 from yuriks/remove-movefrom (diff) | |
| parent | Memory: Add enum definitions for the n3DS FCRAM size (diff) | |
| download | yuzu-c4f0927a62b0f31cf9ab6c0fe760c491e6c9b3db.tar.gz yuzu-c4f0927a62b0f31cf9ab6c0fe760c491e6c9b3db.tar.xz yuzu-c4f0927a62b0f31cf9ab6c0fe760c491e6c9b3db.zip | |
Merge pull request #2789 from yuriks/misc-kernel
Trivial no-op additions
Diffstat (limited to 'src/core/memory.h')
| -rw-r--r-- | src/core/memory.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/memory.h b/src/core/memory.h index 802aa465e..71fb278ad 100644 --- a/src/core/memory.h +++ b/src/core/memory.h | |||
| @@ -55,8 +55,10 @@ enum : PAddr { | |||
| 55 | 55 | ||
| 56 | /// Main FCRAM | 56 | /// Main FCRAM |
| 57 | FCRAM_PADDR = 0x20000000, | 57 | FCRAM_PADDR = 0x20000000, |
| 58 | FCRAM_SIZE = 0x08000000, ///< FCRAM size (128MB) | 58 | FCRAM_SIZE = 0x08000000, ///< FCRAM size on the Old 3DS (128MB) |
| 59 | FCRAM_N3DS_SIZE = 0x10000000, ///< FCRAM size on the New 3DS (256MB) | ||
| 59 | FCRAM_PADDR_END = FCRAM_PADDR + FCRAM_SIZE, | 60 | FCRAM_PADDR_END = FCRAM_PADDR + FCRAM_SIZE, |
| 61 | FCRAM_N3DS_PADDR_END = FCRAM_PADDR + FCRAM_N3DS_SIZE, | ||
| 60 | }; | 62 | }; |
| 61 | 63 | ||
| 62 | /// Virtual user-space memory regions | 64 | /// Virtual user-space memory regions |