REU cleanup (Replaced TimeDelayed<bool> baLine by bool ba[2]

dirkwhoffmann · Sep 7, 2024 · 6a34af0 · 6a34af0
1 parent ce7f988
commit 6a34af0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/Emulator/Media/Cartridges/CustomCartridges/Reu.cpp b/Emulator/Media/Cartridges/CustomCartridges/Reu.cpp
@@ -24,8 +24,6 @@ Reu::Reu(C64 &ref, isize kb) : Cartridge(ref), kb(kb)
 
     traits.memory = KB(kb);
     setRamCapacity(KB(kb));
-
-    baLine.setClock(&cpu.clock);
 }
 
 void
@@ -493,9 +491,10 @@ Reu::execute(EventID id)
         case EXP_REU_SWAP:
         case EXP_REU_VERIFY:
         {
-            trace(REU_DEBUG > 3, "%d%d%d : ", baLine.readWithDelay(2), baLine.readWithDelay(1), baLine.readWithDelay(3));
+            trace(REU_DEBUG > 3, "%d%d : ", ba[1], ba[0]);
+
             // Only proceed if the bus is available
-            if (!busIsAvailable(id)) { // baLine.readWithDelay(0) && baLine.readWithDelay(1)) {
+            if (!busIsAvailable(id)) {
 
                 if (REU_DEBUG > 3) printf("BLOCKED\n");
                 break;
@@ -555,10 +554,10 @@ Reu::execute(EventID id)
 void
 Reu::sniffBA()
 {
+    // TODO: Eliminate static variable. Will break multiple emulator instances
     static bool earlyDma = false;
 
     // Scan the BA line
-    auto current = !!vic.baLine.current();
     ba[0] = vic.baLine.readWithDelay(0);
     ba[1] = vic.baLine.readWithDelay(1);
 
@@ -572,13 +571,7 @@ Reu::sniffBA()
      *  for CPU it doesn't matter, because it checks later in cycle.
      *  REU seems to check this sooner and can't recognize BA in this special cycle."
      */
-    if (c64.rasterCycle == 55 && earlyDma) { current = false; ba[0] = false; }
-
-    // Feed the pipe
-    baLine.write(current);
-
-    // Return delayed value
-    // return baLine.readWithDelay(1);
+    if (c64.rasterCycle == 55 && earlyDma) { ba[0] = false; }
 }
 
 bool 
@@ -595,7 +588,7 @@ Reu::busIsAvailable(EventID id) const
         case EXP_REU_SWAP:
         case EXP_REU_VERIFY:
 
-            return !(baLine.readWithDelay(1));
+            return !ba[1];
 
         default:
             fatalError;

diff --git a/Emulator/Media/Cartridges/CustomCartridges/Reu.h b/Emulator/Media/Cartridges/CustomCartridges/Reu.h
@@ -96,9 +96,7 @@ class Reu final : public Cartridge {
     // Flipflop used to control the swap operation
     bool swapff = false;
 
-    // Experimental
-    TimeDelayed<bool,3> baLine = TimeDelayed <bool,3> ();
-
+    // Last to values of the BA line as seen by the REU
     bool ba[2];
 
     //
@@ -173,7 +171,7 @@ class Reu final : public Cartridge {
         CLONE(c64Val)
         CLONE(reuVal)
         CLONE(swapff)
-        CLONE(baLine)
+        CLONE_ARRAY(ba)
 
         CLONE(upperBankBits)
         CLONE(bus)
@@ -208,7 +206,7 @@ class Reu final : public Cartridge {
         << c64Val
         << reuVal
         << swapff
-        << baLine
+        << ba
 
         << upperBankBits
         << bus