summaryrefslogtreecommitdiff
path: root/Source/UnitTests/Core/MMIOTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/UnitTests/Core/MMIOTest.cpp')
-rw-r--r--Source/UnitTests/Core/MMIOTest.cpp14
1 files changed, 7 insertions, 7 deletions
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<u16>(0x1234), MMIO::Nop<u16>());
m_mapping->Register(0xCC001234, MMIO::Constant<u32>(0xdeadbeef), MMIO::Nop<u32>());
- 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<u8>(0xCC001234);
+ u16 val16 = m_mapping->Read<u16>(0xCC001234);
+ u32 val32 = m_mapping->Read<u32>(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<u8>(0xCC001234); EXPECT_EQ(i, val8);
+ u16 val16 = m_mapping->Read<u16>(0xCC001234); EXPECT_EQ(i, val16);
+ u32 val32 = m_mapping->Read<u32>(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<u8>(0xCC001234); EXPECT_EQ(0x12, val);
m_mapping->Write(0xCC001234, (u8)0x34);
EXPECT_TRUE(read_called);