diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-12 18:17:04 -0300 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-15 00:04:38 -0300 |
commit | a251721bf3a053ea012ac0b891826f3246273c82 (patch) | |
tree | 225da92c7fbef78f2cb64b104615b05957704ac9 /src | |
parent | 9f503387dc2d1c697fe732264cc2b1a1513a3541 (diff) |
Memmap: Remove unused declarations
Diffstat (limited to 'src')
-rw-r--r-- | src/core/mem_map.h | 9 | ||||
-rw-r--r-- | src/core/mem_map_funcs.cpp | 14 |
2 files changed, 3 insertions, 20 deletions
diff --git a/src/core/mem_map.h b/src/core/mem_map.h index 71f90cb8..b6944deb 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -134,20 +134,11 @@ extern u8* g_tls_mem; ///< TLS memory void Init(); void Shutdown(); -template <typename T> -inline void Read(T &var, VAddr addr); - -template <typename T> -inline void Write(VAddr addr, T data); - u8 Read8(VAddr addr); u16 Read16(VAddr addr); u32 Read32(VAddr addr); u64 Read64(VAddr addr); -u32 Read8_ZX(VAddr addr); -u32 Read16_ZX(VAddr addr); - void Write8(VAddr addr, u8 data); void Write16(VAddr addr, u16 data); void Write32(VAddr addr, u32 data); diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index a8e0fed0..f2da60cc 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -225,27 +225,19 @@ u8 Read8(const VAddr addr) { u16 Read16(const VAddr addr) { u16_le data = 0; Read<u16_le>(data, addr); - return (u16)data; + return data; } u32 Read32(const VAddr addr) { u32_le data = 0; Read<u32_le>(data, addr); - return (u32)data; + return data; } u64 Read64(const VAddr addr) { u64_le data = 0; Read<u64_le>(data, addr); - return (u64)data; -} - -u32 Read8_ZX(const VAddr addr) { - return (u32)Read8(addr); -} - -u32 Read16_ZX(const VAddr addr) { - return (u32)Read16(addr); + return data; } void Write8(const VAddr addr, const u8 data) { |