Fix problems with transferDelaySinceLast()

Author: FozzTexx

lib/bus/iec/iec.cpp

@@ -91,13 +91,14 @@ void IRAM_ATTR systemBus::cbm_on_clk_isr_handler()
     case IEC_LISTEN:
     case IEC_TALK:
       if (dev == IEC_ALLDEV || !isDeviceEnabled(dev)) {
-	if (cmd == IEC_TALK) {
+	if (dev == IEC_ALLDEV) {
 	  // Handle releaseLines() when ATN is released outside of this
 	  // interrupt to prevent watchdog timeout
 	  IEC_SET_STATE(BUS_RELEASE);
 	}
 	else {
 	  IEC_SET_STATE(BUS_IDLE);
+	  protocol->transferDelaySinceLast(TIMING_Tbb);
 	  releaseLines();
 	}
         sendInput();

lib/bus/iec/protocol/_protocol.cpp

@@ -81,20 +81,22 @@ int IRAM_ATTR IECProtocol::waitForSignals(int pin1, int state1,
 
 void IECProtocol::transferDelaySinceLast(size_t minimumDelay)
 {
-  uint64_t now, remaining;
-  uint64_t ended = 0;
+  uint64_t now, elapsed;
+  int64_t remaining;
 
 
   now = esp_timer_get_time();
+  elapsed = now - _transferEnded;
   if (minimumDelay > 0) {
-    remaining = now - (ended + minimumDelay);
+    remaining = minimumDelay;
+    remaining -= elapsed;
     if (remaining > 0) {
       usleep(remaining);
       now = esp_timer_get_time();
     }
   }
 
-  ended = now;
+  _transferEnded = now;
   return;
 }
 

lib/bus/iec/protocol/_protocol.h

@@ -9,32 +9,32 @@
 
 #include "../../include/cbm_defines.h"
 
-#define IEC_RELEASE(pin) ({			\
-      uint32_t _pin = pin;			\
-      uint32_t _mask = 1 << (_pin % 32);	\
-      if (_pin >= 32)				\
-	GPIO.enable1_w1tc.val = _mask;		\
-      else					\
-	GPIO.enable_w1tc = _mask;		\
+#define IEC_RELEASE(pin) ({                     \
+      uint32_t _pin = pin;                      \
+      uint32_t _mask = 1 << (_pin % 32);        \
+      if (_pin >= 32)                           \
+        GPIO.enable1_w1tc.val = _mask;          \
+      else                                      \
+        GPIO.enable_w1tc = _mask;               \
     })
-#define IEC_ASSERT(pin) ({			\
-      uint32_t _pin = pin;			\
-      uint32_t _mask = 1 << (_pin % 32);	\
-      if (_pin >= 32)				\
-	GPIO.enable1_w1ts.val = _mask;		\
-      else					\
-	GPIO.enable_w1ts = _mask;		\
+#define IEC_ASSERT(pin) ({                      \
+      uint32_t _pin = pin;                      \
+      uint32_t _mask = 1 << (_pin % 32);        \
+      if (_pin >= 32)                           \
+        GPIO.enable1_w1ts.val = _mask;          \
+      else                                      \
+        GPIO.enable_w1ts = _mask;               \
     })
 
 #ifndef IEC_INVERTED_LINES
-#define IEC_IS_ASSERTED(pin) ({						\
-      uint32_t _pin = pin;						\
-      !((_pin >= 32 ? GPIO.in1.val : GPIO.in) & (1 << (_pin % 32)));	\
+#define IEC_IS_ASSERTED(pin) ({                                         \
+      uint32_t _pin = pin;                                              \
+      !((_pin >= 32 ? GPIO.in1.val : GPIO.in) & (1 << (_pin % 32)));    \
     })
 #else
-#define IEC_IS_ASSERTED(pin) ({						\
-      uint32_t _pin = pin;						\
-      !!(_pin >= 32 ? GPIO.in1.val : GPIO.in) & (1 << (_pin % 32));	\
+#define IEC_IS_ASSERTED(pin) ({                                         \
+      uint32_t _pin = pin;                                              \
+      !!(_pin >= 32 ? GPIO.in1.val : GPIO.in) & (1 << (_pin % 32));     \
     })
 #endif /* !IEC_INVERTED_LINES */
 
@@ -45,6 +45,9 @@ namespace Protocol
      */
     class IECProtocol
     {
+    private:
+      uint64_t _transferEnded = 0;
+
         public:
 
         // 2bit Fast Loader Pair Timing

lib/bus/iec/protocol/cpbstandardserial.cpp

@@ -17,7 +17,7 @@
 
 #ifdef BUILD_IEC
 
-#define DYMANIC_DELAY
+#define DYNAMIC_DELAY
 
 #include "cpbstandardserial.h"