empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update from AW's master.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2022-03-12 14:22:03 +00:00
parent de2071476e
commit 27904182c4
2 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/linux/context.cpp
View file

@ -123,11 +123,7 @@ void InitialiseEmulator()
MemInitialize();
CardManager & cardManager = GetCardMgr();
cardManager.GetDisk2CardMgr().Reset();
if (cardManager.QuerySlot(SLOT7) == CT_GenericHDD)
{
dynamic_cast<HarddiskInterfaceCard&>(cardManager.GetRef(SLOT7)).Reset(true);
}
cardManager.Reset(true);
Snapshot_Startup();
@ -137,39 +133,15 @@ void InitialiseEmulator()
void DestroyEmulator()
{
CardManager & cardManager = GetCardMgr();
cardManager.Destroy();
Snapshot_Shutdown();
CMouseInterface* pMouseCard = cardManager.GetMouseCard();
if (pMouseCard)
{
pMouseCard->Reset();
}
MemDestroy();
SpkrDestroy();
MB_Destroy();
DSUninit();
for (UINT i = 0; i < NUM_SLOTS; ++i)
{
switch (cardManager.QuerySlot(i))
{
case CT_GenericHDD:
dynamic_cast<HarddiskInterfaceCard&>(cardManager.GetRef(i)).Destroy();
break;
case CT_Uthernet:
dynamic_cast<Uthernet1&>(cardManager.GetRef(i)).Destroy();
break;
case CT_Uthernet2:
dynamic_cast<Uthernet2&>(cardManager.GetRef(i)).Destroy();
break;
}
}
PrintDestroy();
CpuDestroy();
DebugDestroy();
GetCardMgr().GetDisk2CardMgr().Destroy();
RiffFinishWriteFile();
}

2
source/linux/duplicates/SerialComms.cpp
View file

@ -18,7 +18,7 @@ void CSuperSerialCard::SetSerialPortName(const char* pSerialPortName)
{
}
void CSuperSerialCard::CommReset()
void CSuperSerialCard::Reset(const bool /* powerCycle */)
{
}