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

Replaced UTA2E with UTAIIe for consistency across code-base

Browse source
This commit is contained in:
tomcw 2017-05-14 11:33:07 +01:00
parent 52450aa7f7
commit 344078a559
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/Disk.cpp
View file

@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* Author: Various * Author: Various
* *
* In comments, UTA2E is an abbreviation for a reference to "Understanding the Apple //e" by James Sather * In comments, UTAIIe is an abbreviation for a reference to "Understanding the Apple //e" by James Sather
*/ */
#include "StdAfx.h" #include "StdAfx.h"
@ -789,7 +789,7 @@ static void __stdcall DiskReadWrite(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULO
return; return;
} }
// Should really test for drive off - after 1 second drive off delay (UTA2E page 9-13) // Should really test for drive off - after 1 second drive off delay (UTAIIe page 9-13)
// but Sherwood Forest sets shift mode and reads with the drive off, so don't check for now // but Sherwood Forest sets shift mode and reads with the drive off, so don't check for now
if (!floppywritemode) if (!floppywritemode)
{ {
@ -818,7 +818,7 @@ static void __stdcall DiskReadWrite(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULO
void DiskReset(void) void DiskReset(void)
{ {
// RESET forces all switches off (UTA2E Table 9.1) // RESET forces all switches off (UTAIIe Table 9.1)
currdrive = 0; currdrive = 0;
floppymotoron = 0; floppymotoron = 0;
floppyloadmode = 0; floppyloadmode = 0;
@ -890,11 +890,11 @@ static void __stdcall DiskLoadWriteProtect(WORD, WORD, BYTE write, BYTE value, U
/* floppyloadmode = 1; */ /* floppyloadmode = 1; */
if (!write) if (!write)
{ {
// Should really test for drive off - after 1 second drive off delay (UTA2E page 9-13) // Should really test for drive off - after 1 second drive off delay (UTAIIe page 9-13)
// but Gemstone Warrior sets load mode with the drive off, so don't check for now // but Gemstone Warrior sets load mode with the drive off, so don't check for now
if (!floppywritemode) if (!floppywritemode)
{ {
// Phase 1 on also forces write protect in the Disk II drive (UTA2E page 9-7) but we don't implement that // Phase 1 on also forces write protect in the Disk II drive (UTAIIe page 9-7) but we don't implement that
if (g_aFloppyDisk[currdrive].bWriteProtected) if (g_aFloppyDisk[currdrive].bWriteProtected)
floppylatch |= 0x80; floppylatch |= 0x80;
else else
@ -1080,7 +1080,7 @@ static BYTE __stdcall Disk_IORead(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG
case 0xF: DiskSetWriteMode(pc, addr, bWrite, d, nCyclesLeft); break; case 0xF: DiskSetWriteMode(pc, addr, bWrite, d, nCyclesLeft); break;
} }
// only even addresses return the latch (UTA2E Table 9.1) // only even addresses return the latch (UTAIIe Table 9.1)
if (!(addr & 1)) if (!(addr & 1))
return floppylatch; return floppylatch;
else else

4
source/Tape.cpp
View file

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* Author: Various * Author: Various
* *
* In comments, UTA2E is an abbreviation for a reference to "Understanding the Apple //e" by James Sather * In comments, UTAIIe is an abbreviation for a reference to "Understanding the Apple //e" by James Sather
*/ */
#include "StdAfx.h" #include "StdAfx.h"
@ -78,7 +78,7 @@ BYTE __stdcall TapeRead(WORD, WORD address, BYTE, BYTE, ULONG nCyclesLeft)
return C060; return C060;
} }
return MemReadFloatingBus(1, nCyclesLeft); // TAPEIN has high bit 1 when input is low or not connected (UTA2E page 7-5, 7-6) return MemReadFloatingBus(1, nCyclesLeft); // TAPEIN has high bit 1 when input is low or not connected (UTAIIe page 7-5, 7-6)
} }
/* /*