Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-01 14:41:33 +00:00
Code Issues Projects Releases Wiki Activity

WOZ: support Sequencer Function

Browse Source
This commit is contained in:
tomcw 2019-09-30 21:29:58 +01:00
parent 5e98140da1
commit 31f7e7296b
2 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source/Disk.cpp
View File

@ -1149,6 +1149,9 @@ void Disk2InterfaceCard::DataLatchReadWOZ(WORD pc, WORD addr, UINT bitCellRemain
continue;
}
if (m_seqFunc != readSequencing)
continue;
//
m_shiftReg <<= 1;
@ -1395,6 +1398,7 @@ void Disk2InterfaceCard::ResetSwitches(void)
m_floppyLoadMode = 0;
m_floppyWriteMode = 0;
m_magnetStates = 0;
m_seqFunc = readSequencing;
}
//===========================================================================
@ -1459,19 +1463,17 @@ void __stdcall Disk2InterfaceCard::LoadWriteProtect(WORD, WORD, BYTE write, BYTE
if (!m_floppyDrive[m_currDrive].m_spinning) // GH#599
return;
if (!write)
{
// Notes:
// . Phase 1 on also forces write protect in the Disk II drive (UTAIIe page 9-7) but we don't implement that
// . write mode doesn't prevent reading write protect (GH#537):
// "If for some reason the above write protect check were entered with the READ/WRITE switch in WRITE,
// the write protect switch would still be read correctly" (UTAIIe page 9-21)
// . Sequencer "SR" (Shift Right) command only loads QA (bit7) of data register (UTAIIe page 9-21)
if (m_floppyDrive[m_currDrive].m_disk.m_bWriteProtected)
m_floppyLatch |= 0x80;
else
m_floppyLatch &= 0x7F;
}
// Notes:
// . Phase 1 on also forces write protect in the Disk II drive (UTAIIe page 9-7) but we don't implement that.
// . write mode doesn't prevent reading write protect (GH#537):
// "If for some reason the above write protect check were entered with the READ/WRITE switch in WRITE,
// the write protect switch would still be read correctly" (UTAIIe page 9-21)
// . Sequencer "SR" (Shift Right) command only loads QA (bit7) of data register (UTAIIe page 9-21)
// . A read or write will read write protect in QA.
if (m_floppyDrive[m_currDrive].m_disk.m_bWriteProtected)
m_floppyLatch |= 0x80;
else
m_floppyLatch &= 0x7F;
if (ImageIsWOZ(m_floppyDrive[m_currDrive].m_disk.m_imagehandle))
{
@ -1648,6 +1650,24 @@ void Disk2InterfaceCard::Initialize(LPBYTE pCxRomPeripheral, UINT uSlot)
//===========================================================================
void Disk2InterfaceCard::SetSequencerFunction(WORD addr)
{
if ((addr & 0xf) < 0xc)
return;
UINT A3A2 = m_seqFunc;
switch (addr & 3)
{
case 0: A3A2 &= ~(1<<0); break; // $C08E,X (sequence addr A3 input)
case 1: A3A2 |= (1<<0); break; // $C08F,X (sequence addr A3 input)
case 2: A3A2 &= ~(1<<1); break; // $C08C,X (sequence addr A2 input)
case 3: A3A2 |= (1<<1); break; // $C08D,X (sequence addr A2 input)
}
m_seqFunc = (SEQFUNC) A3A2;
}
BYTE __stdcall Disk2InterfaceCard::IORead(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG nExecutedCycles)
{
UINT uSlot = ((addr & 0xff) >> 4) - 8;
@ -1656,6 +1676,8 @@ BYTE __stdcall Disk2InterfaceCard::IORead(WORD pc, WORD addr, BYTE bWrite, BYTE
ImageInfo* pImage = pCard->m_floppyDrive[pCard->m_currDrive].m_disk.m_imagehandle;
bool isWOZ = ImageIsWOZ(pImage);
pCard->SetSequencerFunction(addr);
switch (addr & 0xF)
{
case 0x0: pCard->ControlStepper(pc, addr, bWrite, d, nExecutedCycles); break;
@ -1696,6 +1718,8 @@ BYTE __stdcall Disk2InterfaceCard::IOWrite(WORD pc, WORD addr, BYTE bWrite, BYTE
ImageInfo* pImage = pCard->m_floppyDrive[pCard->m_currDrive].m_disk.m_imagehandle;
bool isWOZ = ImageIsWOZ(pImage);
pCard->SetSequencerFunction(addr);
switch (addr & 0xF)
{
case 0x0: pCard->ControlStepper(pc, addr, bWrite, d, nExecutedCycles); break;

3
source/Disk.h
View File

@ -190,6 +190,7 @@ private:
void UpdateBitStreamOffsets(FloppyDisk& floppy);
void DataLatchReadWOZ(WORD pc, WORD addr, UINT bitCellRemainder);
void DataLatchWriteWOZ(WORD pc, WORD addr, BYTE d, UINT bitCellRemainder);
void SetSequencerFunction(WORD addr);
void DumpSectorWOZ(FloppyDisk floppy);
void DumpTrackWOZ(FloppyDisk floppy);
@ -240,6 +241,8 @@ private:
BYTE m_shiftReg;
int m_latchDelay;
bool m_resetSequencer;
enum SEQFUNC {readSequencing, checkWriteProtAndInitWrite, dataShiftWrite, dataLoadWrite}; // UTAIIe 9-14
SEQFUNC m_seqFunc;
UINT m_dbgLatchDelayedCnt;
// Debug: