Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-21 07:17:41 +00:00
Code Issues Projects Releases Wiki Activity

These 2 combined fix #418:

Browse Source 
1) Uthernet card now returns floating bus for slot ROM at $Cs00-CsFF (where s=3).
2) Fixed IoHandlerCardsIn() to not map in the card in slot3's slot ROM when SLOTC3ROM=0.

Also:
. moved the typedef 'iofunction' from common.h to memory.h
This commit is contained in:
tomcw
2017-05-13 22:07:53 +01:00
parent f8d3789635
commit 52450aa7f7
5 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Tfe/Tfe.cpp
+27 -4
View File
@@ -42,9 +42,9 @@
#define NULL 0
#endif
typedef unsigned int UINT;
#include "..\common.h"
// Define here, so we don't drag in the whole of stdafx.h:
void RegisterIoHandler(UINT uSlot, iofunction IORead16, iofunction IOWrite16, iofunction IOReadCx, iofunction IOWriteCx, LPVOID lpSlotParameter, BYTE* pExpansionRom);
#include "..\Common.h" // For: IS_APPLE2
#include "..\Memory.h"
/**/
/** #define TFE_DEBUG_DUMP 1 **/
@@ -392,6 +392,7 @@ void tfe_debug_output_pp( void )
/* ------------------------------------------------------------------------- */
/* initialization and deinitialization functions */
BYTE __stdcall TfeIoCxxx (WORD programcounter, WORD address, BYTE write, BYTE value, ULONG nCycles);
BYTE __stdcall TfeIo (WORD programcounter, WORD address, BYTE write, BYTE value, ULONG nCycles);
void tfe_reset(void)
@@ -454,7 +455,7 @@ void tfe_reset(void)
}
const UINT uSlot = 3;
RegisterIoHandler(uSlot, TfeIo, TfeIo, NULL, NULL, NULL, NULL);
RegisterIoHandler(uSlot, TfeIo, TfeIo, TfeIoCxxx, TfeIoCxxx, NULL, NULL);
}
#ifdef DOS_TFE
@@ -1501,6 +1502,28 @@ int tfe_enumadapter_close(void)
return tfe_arch_enumadapter_close();
}
// Go via TfeIoCxxx() instead of directly calling IO_Null() to include this specific (slot-3) _DEBUG check
static BYTE __stdcall TfeIoCxxx (WORD programcounter, WORD address, BYTE write, BYTE value, ULONG nCycles)
{
#ifdef _DEBUG
if (!IS_APPLE2)
{
// Derived from UTAIIe:5-28
//
// SLOTCXROM SLOTC3ROM TFE floating bus?
// 1 0 N (internal ROM)
// 1 1 Y
// 0 0 N (internal ROM)
// 0 1 N (internal ROM)
if (! (MemCheckSLOTCXROM() && MemCheckSLOTC3ROM()) )
{
_ASSERT(0); // Card ROM disabled, so IORead_Cxxx() returns the internal ROM
}
}
#endif
return IO_Null(programcounter, address, write, value,nCycles);
}
static BYTE __stdcall TfeIo (WORD programcounter, WORD address, BYTE write, BYTE value, ULONG nCycles)
{