From 38c8a4efb245aec4bfd34c28e00c73b140c08489 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Sat, 12 Jul 2014 14:35:47 +0200 Subject: MMIO: Cleanup Mapping class by using templates instead of macros. --- Source/UnitTests/Core/MMIOTest.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Source/UnitTests/Core') diff --git a/Source/UnitTests/Core/MMIOTest.cpp b/Source/UnitTests/Core/MMIOTest.cpp index 64b226ce5d..f9173ce0c4 100644 --- a/Source/UnitTests/Core/MMIOTest.cpp +++ b/Source/UnitTests/Core/MMIOTest.cpp @@ -54,9 +54,9 @@ TEST_F(MappingTest, ReadConstant) m_mapping->Register(0xCC001234, MMIO::Constant(0x1234), MMIO::Nop()); m_mapping->Register(0xCC001234, MMIO::Constant(0xdeadbeef), MMIO::Nop()); - u8 val8; m_mapping->Read(0xCC001234, &val8); - u16 val16; m_mapping->Read(0xCC001234, &val16); - u32 val32; m_mapping->Read(0xCC001234, &val32); + u8 val8 = m_mapping->Read(0xCC001234); + u16 val16 = m_mapping->Read(0xCC001234); + u32 val32 = m_mapping->Read(0xCC001234); EXPECT_EQ(0x42, val8); EXPECT_EQ(0x1234, val16); @@ -75,9 +75,9 @@ TEST_F(MappingTest, ReadWriteDirect) for (u32 i = 0; i < 100; ++i) { - u8 val8; m_mapping->Read(0xCC001234, &val8); EXPECT_EQ(i, val8); - u16 val16; m_mapping->Read(0xCC001234, &val16); EXPECT_EQ(i, val16); - u32 val32; m_mapping->Read(0xCC001234, &val32); EXPECT_EQ(i, val32); + u8 val8 = m_mapping->Read(0xCC001234); EXPECT_EQ(i, val8); + u16 val16 = m_mapping->Read(0xCC001234); EXPECT_EQ(i, val16); + u32 val32 = m_mapping->Read(0xCC001234); EXPECT_EQ(i, val32); val8 += 1; m_mapping->Write(0xCC001234, val8); val16 += 1; m_mapping->Write(0xCC001234, val16); @@ -102,7 +102,7 @@ TEST_F(MappingTest, ReadWriteComplex) }) ); - u8 val; m_mapping->Read(0xCC001234, &val); EXPECT_EQ(0x12, val); + u8 val = m_mapping->Read(0xCC001234); EXPECT_EQ(0x12, val); m_mapping->Write(0xCC001234, (u8)0x34); EXPECT_TRUE(read_called); -- cgit v1.2.3