From c605ff6b0d6a2f8edc5c7e219ee16cd5f3809633 Mon Sep 17 00:00:00 2001 From: Stephen White Date: Thu, 7 Jun 2018 20:20:57 +1000 Subject: [PATCH] Fixed the auto reset bugs introduced in v1.03 --- src/main.cpp | 4 +++- src/options.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index fb652af..4a35e68 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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; diff --git a/src/options.cpp b/src/options.cpp index 46e078b..e1ccd43 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -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; } }