From fcb2c5bd294334a2c00419b38c64a9fed22b6b85 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 19 May 2017 21:23:00 +0200 Subject: Remove CBlobBigEndianReader We can simply put ReadSwapped directly in IBlobReader. --- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp') diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index 1572c8493b..cde3f8fda4 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -36,28 +36,27 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(std::unique_ptr reader) _assert_(m_pReader); // Get decryption keys for all partitions - CBlobBigEndianReader big_endian_reader(*m_pReader.get()); for (u32 partition_group = 0; partition_group < 4; ++partition_group) { u32 number_of_partitions; - if (!big_endian_reader.ReadSwapped(0x40000 + (partition_group * 8), &number_of_partitions)) + if (!m_pReader->ReadSwapped(0x40000 + (partition_group * 8), &number_of_partitions)) continue; u32 read_buffer; - if (!big_endian_reader.ReadSwapped(0x40000 + (partition_group * 8) + 4, &read_buffer)) + if (!m_pReader->ReadSwapped(0x40000 + (partition_group * 8) + 4, &read_buffer)) continue; const u64 partition_table_offset = (u64)read_buffer << 2; for (u32 i = 0; i < number_of_partitions; i++) { - if (!big_endian_reader.ReadSwapped(partition_table_offset + (i * 8), &read_buffer)) + if (!m_pReader->ReadSwapped(partition_table_offset + (i * 8), &read_buffer)) continue; const u64 partition_offset = (u64)read_buffer << 2; if (m_game_partition == PARTITION_NONE) { u32 partition_type; - if (!big_endian_reader.ReadSwapped(partition_table_offset + (i * 8) + 4, &partition_type)) + if (!m_pReader->ReadSwapped(partition_table_offset + (i * 8) + 4, &partition_type)) continue; if (partition_type == 0) @@ -95,7 +94,7 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(std::unique_ptr reader) else { u8 key_number = 0; - if (!big_endian_reader.ReadSwapped(partition_offset + 0x1f1, &key_number)) + if (!m_pReader->ReadSwapped(partition_offset + 0x1f1, &key_number)) continue; common_key = (key_number == 1) ? common_key_korean : common_key_standard; } -- cgit v1.2.3