Fixed the auto reset bugs introduced in v1.03

This commit is contained in:
Stephen White 2018-06-07 20:20:57 +10:00
parent 1c4e73d927
commit c605ff6b0d
2 changed files with 5 additions and 3 deletions

View file

@ -45,7 +45,7 @@ extern "C"
#include "sample.h"
unsigned versionMajor = 1;
unsigned versionMinor = 3;
unsigned versionMinor = 4;
// When the emulated CPU starts we execute the first million odd cycles in non-real-time (ie as fast as possible so the emulated 1541 becomes responsive to CBM-Browser asap)
// During these cycles the CPU is executing the ROM self test routines (these do not need to be cycle accurate)
@ -732,6 +732,8 @@ void emulator()
diskCaddy.Display();
inputMappings->directDiskSwapRequest = 0;
// Force an update on all the buttons now before we start emulation mode.
IEC_Bus::ReadBrowseMode();
bool extraRAM = options.GetExtraRAM();
DataBusReadFn dataBusRead = extraRAM ? read6502ExtraRAM : read6502;

View file

@ -235,8 +235,8 @@ void Options::Process(char* buffer)
if (!SplitIECLines())
{
invertIECInputs = false;
// If using non split lines then only the 2nd bus master can be used (as ATN is using the 1st)
i2cBusMaster = 1;
// If using non split lines then only the 1st bus master can be used (as ATN is using the 2nd)
i2cBusMaster = 0;
}
}