diff options
| author | 2016-01-30 19:03:33 -0500 | |
|---|---|---|
| committer | 2016-01-30 19:03:33 -0500 | |
| commit | cd0b31fd7334d574477a3c92bcbd392e8c3eb5e1 (patch) | |
| tree | 865c931cb344cc4addb0d50e6533ff5ce9c150d8 /src/core/memory_setup.h | |
| parent | Merge pull request #1379 from lioncash/color (diff) | |
| parent | Memory: Implement MMIO (diff) | |
| download | yuzu-cd0b31fd7334d574477a3c92bcbd392e8c3eb5e1.tar.gz yuzu-cd0b31fd7334d574477a3c92bcbd392e8c3eb5e1.tar.xz yuzu-cd0b31fd7334d574477a3c92bcbd392e8c3eb5e1.zip | |
Merge pull request #1377 from MerryMage/mmio
Memory: Implemented MMIO
Diffstat (limited to 'src/core/memory_setup.h')
| -rw-r--r-- | src/core/memory_setup.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/memory_setup.h b/src/core/memory_setup.h index 84ff30120..05f70a1fe 100644 --- a/src/core/memory_setup.h +++ b/src/core/memory_setup.h | |||
| @@ -23,10 +23,11 @@ void MapMemoryRegion(VAddr base, u32 size, u8* target); | |||
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * Maps a region of the emulated process address space as a IO region. | 25 | * Maps a region of the emulated process address space as a IO region. |
| 26 | * @note Currently this can only be used to mark a region as being IO, since actual memory-mapped | 26 | * @param base The address to start mapping at. Must be page-aligned. |
| 27 | * IO isn't yet supported. | 27 | * @param size The amount of bytes to map. Must be page-aligned. |
| 28 | * @param mmio_handler The handler that backs the mapping. | ||
| 28 | */ | 29 | */ |
| 29 | void MapIoRegion(VAddr base, u32 size); | 30 | void MapIoRegion(VAddr base, u32 size, MMIORegionPointer mmio_handler); |
| 30 | 31 | ||
| 31 | void UnmapRegion(VAddr base, u32 size); | 32 | void UnmapRegion(VAddr base, u32 size); |
| 32 | 33 | ||