From b31b2db5fa75d2397d6ef1551398618d33da7bbe Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sun, 30 Oct 2022 02:00:28 +0200 Subject: [PATCH] GCMemcard: Remove unused methods. --- Source/Core/Core/HW/GCMemcard/GCMemcard.cpp | 120 -------------------- Source/Core/Core/HW/GCMemcard/GCMemcard.h | 11 -- 2 files changed, 131 deletions(-) diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp index e6b6383de5..15173e0e48 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp @@ -420,51 +420,6 @@ std::optional GCMemcard::TitlePresent(const DEntry& d) const return std::nullopt; } -bool GCMemcard::GCI_FileName(u8 index, std::string& filename) const -{ - if (!m_valid || index >= DIRLEN || - GetActiveDirectory().m_dir_entries[index].m_gamecode == DEntry::UNINITIALIZED_GAMECODE) - return false; - - filename = GetActiveDirectory().m_dir_entries[index].GCI_FileName(); - return true; -} - -std::string GCMemcard::DEntry_GameCode(u8 index) const -{ - if (!m_valid || index >= DIRLEN) - return ""; - - return std::string( - reinterpret_cast(GetActiveDirectory().m_dir_entries[index].m_gamecode.data()), - GetActiveDirectory().m_dir_entries[index].m_gamecode.size()); -} - -std::string GCMemcard::DEntry_Makercode(u8 index) const -{ - if (!m_valid || index >= DIRLEN) - return ""; - - return std::string( - reinterpret_cast(GetActiveDirectory().m_dir_entries[index].m_makercode.data()), - GetActiveDirectory().m_dir_entries[index].m_makercode.size()); -} - -std::string GCMemcard::DEntry_BIFlags(u8 index) const -{ - if (!m_valid || index >= DIRLEN) - return ""; - - std::string flags; - int x = GetActiveDirectory().m_dir_entries[index].m_banner_and_icon_flags; - for (int i = 0; i < 8; i++) - { - flags.push_back((x & 0x80) ? '1' : '0'); - x = x << 1; - } - return flags; -} - bool GCMemcard::DEntry_IsPingPong(u8 index) const { if (!m_valid || index >= DIRLEN) @@ -474,81 +429,6 @@ bool GCMemcard::DEntry_IsPingPong(u8 index) const return (flags & 0b0000'0100) != 0; } -std::string GCMemcard::DEntry_FileName(u8 index) const -{ - if (!m_valid || index >= DIRLEN) - return ""; - - return std::string( - reinterpret_cast(GetActiveDirectory().m_dir_entries[index].m_filename.data()), - GetActiveDirectory().m_dir_entries[index].m_filename.size()); -} - -u32 GCMemcard::DEntry_ModTime(u8 index) const -{ - if (!m_valid || index >= DIRLEN) - return 0xFFFFFFFF; - - return GetActiveDirectory().m_dir_entries[index].m_modification_time; -} - -u32 GCMemcard::DEntry_ImageOffset(u8 index) const -{ - if (!m_valid || index >= DIRLEN) - return 0xFFFFFFFF; - - return GetActiveDirectory().m_dir_entries[index].m_image_offset; -} - -std::string GCMemcard::DEntry_IconFmt(u8 index) const -{ - if (!m_valid || index >= DIRLEN) - return ""; - - u16 x = GetActiveDirectory().m_dir_entries[index].m_icon_format; - std::string format; - for (size_t i = 0; i < 16; ++i) - { - format.push_back(Common::ExtractBit(x, 15 - i) ? '1' : '0'); - } - return format; -} - -std::string GCMemcard::DEntry_AnimSpeed(u8 index) const -{ - if (!m_valid || index >= DIRLEN) - return ""; - - u16 x = GetActiveDirectory().m_dir_entries[index].m_animation_speed; - std::string speed; - for (size_t i = 0; i < 16; ++i) - { - speed.push_back(Common::ExtractBit(x, 15 - i) ? '1' : '0'); - } - return speed; -} - -std::string GCMemcard::DEntry_Permissions(u8 index) const -{ - if (!m_valid || index >= DIRLEN) - return ""; - - u8 Permissions = GetActiveDirectory().m_dir_entries[index].m_file_permissions; - std::string permissionsString; - permissionsString.push_back((Permissions & 16) ? 'x' : 'M'); - permissionsString.push_back((Permissions & 8) ? 'x' : 'C'); - permissionsString.push_back((Permissions & 4) ? 'P' : 'x'); - return permissionsString; -} - -u8 GCMemcard::DEntry_CopyCounter(u8 index) const -{ - if (!m_valid || index >= DIRLEN) - return 0xFF; - - return GetActiveDirectory().m_dir_entries[index].m_copy_counter; -} - u16 GCMemcard::DEntry_FirstBlock(u8 index) const { if (!m_valid || index >= DIRLEN) diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.h b/Source/Core/Core/HW/GCMemcard/GCMemcard.h index 6b82d162d2..ed4c36ba20 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.h @@ -453,19 +453,8 @@ public: // with that identity exists in this card. std::optional TitlePresent(const DEntry& d) const; - bool GCI_FileName(u8 index, std::string& filename) const; // DEntry functions, all take u8 index < DIRLEN (127) - std::string DEntry_GameCode(u8 index) const; - std::string DEntry_Makercode(u8 index) const; - std::string DEntry_BIFlags(u8 index) const; bool DEntry_IsPingPong(u8 index) const; - std::string DEntry_FileName(u8 index) const; - u32 DEntry_ModTime(u8 index) const; - u32 DEntry_ImageOffset(u8 index) const; - std::string DEntry_IconFmt(u8 index) const; - std::string DEntry_AnimSpeed(u8 index) const; - std::string DEntry_Permissions(u8 index) const; - u8 DEntry_CopyCounter(u8 index) const; // get first block for file u16 DEntry_FirstBlock(u8 index) const; // get file length in blocks