From 6e8881a426cb6e1372b281dd030f02fdf46d10ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 13 Feb 2021 16:56:29 +0100 Subject: [PATCH] IOS: Remove unnecessary and unused PrepareForState PrepareForState is now unnecessary with the new implementation of HostFileSystem::DoState, which does what the old implementation (CWII_IPC_HLE_Device_FileIO::PrepareForState) used to do. --- Source/Core/Core/IOS/Device.h | 2 -- Source/Core/Core/IOS/IOS.cpp | 8 -------- 2 files changed, 10 deletions(-) diff --git a/Source/Core/Core/IOS/Device.h b/Source/Core/Core/IOS/Device.h index 13f5ea7803..eb43472cfa 100644 --- a/Source/Core/Core/IOS/Device.h +++ b/Source/Core/Core/IOS/Device.h @@ -178,8 +178,6 @@ public: Device(Kernel& ios, const std::string& device_name, DeviceType type = DeviceType::Static); virtual ~Device() = default; - // Release any resources which might interfere with savestating. - virtual void PrepareForState(PointerWrap::Mode mode) {} virtual void DoState(PointerWrap& p); void DoStateShared(PointerWrap& p); diff --git a/Source/Core/Core/IOS/IOS.cpp b/Source/Core/Core/IOS/IOS.cpp index 61986a0593..7d2a362dbf 100644 --- a/Source/Core/Core/IOS/IOS.cpp +++ b/Source/Core/Core/IOS/IOS.cpp @@ -746,14 +746,6 @@ void Kernel::DoState(PointerWrap& p) if (m_title_id == Titles::MIOS) return; - // We need to make sure all file handles are closed so IOS::HLE::FSDevice::DoState can - // successfully save or re-create /tmp - for (auto& descriptor : m_fdmap) - { - if (descriptor) - descriptor->PrepareForState(p.GetMode()); - } - for (const auto& entry : m_device_map) entry.second->DoState(p);