diff options
author | bunnei <ericbunnie@gmail.com> | 2014-04-26 20:21:40 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-04-26 20:21:40 +0200 |
commit | f78794961e2bdcb0314516a3c2409afbfcd6d470 (patch) | |
tree | c1dffc4ea73a3adf530dcde922c8d83229345599 /src/core | |
parent | added simple GSP GPU ReadHWRegs function to support returning the framebuffer address (diff) | |
download | yuzu-f78794961e2bdcb0314516a3c2409afbfcd6d470.tar yuzu-f78794961e2bdcb0314516a3c2409afbfcd6d470.tar.gz yuzu-f78794961e2bdcb0314516a3c2409afbfcd6d470.tar.bz2 yuzu-f78794961e2bdcb0314516a3c2409afbfcd6d470.tar.lz yuzu-f78794961e2bdcb0314516a3c2409afbfcd6d470.tar.xz yuzu-f78794961e2bdcb0314516a3c2409afbfcd6d470.tar.zst yuzu-f78794961e2bdcb0314516a3c2409afbfcd6d470.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/hw/hw.cpp | 76 | ||||
-rw-r--r-- | src/core/hw/lcd.cpp | 14 | ||||
-rw-r--r-- | src/core/mem_map.h | 4 | ||||
-rw-r--r-- | src/core/mem_map_funcs.cpp | 12 |
4 files changed, 64 insertions, 42 deletions
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp index 16bd70125..85669ae7f 100644 --- a/src/core/hw/hw.cpp +++ b/src/core/hw/hw.cpp @@ -12,49 +12,42 @@ namespace HW { enum { - ADDRESS_CONFIG = 0x10000000, - ADDRESS_IRQ = 0x10001000, - ADDRESS_NDMA = 0x10002000, - ADDRESS_TIMER = 0x10003000, - ADDRESS_CTRCARD = 0x10004000, - ADDRESS_CTRCARD_2 = 0x10005000, - ADDRESS_SDMC_NAND = 0x10006000, - ADDRESS_SDMC_NAND_2 = 0x10007000, // Apparently not used on retail - ADDRESS_PXI = 0x10008000, - ADDRESS_AES = 0x10009000, - ADDRESS_SHA = 0x1000A000, - ADDRESS_RSA = 0x1000B000, - ADDRESS_XDMA = 0x1000C000, - ADDRESS_SPICARD = 0x1000D800, - ADDRESS_CONFIG_2 = 0x10010000, - ADDRESS_HASH = 0x10101000, - ADDRESS_CSND = 0x10103000, - ADDRESS_DSP = 0x10140000, - ADDRESS_PDN = 0x10141000, - ADDRESS_CODEC = 0x10141000, - ADDRESS_SPI = 0x10142000, - ADDRESS_SPI_2 = 0x10143000, - ADDRESS_I2C = 0x10144000, - ADDRESS_CODEC_2 = 0x10145000, - ADDRESS_HID = 0x10146000, - ADDRESS_PAD = 0x10146000, - ADDRESS_PTM = 0x10146000, - ADDRESS_I2C_2 = 0x10148000, - ADDRESS_SPI_3 = 0x10160000, - ADDRESS_I2C_3 = 0x10161000, - ADDRESS_MIC = 0x10162000, - ADDRESS_PXI_2 = 0x10163000, - ADDRESS_NTRCARD = 0x10164000, - ADDRESS_DSP_2 = 0x10203000, - ADDRESS_HASH_2 = 0x10301000, + VADDR_HASH = 0x1EC01000, + VADDR_CSND = 0x1EC03000, + VADDR_DSP = 0x1EC40000, + VADDR_PDN = 0x1EC41000, + VADDR_CODEC = 0x1EC41000, + VADDR_SPI = 0x1EC42000, + VADDR_SPI_2 = 0x1EC43000, // Only used under TWL_FIRM? + VADDR_I2C = 0x1EC44000, + VADDR_CODEC_2 = 0x1EC45000, + VADDR_HID = 0x1EC46000, + VADDR_PAD = 0x1EC46000, + VADDR_PTM = 0x1EC46000, + VADDR_GPIO = 0x1EC47000, + VADDR_I2C_2 = 0x1EC48000, + VADDR_SPI_3 = 0x1EC60000, + VADDR_I2C_3 = 0x1EC61000, + VADDR_MIC = 0x1EC62000, + VADDR_PXI = 0x1EC63000, // 0xFFFD2000 + //VADDR_NTRCARD + VADDR_CDMA = 0xFFFDA000, // CoreLink DMA-330? Info + VADDR_DSP_2 = 0x1ED03000, + VADDR_HASH_2 = 0x1EE01000, + VADDR_LCD = 0x1EF00000, }; template <typename T> inline void Read(T &var, const u32 addr) { switch (addr & 0xFFFFF000) { - case ADDRESS_NDMA: - NDMA::Read(var, addr); + // TODO(bunnei): What is the virtual address of NDMA? + // case VADDR_NDMA: + // NDMA::Read(var, addr); + // break; + + case VADDR_LCD: + LCD::Read(var, addr); break; default: @@ -66,8 +59,13 @@ template <typename T> inline void Write(u32 addr, const T data) { switch (addr & 0xFFFFF000) { - case ADDRESS_NDMA: - NDMA::Write(addr, data); + // TODO(bunnei): What is the virtual address of NDMA? + // case VADDR_NDMA + // NDMA::Write(addr, data); + // break; + + case VADDR_LCD: + LCD::Write(addr, data); break; default: diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp index 3013673f8..822cd1647 100644 --- a/src/core/hw/lcd.cpp +++ b/src/core/hw/lcd.cpp @@ -18,12 +18,26 @@ u64 g_last_ticks = 0; ///< Last CPU ticks template <typename T> inline void Read(T &var, const u32 addr) { + ERROR_LOG(LCD, "unknown Read%d @ 0x%08X", sizeof(var) * 8, addr); } template <typename T> inline void Write(u32 addr, const T data) { + ERROR_LOG(LCD, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr); } +// Explicitly instantiate template functions because we aren't defining this in the header: + +template void Read<u64>(u64 &var, const u32 addr); +template void Read<u32>(u32 &var, const u32 addr); +template void Read<u16>(u16 &var, const u32 addr); +template void Read<u8>(u8 &var, const u32 addr); + +template void Write<u64>(u32 addr, const u64 data); +template void Write<u32>(u32 addr, const u32 data); +template void Write<u16>(u32 addr, const u16 data); +template void Write<u8>(u32 addr, const u8 data); + /// Update hardware void Update() { u64 current_ticks = Core::g_app_core->GetTicks(); diff --git a/src/core/mem_map.h b/src/core/mem_map.h index 087e8d3bc..1a49cc98d 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -48,7 +48,9 @@ enum { FCRAM_VADDR = 0x08000000, ///< FCRAM virtual address FCRAM_VADDR_END = (FCRAM_VADDR + FCRAM_SIZE), ///< FCRAM end of virtual space - HARDWARE_IO_VADDR = 0x1EC00000, + HARDWARE_IO_PADDR = 0x10000000, ///< IO physical address start + HARDWARE_IO_VADDR = 0x1EC00000, ///< IO virtual address start + HARDWARE_IO_PADDR_END = (HARDWARE_IO_PADDR + HARDWARE_IO_SIZE), HARDWARE_IO_VADDR_END = (HARDWARE_IO_VADDR + HARDWARE_IO_SIZE), VRAM_VADDR = 0x1F000000, diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 875821adb..d0bec31c6 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -21,8 +21,16 @@ u32 _AddressPhysicalToVirtual(const u32 addr) { // Our memory interface read/write functions assume virtual addresses. Put any physical address // to virtual address translations here. This is obviously quite hacky... But we're not doing // any MMU emulation yet or anything - if ((addr >= FCRAM_PADDR) && (addr < (FCRAM_PADDR_END))) { + if ((addr >= FCRAM_PADDR) && (addr < FCRAM_PADDR_END)) { return (addr & FCRAM_MASK) | FCRAM_VADDR; + + // Hardware IO + // TODO(bunnei): FixMe + // This isn't going to work... The physical address of HARDWARE_IO conflicts with the virtual + // address of shared memory. + //} else if ((addr >= HARDWARE_IO_PADDR) && (addr < HARDWARE_IO_PADDR_END)) { + // return (addr + 0x0EB00000); + } return addr; } @@ -132,7 +140,7 @@ u8 *GetPointer(const u32 addr) { return g_vram + (vaddr & VRAM_MASK); } else { - ERROR_LOG(MEMMAP, "Unknown GetPointer @ 0x%08x", vaddr); + ERROR_LOG(MEMMAP, "unknown GetPointer @ 0x%08x", vaddr); return 0; } } |