From 034d5d9ea0d542dc495778c9134860eef19d0381 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Wed, 7 Oct 2020 23:29:54 +0200
Subject: [PATCH] start of JiffyDOS LOAD protocol support

---
 bin/README.md                       |  2 +-
 src/,,config_custom.s               |  4 +++-
 src/kernal/iec_fast/jiffydos_load.s | 28 +++++++++++++++++++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/bin/README.md b/bin/README.md
index 9c4bb983..19a5b8e1 100644
--- a/bin/README.md
+++ b/bin/README.md
@@ -16,7 +16,7 @@ Follow these rules, or bad things will happen!
 
 <br />
 
-For Ultimate 64 the following settinghs are recommended:
+For Ultimate 64 motherboard the following settings are recommended:
 
 * U64 Specific Settings -> Turbo Control -> U64 Turbo Registers
 
diff --git a/src/,,config_custom.s b/src/,,config_custom.s
index 5362fb5d..17fa482c 100644
--- a/src/,,config_custom.s
+++ b/src/,,config_custom.s
@@ -39,12 +39,14 @@
 
 ;; #CONFIG# IEC                        YES
 ;; #CONFIG# IEC_DOLPHINDOS             YES
-;; #CONFIG# IEC_DOLPHINDOS_FAST        YES
+;; #CONFIG# IEC_DOLPHINDOS_FAST        NO
 ;; #CONFIG# IEC_JIFFYDOS               YES
 ;; #CONFIG# IEC_JIFFYDOS_BLANK         NO
 ;; #CONFIG# IEC_BURST_CIA1             NO        ; please keep disabled for now
 ;; #CONFIG# IEC_BURST_CIA2             NO        ; please keep disabled for now
  
+;; #CONFIG# IEC_JD_TEST                NO        ; temporary setting, for JiffyDOS development
+
 
 ; --- Tape deck configuration
 
diff --git a/src/kernal/iec_fast/jiffydos_load.s b/src/kernal/iec_fast/jiffydos_load.s
index 04251a54..7f1f806f 100644
--- a/src/kernal/iec_fast/jiffydos_load.s
+++ b/src/kernal/iec_fast/jiffydos_load.s
@@ -19,6 +19,30 @@
 
 jiffydos_load:
 
+
+!ifdef CONFIG_IEC_JD_TEST {
+
+	; XXX test implementation, not ready yet
+
+	; Switch to optimized LOAD protocol
+	jsr UNTLK
+	lda FA
+	jsr TALK
+	bcs jiffydos_load_error
+	lda #$61
+	jsr TKSA
+
+	; XXX finish the implementation
+
+	rts
+
+jiffydos_load_error:
+	
+	; XXX finish the implementation
+
+
+} else {
+
 	; XXX implement JiffyDOS optimized LOAD protocol, this one is ineffective
 
 
@@ -53,7 +77,7 @@ jiffydos_load:
 	; Blank screen to make sure no sprite/badline will interrupt
 	jsr screen_off
 @2:
-	; Preserve 3 lowest bits of CIA2_PRA  XXX deduplicate this
+	; Preserve 3 lowest bits of CIA2_PRA
 	jsr jiffydos_preserve_bits
 
 } else {
@@ -207,3 +231,5 @@ jiffydos_load_end:
 
 
 } } ; CONFIG_IEC_JIFFYDOS and not CONFIG_MEMORY_MODEL_60K
+
+}
\ No newline at end of file