GCMemcard: Remove obsolete methods.

2 files changed, 0 insertions, 283 deletions

diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
index 8785c9736d..473a9d795d 100644
--- a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
+++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
@@ -432,9 +432,6 @@ bool GCMemcard::GCI_FileName(u8 index, std::string& filename) const
   return true;
 }
 
-// DEntry functions, all take u8 index < DIRLEN (127)
-// Functions that have ascii output take a char *buffer
-
 std::string GCMemcard::DEntry_GameCode(u8 index) const
 {
   if (!m_valid || index >= DIRLEN)
@@ -836,7 +833,6 @@ GCMemcardGetSaveDataRetVal GCMemcard::GetSaveData(u8 index, std::vector<GCMBlock
   }
   return GCMemcardGetSaveDataRetVal::SUCCESS;
 }
-// End DEntry functions
 
 GCMemcardImportFileRetVal GCMemcard::ImportFile(const DEntry& direntry,
                                                 std::vector<GCMBlock>& saveBlocks)
@@ -956,250 +952,6 @@ GCMemcardRemoveFileRetVal GCMemcard::RemoveFile(u8 index)  // index in the direc
   return GCMemcardRemoveFileRetVal::SUCCESS;
 }
 
-GCMemcardImportFileRetVal GCMemcard::CopyFrom(const GCMemcard& source, u8 index)
-{
-  if (!m_valid || !source.m_valid)
-    return GCMemcardImportFileRetVal::NOMEMCARD;
-
-  std::optional<DEntry> tempDEntry = source.GetDEntry(index);
-  if (!tempDEntry)
-    return GCMemcardImportFileRetVal::NOMEMCARD;
-
-  u32 size = source.DEntry_BlockCount(index);
-  if (size == 0xFFFF)
-    return GCMemcardImportFileRetVal::INVALIDFILESIZE;
-
-  std::vector<GCMBlock> saveData;
-  saveData.reserve(size);
-  switch (source.GetSaveData(index, saveData))
-  {
-  case GCMemcardGetSaveDataRetVal::FAIL:
-    return GCMemcardImportFileRetVal::FAIL;
-  case GCMemcardGetSaveDataRetVal::NOMEMCARD:
-    return GCMemcardImportFileRetVal::NOMEMCARD;
-  default:
-    FixChecksums();
-    return ImportFile(*tempDEntry, saveData);
-  }
-}
-
-GCMemcardImportFileRetVal GCMemcard::ImportGci(const std::string& inputFile)
-{
-  if (!m_valid)
-    return GCMemcardImportFileRetVal::OPENFAIL;
-
-  File::IOFile gci(inputFile, "rb");
-  if (!gci)
-    return GCMemcardImportFileRetVal::OPENFAIL;
-
-  return ImportGciInternal(std::move(gci), inputFile);
-}
-
-GCMemcardImportFileRetVal GCMemcard::ImportGciInternal(File::IOFile&& gci,
-                                                       const std::string& inputFile)
-{
-  unsigned int offset;
-  std::string fileType;
-  SplitPath(inputFile, nullptr, nullptr, &fileType);
-
-  if (!strcasecmp(fileType.c_str(), ".gci"))
-    offset = GCI;
-  else
-  {
-    char tmp[0xD];
-    gci.ReadBytes(tmp, sizeof(tmp));
-    if (!strcasecmp(fileType.c_str(), ".gcs"))
-    {
-      if (!memcmp(tmp, "GCSAVE", 6))  // Header must be uppercase
-        offset = GCS;
-      else
-        return GCMemcardImportFileRetVal::GCSFAIL;
-    }
-    else if (!strcasecmp(fileType.c_str(), ".sav"))
-    {
-      if (!memcmp(tmp, "DATELGC_SAVE", 0xC))  // Header must be uppercase
-        offset = SAV;
-      else
-        return GCMemcardImportFileRetVal::SAVFAIL;
-    }
-    else
-      return GCMemcardImportFileRetVal::OPENFAIL;
-  }
-  gci.Seek(offset, SEEK_SET);
-
-  DEntry tempDEntry;
-  gci.ReadBytes(&tempDEntry, DENTRY_SIZE);
-  const u64 fStart = gci.Tell();
-  gci.Seek(0, SEEK_END);
-  const u64 length = gci.Tell() - fStart;
-  gci.Seek(offset + DENTRY_SIZE, SEEK_SET);
-
-  Gcs_SavConvert(tempDEntry, offset, length);
-
-  if (length != tempDEntry.m_block_count * BLOCK_SIZE)
-    return GCMemcardImportFileRetVal::LENGTHFAIL;
-  if (gci.Tell() != offset + DENTRY_SIZE)  // Verify correct file position
-    return GCMemcardImportFileRetVal::OPENFAIL;
-
-  u32 size = tempDEntry.m_block_count;
-  std::vector<GCMBlock> saveData;
-  saveData.reserve(size);
-
-  for (unsigned int i = 0; i < size; ++i)
-  {
-    GCMBlock b;
-    gci.ReadBytes(b.m_block.data(), b.m_block.size());
-    saveData.push_back(b);
-  }
-  return ImportFile(tempDEntry, saveData);
-}
-
-GCMemcardExportFileRetVal GCMemcard::ExportGci(u8 index, const std::string& fileName,
-                                               const std::string& directory) const
-{
-  File::IOFile gci;
-  int offset = GCI;
-
-  if (!fileName.length())
-  {
-    std::string gciFilename;
-    // GCI_FileName should only fail if the gamecode is 0xFFFFFFFF
-    if (!GCI_FileName(index, gciFilename))
-      return GCMemcardExportFileRetVal::SUCCESS;
-    gci.Open(directory + DIR_SEP + gciFilename, "wb");
-  }
-  else
-  {
-    std::string fileType;
-    gci.Open(fileName, "wb");
-    SplitPath(fileName, nullptr, nullptr, &fileType);
-    if (!strcasecmp(fileType.c_str(), ".gcs"))
-    {
-      offset = GCS;
-    }
-    else if (!strcasecmp(fileType.c_str(), ".sav"))
-    {
-      offset = SAV;
-    }
-  }
-
-  if (!gci)
-    return GCMemcardExportFileRetVal::OPENFAIL;
-
-  gci.Seek(0, SEEK_SET);
-
-  switch (offset)
-  {
-  case GCS:
-    u8 gcsHDR[GCS];
-    memset(gcsHDR, 0, GCS);
-    memcpy(gcsHDR, "GCSAVE", 6);
-    gci.WriteArray(gcsHDR, GCS);
-    break;
-
-  case SAV:
-    u8 savHDR[SAV];
-    memset(savHDR, 0, SAV);
-    memcpy(savHDR, "DATELGC_SAVE", 0xC);
-    gci.WriteArray(savHDR, SAV);
-    break;
-  }
-
-  std::optional<DEntry> tempDEntry = GetDEntry(index);
-  if (!tempDEntry)
-    return GCMemcardExportFileRetVal::NOMEMCARD;
-
-  Gcs_SavConvert(*tempDEntry, offset);
-  gci.WriteBytes(&tempDEntry.value(), DENTRY_SIZE);
-
-  u32 size = DEntry_BlockCount(index);
-  if (size == 0xFFFF)
-  {
-    return GCMemcardExportFileRetVal::FAIL;
-  }
-
-  std::vector<GCMBlock> saveData;
-  saveData.reserve(size);
-
-  switch (GetSaveData(index, saveData))
-  {
-  case GCMemcardGetSaveDataRetVal::FAIL:
-    return GCMemcardExportFileRetVal::FAIL;
-  case GCMemcardGetSaveDataRetVal::NOMEMCARD:
-    return GCMemcardExportFileRetVal::NOMEMCARD;
-  case GCMemcardGetSaveDataRetVal::SUCCESS:
-    break;
-  }
-  gci.Seek(DENTRY_SIZE + offset, SEEK_SET);
-  for (unsigned int i = 0; i < size; ++i)
-  {
-    gci.WriteBytes(saveData[i].m_block.data(), saveData[i].m_block.size());
-  }
-
-  if (gci.IsGood())
-    return GCMemcardExportFileRetVal::SUCCESS;
-  else
-    return GCMemcardExportFileRetVal::WRITEFAIL;
-}
-
-void GCMemcard::Gcs_SavConvert(DEntry& tempDEntry, int saveType, u64 length)
-{
-  switch (saveType)
-  {
-  case GCS:
-  {
-    // field containing the Block count as displayed within
-    // the GameSaves software is not stored in the GCS file.
-    // It is stored only within the corresponding GSV file.
-    // If the GCS file is added without using the GameSaves software,
-    // the value stored is always "1"
-    tempDEntry.m_block_count = length / BLOCK_SIZE;
-  }
-  break;
-  case SAV:
-    // swap byte pairs
-    // 0x2C and 0x2D, 0x2E and 0x2F, 0x30 and 0x31, 0x32 and 0x33,
-    // 0x34 and 0x35, 0x36 and 0x37, 0x38 and 0x39, 0x3A and 0x3B,
-    // 0x3C and 0x3D,0x3E and 0x3F.
-    // It seems that sav files also swap the banner/icon flags...
-    std::swap(tempDEntry.m_unused_1, tempDEntry.m_banner_and_icon_flags);
-
-    std::array<u8, 4> tmp;
-    std::memcpy(tmp.data(), &tempDEntry.m_image_offset, 4);
-    std::swap(tmp[0], tmp[1]);
-    std::swap(tmp[2], tmp[3]);
-    std::memcpy(&tempDEntry.m_image_offset, tmp.data(), 4);
-
-    std::memcpy(tmp.data(), &tempDEntry.m_icon_format, 2);
-    std::swap(tmp[0], tmp[1]);
-    std::memcpy(&tempDEntry.m_icon_format, tmp.data(), 2);
-
-    std::memcpy(tmp.data(), &tempDEntry.m_animation_speed, 2);
-    std::swap(tmp[0], tmp[1]);
-    std::memcpy(&tempDEntry.m_animation_speed, tmp.data(), 2);
-
-    std::swap(tempDEntry.m_file_permissions, tempDEntry.m_copy_counter);
-
-    std::memcpy(tmp.data(), &tempDEntry.m_first_block, 2);
-    std::swap(tmp[0], tmp[1]);
-    std::memcpy(&tempDEntry.m_first_block, tmp.data(), 2);
-
-    std::memcpy(tmp.data(), &tempDEntry.m_block_count, 2);
-    std::swap(tmp[0], tmp[1]);
-    std::memcpy(&tempDEntry.m_block_count, tmp.data(), 2);
-
-    std::swap(tempDEntry.m_unused_2[0], tempDEntry.m_unused_2[1]);
-
-    std::memcpy(tmp.data(), &tempDEntry.m_comments_address, 4);
-    std::swap(tmp[0], tmp[1]);
-    std::swap(tmp[2], tmp[3]);
-    std::memcpy(&tempDEntry.m_comments_address, tmp.data(), 4);
-    break;
-  default:
-    break;
-  }
-}
-
 std::optional<std::vector<u32>> GCMemcard::ReadBannerRGBA8(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 5c2d431123..ca8c709716 100644
--- a/Source/Core/Core/HW/GCMemcard/GCMemcard.h
+++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.h
@@ -30,9 +30,6 @@ enum
 {
   SLOT_A = 0,
   SLOT_B = 1,
-  GCI = 0,
-  SAV = 0x80,
-  GCS = 0x110,
 };
 
 enum class GCMemcardGetSaveDataRetVal
@@ -45,26 +42,10 @@ enum class GCMemcardGetSaveDataRetVal
 enum class GCMemcardImportFileRetVal
 {
   SUCCESS,
-  FAIL,
   NOMEMCARD,
   OUTOFDIRENTRIES,
   OUTOFBLOCKS,
   TITLEPRESENT,
-  INVALIDFILESIZE,
-  GCSFAIL,
-  SAVFAIL,
-  OPENFAIL,
-  LENGTHFAIL,
-};
-
-enum class GCMemcardExportFileRetVal
-{
-  SUCCESS,
-  FAIL,
-  NOMEMCARD,
-  OPENFAIL,
-  WRITEFAIL,
-  UNUSED,
 };
 
 enum class GCMemcardRemoveFileRetVal
@@ -425,8 +406,6 @@ private:
 
   GCMemcard();
 
-  GCMemcardImportFileRetVal ImportGciInternal(File::IOFile&& gci, const std::string& inputFile);
-
   const Directory& GetActiveDirectory() const;
   const BlockAlloc& GetActiveBat() const;
 
@@ -511,20 +490,6 @@ public:
   // delete a file from the directory
   GCMemcardRemoveFileRetVal RemoveFile(u8 index);
 
-  // reads a save from another memcard, and imports the data into this memcard
-  GCMemcardImportFileRetVal CopyFrom(const GCMemcard& source, u8 index);
-
-  // reads a .gci/.gcs/.sav file and calls ImportFile
-  GCMemcardImportFileRetVal ImportGci(const std::string& inputFile);
-
-  // writes a .gci file to disk containing index
-  GCMemcardExportFileRetVal ExportGci(u8 index, const std::string& fileName,
-                                      const std::string& directory) const;
-
-  // GCI files are untouched, SAV files are byteswapped
-  // GCS files have the block count set, default is 1 (For export as GCS)
-  static void Gcs_SavConvert(DEntry& tempDEntry, int saveType, u64 length = BLOCK_SIZE);
-
   // reads the banner image
   std::optional<std::vector<u32>> ReadBannerRGBA8(u8 index) const;