Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-12-28 17:30:02 +00:00
Code Issues Projects Releases Wiki Activity

Refactor: move m_slot into Card class

Browse Source
This commit is contained in:
tomcw 2021-11-01 21:01:28 +00:00
parent 67b3c28833
commit d96ed5b8c5
14 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/Card.h
View File

@ -30,14 +30,17 @@ enum SLOTS { SLOT0=0, SLOT1, SLOT2, SLOT3, SLOT4, SLOT5, SLOT6, SLOT7, NUM_SLOTS
class Card class Card
{ {
public: public:
Card(void) : m_type(CT_Empty) {} Card(void) : m_type(CT_Empty), m_slot(SLOT0) {}
Card(SS_CARDTYPE type) : m_type(type) {} Card(SS_CARDTYPE type, UINT slot) : m_type(type), m_slot(slot) {}
virtual ~Card(void) {} virtual ~Card(void) {}
virtual void Init(void) = 0; virtual void Init(void) = 0;
virtual void Reset(const bool powerCycle) = 0; virtual void Reset(const bool powerCycle) = 0;
SS_CARDTYPE QueryType(void) { return m_type; } SS_CARDTYPE QueryType(void) { return m_type; }
protected:
UINT m_slot;
private: private:
SS_CARDTYPE m_type; SS_CARDTYPE m_type;
}; };
@ -59,7 +62,7 @@ public:
class DummyCard : public Card // For cards that currently can't be instantiated (ie. don't exist as a class) class DummyCard : public Card // For cards that currently can't be instantiated (ie. don't exist as a class)
{ {
public: public:
DummyCard(SS_CARDTYPE type) : Card(type) {} DummyCard(SS_CARDTYPE type, UINT slot) : Card(type, slot) {}
virtual ~DummyCard(void) {} virtual ~DummyCard(void) {}
virtual void Init(void) {}; virtual void Init(void) {};

22
source/CardManager.cpp
View File

@ -59,16 +59,16 @@ void CardManager::InsertInternal(UINT slot, SS_CARDTYPE type)
m_slot[slot] = m_pSSC = new CSuperSerialCard(slot); m_slot[slot] = m_pSSC = new CSuperSerialCard(slot);
break; break;
case CT_MockingboardC: case CT_MockingboardC:
m_slot[slot] = new DummyCard(type); m_slot[slot] = new DummyCard(type, slot);
break; break;
case CT_GenericPrinter: case CT_GenericPrinter:
m_slot[slot] = new DummyCard(type); m_slot[slot] = new DummyCard(type, slot);
break; break;
case CT_GenericHDD: case CT_GenericHDD:
m_slot[slot] = new HarddiskInterfaceCard(slot); m_slot[slot] = new HarddiskInterfaceCard(slot);
break; break;
case CT_GenericClock: case CT_GenericClock:
m_slot[slot] = new DummyCard(type); m_slot[slot] = new DummyCard(type, slot);
break; break;
case CT_MouseInterface: case CT_MouseInterface:
_ASSERT(m_pMouseCard == NULL); _ASSERT(m_pMouseCard == NULL);
@ -76,19 +76,19 @@ void CardManager::InsertInternal(UINT slot, SS_CARDTYPE type)
m_slot[slot] = m_pMouseCard = new CMouseInterface(slot); m_slot[slot] = m_pMouseCard = new CMouseInterface(slot);
break; break;
case CT_Z80: case CT_Z80:
m_slot[slot] = new DummyCard(type); m_slot[slot] = new DummyCard(type, slot);
break; break;
case CT_Phasor: case CT_Phasor:
m_slot[slot] = new DummyCard(type); m_slot[slot] = new DummyCard(type, slot);
break; break;
case CT_Echo: case CT_Echo:
m_slot[slot] = new DummyCard(type); m_slot[slot] = new DummyCard(type, slot);
break; break;
case CT_SAM: case CT_SAM:
m_slot[slot] = new SAMCard(slot); m_slot[slot] = new SAMCard(slot);
break; break;
case CT_Uthernet: case CT_Uthernet:
m_slot[slot] = new DummyCard(type); m_slot[slot] = new DummyCard(type, slot);
break; break;
case CT_FourPlay: case CT_FourPlay:
m_slot[slot] = new FourPlayCard(slot); m_slot[slot] = new FourPlayCard(slot);
@ -106,7 +106,7 @@ void CardManager::InsertInternal(UINT slot, SS_CARDTYPE type)
break; break;
} }
} }
m_slot[slot] = new DummyCard(type); m_slot[slot] = new DummyCard(type, slot);
break; break;
case CT_LanguageCardIIe: // not a card case CT_LanguageCardIIe: // not a card
@ -153,13 +153,13 @@ void CardManager::InsertAuxInternal(SS_CARDTYPE type)
m_aux = new EmptyCard; m_aux = new EmptyCard;
break; break;
case CT_80Col: case CT_80Col:
m_aux = new DummyCard(type); m_aux = new DummyCard(type, SLOT_AUX);
break; break;
case CT_Extended80Col: case CT_Extended80Col:
m_aux = new DummyCard(type); m_aux = new DummyCard(type, SLOT_AUX);
break; break;
case CT_RamWorksIII: case CT_RamWorksIII:
m_aux = new DummyCard(type); m_aux = new DummyCard(type, SLOT_AUX);
break; break;
default: default:
_ASSERT(0); _ASSERT(0);

3
source/Disk.cpp
View File

@ -58,8 +58,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
const BYTE Disk2InterfaceCard::m_T00S00Pattern[] = {0xD5,0xAA,0x96,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xDE}; const BYTE Disk2InterfaceCard::m_T00S00Pattern[] = {0xD5,0xAA,0x96,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xDE};
Disk2InterfaceCard::Disk2InterfaceCard(UINT slot) : Disk2InterfaceCard::Disk2InterfaceCard(UINT slot) :
Card(CT_Disk2), Card(CT_Disk2, slot)
m_slot(slot)
{ {
ResetSwitches(); ResetSwitches();

1
source/Disk.h
View File

@ -246,7 +246,6 @@ private:
WORD m_magnetStates; // state bits for stepper motor magnet states (phases 0 - 3) WORD m_magnetStates; // state bits for stepper motor magnet states (phases 0 - 3)
bool m_saveDiskImage; bool m_saveDiskImage;
UINT m_slot;
unsigned __int64 m_diskLastCycle; unsigned __int64 m_diskLastCycle;
unsigned __int64 m_diskLastReadLatchCycle; unsigned __int64 m_diskLastReadLatchCycle;
FormatTrack m_formatTrack; FormatTrack m_formatTrack;

5
source/FourPlay.h
View File

@ -6,8 +6,7 @@ class FourPlayCard : public Card
{ {
public: public:
FourPlayCard(UINT slot) : FourPlayCard(UINT slot) :
Card(CT_FourPlay), Card(CT_FourPlay, slot)
m_slot(slot)
{ {
} }
virtual ~FourPlayCard(void) {} virtual ~FourPlayCard(void) {}
@ -27,6 +26,4 @@ public:
private: private:
static BYTE MyGetAsyncKeyState(int vKey); static BYTE MyGetAsyncKeyState(int vKey);
UINT m_slot;
}; };

3
source/Harddisk.cpp
View File

@ -117,8 +117,7 @@ Overview
HarddiskInterfaceCard::HarddiskInterfaceCard(UINT slot) : HarddiskInterfaceCard::HarddiskInterfaceCard(UINT slot) :
Card(CT_GenericHDD), Card(CT_GenericHDD, slot)
m_slot(slot)
{ {
m_unitNum = HARDDISK_1 << 7; // b7=unit m_unitNum = HARDDISK_1 << 7; // b7=unit

1
source/Harddisk.h
View File

@ -127,7 +127,6 @@ private:
BYTE m_command; BYTE m_command;
bool m_saveDiskImage; // Save the DiskImage name to Registry bool m_saveDiskImage; // Save the DiskImage name to Registry
UINT m_slot;
HardDiskDrive m_hardDiskDrive[NUM_HARDDISKS]; HardDiskDrive m_hardDiskDrive[NUM_HARDDISKS];
}; };

2
source/LanguageCard.cpp
View File

@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
const UINT LanguageCardUnit::kMemModeInitialState = MF_BANK2 | MF_WRITERAM; // !INTCXROM const UINT LanguageCardUnit::kMemModeInitialState = MF_BANK2 | MF_WRITERAM; // !INTCXROM
LanguageCardUnit::LanguageCardUnit(SS_CARDTYPE type/*=CT_LanguageCardIIe*/) : LanguageCardUnit::LanguageCardUnit(SS_CARDTYPE type/*=CT_LanguageCardIIe*/) :
Card(type), Card(type, kSlot0),
m_uLastRamWrite(0) m_uLastRamWrite(0)
{ {
SetMemMainLanguageCard(NULL, true); SetMemMainLanguageCard(NULL, true);

11
source/MouseInterface.cpp
View File

@ -134,9 +134,8 @@ void M6821_Listener_A( void* objTo, BYTE byData )
//=========================================================================== //===========================================================================
CMouseInterface::CMouseInterface(UINT slot) : CMouseInterface::CMouseInterface(UINT slot) :
Card(CT_MouseInterface), Card(CT_MouseInterface, slot),
m_pSlotRom(NULL), m_pSlotRom(NULL),
m_uSlot(slot),
m_syncEvent(slot, 0, SyncEventCallback) // use slot# as "unique" id for MouseInterfaces m_syncEvent(slot, 0, SyncEventCallback) // use slot# as "unique" id for MouseInterfaces
{ {
m_6821.SetListenerB( this, M6821_Listener_B ); m_6821.SetListenerB( this, M6821_Listener_B );
@ -177,7 +176,7 @@ void CMouseInterface::InitializeIO(LPBYTE pCxRomPeripheral)
// m_bActive = true; // m_bActive = true;
m_bEnabled = true; m_bEnabled = true;
SetSlotRom(); // Pre: m_bActive == true SetSlotRom(); // Pre: m_bActive == true
RegisterIoHandler(m_uSlot, &CMouseInterface::IORead, &CMouseInterface::IOWrite, NULL, NULL, this, NULL); RegisterIoHandler(m_slot, &CMouseInterface::IORead, &CMouseInterface::IOWrite, NULL, NULL, this, NULL);
if (m_syncEvent.m_active) g_SynchronousEventMgr.Remove(m_syncEvent.m_id); if (m_syncEvent.m_active) g_SynchronousEventMgr.Remove(m_syncEvent.m_id);
m_syncEvent.m_cyclesRemaining = NTSC_GetCyclesUntilVBlank(0); m_syncEvent.m_cyclesRemaining = NTSC_GetCyclesUntilVBlank(0);
@ -233,9 +232,9 @@ void CMouseInterface::SetSlotRom()
return; return;
UINT uOffset = (m_by6821B << 7) & 0x0700; UINT uOffset = (m_by6821B << 7) & 0x0700;
memcpy(pCxRomPeripheral+m_uSlot*256, m_pSlotRom+uOffset, 256); memcpy(pCxRomPeripheral+m_slot*256, m_pSlotRom+uOffset, 256);
if (mem) if (mem)
memcpy(mem+0xC000+m_uSlot*256, m_pSlotRom+uOffset, 256); memcpy(mem+0xC000+m_slot*256, m_pSlotRom+uOffset, 256);
} }
//=========================================================================== //===========================================================================
@ -657,7 +656,7 @@ void CMouseInterface::SaveSnapshot(class YamlSaveHelper& yamlSaveHelper)
// if (!m_bActive) // if (!m_bActive)
// return; // return;
YamlSaveHelper::Slot slot(yamlSaveHelper, GetSnapshotCardName(), m_uSlot, 1); YamlSaveHelper::Slot slot(yamlSaveHelper, GetSnapshotCardName(), m_slot, 1);
YamlSaveHelper::Label state(yamlSaveHelper, "%s:\n", SS_YAML_KEY_STATE); YamlSaveHelper::Label state(yamlSaveHelper, "%s:\n", SS_YAML_KEY_STATE);
SaveSnapshotMC6821(yamlSaveHelper, SS_YAML_KEY_MC6821); SaveSnapshotMC6821(yamlSaveHelper, SS_YAML_KEY_MC6821);

3
source/MouseInterface.h
View File

@ -17,7 +17,7 @@ public:
void InitializeIO(LPBYTE pCxRomPeripheral); void InitializeIO(LPBYTE pCxRomPeripheral);
// void Uninitialize(); // void Uninitialize();
void Reset(); void Reset();
UINT GetSlot(void) { return m_uSlot; } UINT GetSlot(void) { return m_slot; }
static BYTE __stdcall IORead(WORD PC, WORD uAddr, BYTE bWrite, BYTE uValue, ULONG nExecutedCycles); static BYTE __stdcall IORead(WORD PC, WORD uAddr, BYTE bWrite, BYTE uValue, ULONG nExecutedCycles);
static BYTE __stdcall IOWrite(WORD PC, WORD uAddr, BYTE bWrite, BYTE uValue, ULONG nExecutedCycles); static BYTE __stdcall IOWrite(WORD PC, WORD uAddr, BYTE bWrite, BYTE uValue, ULONG nExecutedCycles);
@ -106,7 +106,6 @@ protected:
// bool m_bActive; // Mouse h/w is active within the Apple][ VM // bool m_bActive; // Mouse h/w is active within the Apple][ VM
bool m_bEnabled; // Windows' mouse events get passed to Apple]['s mouse h/w (m_bEnabled == true implies that m_bActive == true) bool m_bEnabled; // Windows' mouse events get passed to Apple]['s mouse h/w (m_bEnabled == true implies that m_bActive == true)
LPBYTE m_pSlotRom; LPBYTE m_pSlotRom;
UINT m_uSlot;
SyncEvent m_syncEvent; SyncEvent m_syncEvent;
}; };

5
source/SAM.h
View File

@ -6,8 +6,7 @@ class SAMCard : public Card
{ {
public: public:
SAMCard(UINT slot) : SAMCard(UINT slot) :
Card(CT_SAM), Card(CT_SAM, slot)
m_slot(slot)
{ {
} }
virtual ~SAMCard(void) {} virtual ~SAMCard(void) {}
@ -24,5 +23,5 @@ public:
bool LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version); bool LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version);
private: private:
UINT m_slot; // no state
}; };

5
source/SNESMAX.h
View File

@ -7,8 +7,7 @@ class SNESMAXCard : public Card
{ {
public: public:
SNESMAXCard(UINT slot) : SNESMAXCard(UINT slot) :
Card(CT_SNESMAX), Card(CT_SNESMAX, slot)
m_slot(slot)
{ {
m_buttonIndex = 0; m_buttonIndex = 0;
m_controller1Buttons = 0; m_controller1Buttons = 0;
@ -32,8 +31,6 @@ public:
bool LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version); bool LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version);
private: private:
UINT m_slot;
UINT m_buttonIndex; UINT m_buttonIndex;
UINT m_controller1Buttons; UINT m_controller1Buttons;
UINT m_controller2Buttons; UINT m_controller2Buttons;

13
source/SerialComms.cpp
View File

@ -65,8 +65,7 @@ SSC_DIPSW CSuperSerialCard::m_DIPSWDefault =
//=========================================================================== //===========================================================================
CSuperSerialCard::CSuperSerialCard(UINT slot) : CSuperSerialCard::CSuperSerialCard(UINT slot) :
Card(CT_SSC), Card(CT_SSC, slot),
m_uSlot(slot),
m_aySerialPortChoices(NULL), m_aySerialPortChoices(NULL),
m_uTCPChoiceItemIdx(0), m_uTCPChoiceItemIdx(0),
m_bCfgSupportDCD(false), m_bCfgSupportDCD(false),
@ -90,7 +89,7 @@ CSuperSerialCard::CSuperSerialCard(UINT slot) :
// //
char serialPortName[CSuperSerialCard::SIZEOF_SERIALCHOICE_ITEM]; char serialPortName[CSuperSerialCard::SIZEOF_SERIALCHOICE_ITEM];
std::string& regSection = RegGetConfigSlotSection(m_uSlot); std::string& regSection = RegGetConfigSlotSection(m_slot);
RegLoadString(regSection.c_str(), REGVALUE_SERIAL_PORT_NAME, TRUE, serialPortName, sizeof(serialPortName), TEXT("")); RegLoadString(regSection.c_str(), REGVALUE_SERIAL_PORT_NAME, TRUE, serialPortName, sizeof(serialPortName), TEXT(""));
SetSerialPortName(serialPortName); SetSerialPortName(serialPortName);
@ -952,7 +951,7 @@ void CSuperSerialCard::InitializeIO(LPBYTE pCxRomPeripheral)
if(pData == NULL) if(pData == NULL)
return; return;
memcpy(pCxRomPeripheral + m_uSlot*SSC_SLOT_FW_SIZE, pData+SSC_SLOT_FW_OFFSET, SSC_SLOT_FW_SIZE); memcpy(pCxRomPeripheral + m_slot*SSC_SLOT_FW_SIZE, pData+SSC_SLOT_FW_OFFSET, SSC_SLOT_FW_SIZE);
// Expansion ROM // Expansion ROM
if (m_pExpansionRom == NULL) if (m_pExpansionRom == NULL)
@ -965,7 +964,7 @@ void CSuperSerialCard::InitializeIO(LPBYTE pCxRomPeripheral)
// //
RegisterIoHandler(m_uSlot, &CSuperSerialCard::SSC_IORead, &CSuperSerialCard::SSC_IOWrite, NULL, NULL, this, m_pExpansionRom); RegisterIoHandler(m_slot, &CSuperSerialCard::SSC_IORead, &CSuperSerialCard::SSC_IOWrite, NULL, NULL, this, m_pExpansionRom);
} }
//=========================================================================== //===========================================================================
@ -1393,7 +1392,7 @@ void CSuperSerialCard::SetSerialPortName(const char* pSerialPortName)
void CSuperSerialCard::SetRegistrySerialPortName(void) void CSuperSerialCard::SetRegistrySerialPortName(void)
{ {
std::string& regSection = RegGetConfigSlotSection(m_uSlot); std::string& regSection = RegGetConfigSlotSection(m_slot);
RegSaveString(regSection.c_str(), REGVALUE_SERIAL_PORT_NAME, TRUE, GetSerialPortName()); RegSaveString(regSection.c_str(), REGVALUE_SERIAL_PORT_NAME, TRUE, GetSerialPortName());
} }
@ -1447,7 +1446,7 @@ void CSuperSerialCard::SaveSnapshotDIPSW(YamlSaveHelper& yamlSaveHelper, std::st
void CSuperSerialCard::SaveSnapshot(YamlSaveHelper& yamlSaveHelper) void CSuperSerialCard::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)
{ {
YamlSaveHelper::Slot slot(yamlSaveHelper, GetSnapshotCardName(), m_uSlot, kUNIT_VERSION); YamlSaveHelper::Slot slot(yamlSaveHelper, GetSnapshotCardName(), m_slot, kUNIT_VERSION);
YamlSaveHelper::Label unit(yamlSaveHelper, "%s:\n", SS_YAML_KEY_STATE); YamlSaveHelper::Label unit(yamlSaveHelper, "%s:\n", SS_YAML_KEY_STATE);
SaveSnapshotDIPSW(yamlSaveHelper, SS_YAML_KEY_DIPSWDEFAULT, m_DIPSWDefault); SaveSnapshotDIPSW(yamlSaveHelper, SS_YAML_KEY_DIPSWDEFAULT, m_DIPSWDefault);

1
source/SerialComms.h
View File

@ -141,7 +141,6 @@ private:
OVERLAPPED m_o; OVERLAPPED m_o;
BYTE* m_pExpansionRom; BYTE* m_pExpansionRom;
UINT m_uSlot;
bool m_bCfgSupportDCD; bool m_bCfgSupportDCD;
UINT m_uDTR; UINT m_uDTR;