CardManager: remove redundant calls. (PR #1179)
This commit is contained in:
parent
b2926390c8
commit
5dd14256c2
|
@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
#include "StdAfx.h"
|
#include "StdAfx.h"
|
||||||
|
|
||||||
#include "CardManager.h"
|
#include "CardManager.h"
|
||||||
#include "Core.h"
|
|
||||||
#include "Registry.h"
|
#include "Registry.h"
|
||||||
|
|
||||||
#include "Disk.h"
|
#include "Disk.h"
|
||||||
|
@ -251,8 +250,7 @@ void CardManager::Destroy()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GetCardMgr().GetDisk2CardMgr().Destroy();
|
GetMockingboardCardMgr().Destroy();
|
||||||
GetCardMgr().GetMockingboardCardMgr().Destroy();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CardManager::Reset(const bool powerCycle)
|
void CardManager::Reset(const bool powerCycle)
|
||||||
|
@ -265,7 +263,7 @@ void CardManager::Reset(const bool powerCycle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GetCardMgr().GetMockingboardCardMgr().Reset(powerCycle);
|
GetMockingboardCardMgr().Reset(powerCycle);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CardManager::Update(const ULONG nExecutedCycles)
|
void CardManager::Update(const ULONG nExecutedCycles)
|
||||||
|
@ -278,7 +276,7 @@ void CardManager::Update(const ULONG nExecutedCycles)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GetCardMgr().GetMockingboardCardMgr().Update(nExecutedCycles);
|
GetMockingboardCardMgr().Update(nExecutedCycles);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CardManager::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)
|
void CardManager::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)
|
||||||
|
|
|
@ -106,13 +106,6 @@ void Disk2CardManager::LoadLastDiskImage(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called by CardManager::Destroy()
|
|
||||||
void Disk2CardManager::Destroy(void)
|
|
||||||
{
|
|
||||||
// NB. All cards (including any Disk2 cards) have just been destroyed by CardManager
|
|
||||||
// - so nothing to do
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Disk2CardManager::IsAnyFirmware13Sector(void)
|
bool Disk2CardManager::IsAnyFirmware13Sector(void)
|
||||||
{
|
{
|
||||||
for (UINT i = 0; i < NUM_SLOTS; i++)
|
for (UINT i = 0; i < NUM_SLOTS; i++)
|
||||||
|
|
|
@ -12,7 +12,6 @@ public:
|
||||||
bool GetEnhanceDisk(void);
|
bool GetEnhanceDisk(void);
|
||||||
void SetEnhanceDisk(bool enhanceDisk);
|
void SetEnhanceDisk(bool enhanceDisk);
|
||||||
void LoadLastDiskImage(void);
|
void LoadLastDiskImage(void);
|
||||||
void Destroy(void);
|
|
||||||
bool IsAnyFirmware13Sector(void);
|
bool IsAnyFirmware13Sector(void);
|
||||||
void GetFilenameAndPathForSaveState(std::string& filename, std::string& path);
|
void GetFilenameAndPathForSaveState(std::string& filename, std::string& path);
|
||||||
void SetStepperDefer(bool defer);
|
void SetStepperDefer(bool defer);
|
||||||
|
|
Loading…
Reference in New Issue