From c573ab6d21436c8b37016e2a5bcf81ab70e26b9b Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Wed, 25 Dec 2019 12:50:29 +0100
Subject: [PATCH] DolphinDOS protocol detection works

---
 c64/kernal/iec/load_iec.s |  6 ++++++
 c64/kernal/iec/talk.s     | 10 ----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/c64/kernal/iec/load_iec.s b/c64/kernal/iec/load_iec.s
index 3c4d2b09..a638f521 100644
--- a/c64/kernal/iec/load_iec.s
+++ b/c64/kernal/iec/load_iec.s
@@ -62,6 +62,12 @@ load_iec:
 	jsr iec_tx_command
 	bcs load_iec_error
 
+#if CONFIG_IEC_DOLPHINDOS
+
+	jsr dolphindos_detect
+
+#endif
+
 	// We are currently talker, so do the IEC turn around so that we
 	// are the listener (p16)
 	jsr iec_turnaround_to_listen
diff --git a/c64/kernal/iec/talk.s b/c64/kernal/iec/talk.s
index e65b4e68..36718097 100644
--- a/c64/kernal/iec/talk.s
+++ b/c64/kernal/iec/talk.s
@@ -41,18 +41,8 @@ common_talk_listen: // common part of TALK and LISTEN
 
 #endif // CONFIG_IEC_JIFFYDOS
 
-#if CONFIG_IEC_DOLPHINDOS
-
-	jsr iec_tx_command
-	jmp dolphindos_detect
-
-#else
-
 	jmp iec_tx_command
 
-#endif // no CONFIG_IEC_JIFFYDOS
-
-
 #else
 
 	jmp kernalerror_ILLEGAL_DEVICE_NUMBER