Support 2nd Disk][ card and improved card management (#726) (PR #741)

Support 2nd Disk][ in slot-5, via command line: - -s5 diskii - -s5d1 \<imagefile\> - -s5d2 \<imagefile\> NB. there's currently no Configuration UI support, except the Drive icons' tooltips show what's in slot-5 & slot-6 (for drive-n). So there's no way to eject the disks or insert new disks. The use-case I'm supporting it Wasteland which just has the 4 disks in the 4 drives. Improved card management: - Added `class Card` (in Card.h) which all other cards (that exist as classes) derive from (eg. LC,SSC,Mouse,Disk2). - Added `class CardManager` (in CardManager.cpp\h) which now manages the 8 slots (and aux slot). - Added `class Disk2CardManager` (in Disk2CardManager.cpp\h) which provides methods for operations that act on all Disk2 instances at the same time. - Currently limited to just 1x SSC and 1x Mouse card (why would you need more?). This simplifies things, meaning there's no need to have dedicated SSCManager / MouseCardManager objects. - Currently the 2nd Disk2 card can only be put into slot-5. This limitation is just due to the complexity of the Configuration UI. Having a more general drop-down per slot UI would remove this limitation.
2026-04-25 03:17:53 +00:00 · 2019-12-19 19:42:30 +00:00
parent d2010860ef
commit 769d4c6927
41 changed files with 1169 additions and 418 deletions
@@ -0,0 +1,155 @@
+/*
+AppleWin : An Apple //e emulator for Windows
+
+Copyright (C) 1994-1996, Michael O'Brien
+Copyright (C) 1999-2001, Oliver Schmidt
+Copyright (C) 2002-2005, Tom Charlesworth
+Copyright (C) 2006-2019, Tom Charlesworth, Michael Pohoreski, Nick Westgate
+
+AppleWin is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+AppleWin is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with AppleWin; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/* Description: Card Manager
+ *
+ * Author: Various
+ *
+ */
+
+#include "StdAfx.h"
+
+#include "AppleWin.h"
+#include "CardManager.h"
+
+#include "Disk.h"
+#include "MouseInterface.h"
+#include "SerialComms.h"
+
+void CardManager::Insert(UINT slot, SS_CARDTYPE type)
+{
+	if (type == CT_Empty)
+		return Remove(slot);
+
+	RemoveInternal(slot);
+
+	switch (type)
+	{
+	case CT_Disk2:
+		m_slot[slot] = new Disk2InterfaceCard;
+		break;
+	case CT_SSC:
+		_ASSERT(m_pSSC == NULL);
+		if (m_pSSC) break;	// Only support one SSC
+		m_slot[slot] = m_pSSC = new CSuperSerialCard;
+		break;
+	case CT_MockingboardC:
+		m_slot[slot] = new DummyCard(type);
+		break;
+	case CT_GenericPrinter:
+		m_slot[slot] = new DummyCard(type);
+		break;
+	case CT_GenericHDD:
+		m_slot[slot] = new DummyCard(type);
+		break;
+	case CT_GenericClock:
+		m_slot[slot] = new DummyCard(type);
+		break;
+	case CT_MouseInterface:
+		_ASSERT(m_pMouseCard == NULL);
+		if (m_pMouseCard) break;	// Only support one Mouse card
+		m_slot[slot] = m_pMouseCard = new CMouseInterface(slot);
+		break;
+	case CT_Z80:
+		m_slot[slot] = new DummyCard(type);
+		break;
+	case CT_Phasor:
+		m_slot[slot] = new DummyCard(type);
+		break;
+	case CT_Echo:
+		m_slot[slot] = new DummyCard(type);
+		break;
+	case CT_SAM:
+		m_slot[slot] = new DummyCard(type);
+		break;
+	case CT_Uthernet:
+		m_slot[slot] = new DummyCard(type);
+		break;
+
+	case CT_LanguageCard:
+	case CT_Saturn128K:
+		{
+			if (slot != 0)
+			{
+				_ASSERT(0);
+				break;
+			}
+		}
+		m_slot[slot] = new DummyCard(type);
+		break;
+
+	case CT_LanguageCardIIe:	// not a card
+	default:
+		_ASSERT(0);
+		break;
+	}
+
+	if (m_slot[slot] == NULL)
+		m_slot[slot] = new EmptyCard;
+}
+
+void CardManager::RemoveInternal(UINT slot)
+{
+	if (m_slot[slot] && m_slot[slot]->QueryType() == CT_MouseInterface)
+		m_pMouseCard = NULL;
+
+	if (m_slot[slot] && m_slot[slot]->QueryType() == CT_SSC)
+		m_pSSC = NULL;
+
+	delete m_slot[slot];
+	m_slot[slot] = NULL;
+}
+
+void CardManager::Remove(UINT slot)
+{
+	RemoveInternal(slot);
+	m_slot[slot] = new EmptyCard;
+}
+
+void CardManager::InsertAux(SS_CARDTYPE type)
+{
+	if (type == CT_Empty)
+		return RemoveAux();
+
+	switch (type)
+	{
+	case CT_80Col:
+		m_aux = new DummyCard(type);
+		break;
+	case CT_Extended80Col:
+		m_aux = new DummyCard(type);
+		break;
+	case CT_RamWorksIII:
+		m_aux = new DummyCard(type);
+		break;
+	default:
+		_ASSERT(0);
+		break;
+	}
+}
+
+void CardManager::RemoveAux(void)
+{
+	delete m_aux;
+	m_aux = new EmptyCard;
+}