From 1190a3faed09102a8195d4d8416fa6a2811bcfd5 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Thu, 12 Aug 2021 20:32:19 +0200
Subject: [PATCH] started work on block read abstraction

---
 bin/basic_generic.rom                         | Bin 8192 -> 8192 bytes
 bin/basic_generic_crt.rom                     | Bin 8192 -> 8192 bytes
 bin/basic_ultimate64.rom                      | Bin 8192 -> 8192 bytes
 bin/extrom_generic_crt.crt                    | Bin 32896 -> 32896 bytes
 bin/kernal_generic.rom                        | Bin 8192 -> 8192 bytes
 bin/kernal_generic_crt.rom                    | Bin 8192 -> 8192 bytes
 bin/kernal_ultimate64.rom                     | Bin 8192 -> 8192 bytes
 src/dos_m65/pseudoiec/msg_acptr.s             |  22 +++++++++---------
 ...{disk_fd_cmd_read.s => disk_xx_cmd_read.s} |  17 +++++---------
 9 files changed, 17 insertions(+), 22 deletions(-)
 rename src/dos_m65/unit_disk/{disk_fd_cmd_read.s => disk_xx_cmd_read.s} (54%)

diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom
index 30d54dee02bb1b977dd310c439d49cb380184865..95d1bd01dcdcce51bba12096463627a55e432d15 100644
GIT binary patch
delta 15
WcmZp0XmHpNBhPGMU@<vfejxxT?gaq=

delta 15
WcmZp0XmHpNBhPGXWI8!sejxxT$OQWU

diff --git a/bin/basic_generic_crt.rom b/bin/basic_generic_crt.rom
index f8eff4df225b073b38658d53e9dd70ff6a136687..1e6104fde6567c48f0be75ee9ab0c080f0ea02f2 100644
GIT binary patch
delta 15
WcmZp0XmHpNBhPGMU@<vfejxxT?gaq=

delta 15
WcmZp0XmHpNBhPGXWI8!sejxxT$OQWU

diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom
index d51585677543837886c886fa93a6523ef6f447a3..a37fb32792ca80c6aedd580ecc6d77028e95bd41 100644
GIT binary patch
delta 15
WcmZp0XmHpNBhPGMU@<vfejxxT?gaq=

delta 15
WcmZp0XmHpNBhPGXWI8!sejxxT$OQWU

diff --git a/bin/extrom_generic_crt.crt b/bin/extrom_generic_crt.crt
index 7827e060769f8be24efa02d7e67626766d063818..de6c55793c92ec9f1c2736cffa50e79ce9e3e305 100644
GIT binary patch
delta 18
ZcmZo@WNK(++Tf<ZY++!r*;Bzh0RT5S1#<uZ

delta 18
ZcmZo@WNK(++Tf<ZY;0t@*;Bzh0RT4*1#JKT

diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom
index 252077d285cd5e7b0458fcf1f8dd516ba59678ac..dfefccd4a0867e7454af9764e6495cd73eaad638 100644
GIT binary patch
delta 23
fcmZp0XmHqYn1$KGz+&?;mgoG8t((`01aSiZXnhD~

delta 23
fcmZp0XmHqYn1$Kc$aM2DmgoG8Et}Vg1aSiZXdwt+

diff --git a/bin/kernal_generic_crt.rom b/bin/kernal_generic_crt.rom
index dcbb525a919db4700c6fbcd2c87e5b83ca81e721..74035f8d9f75bac7f56e845b12cc8eb1f16b067a 100644
GIT binary patch
delta 23
fcmZp0XmHqYn1$KGz+&?;mgoG8t((`01aSiZXnhD~

delta 23
fcmZp0XmHqYn1$Kc$aM2DmgoG8Et}Vg1aSiZXdwt+

diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom
index 3ecb2aec3599f7804518f90b510ac27ad2142dd4..50e7685e5a54c596e4fe5b7bac5655bc43e8279a 100644
GIT binary patch
delta 23
fcmZp0XmHqYn1$KGz+&?;mgoG8t((`01aSiZXnhD~

delta 23
fcmZp0XmHqYn1$Kc$aM2DmgoG8Et}Vg1aSiZXdwt+

diff --git a/src/dos_m65/pseudoiec/msg_acptr.s b/src/dos_m65/pseudoiec/msg_acptr.s
index 8afbb02a..27b4741f 100644
--- a/src/dos_m65/pseudoiec/msg_acptr.s
+++ b/src/dos_m65/pseudoiec/msg_acptr.s
@@ -89,12 +89,7 @@ msg_ACPTR_read_F0:
 	; If new length is 0, try to read next block of data
 
 	ora F0_ACPTR_LEN+1
-	bne @3
-	jsr disk_f0_cmd_READ
-	bcc @3
-	jsr kernalstatus_EOI
-@3:
-	jmp dos_EXIT_CLC
+	bra msg_ACPTR_read_XX_common
 
 msg_ACPTR_read_F1:
 
@@ -119,16 +114,21 @@ msg_ACPTR_read_F1:
 	; If new length is 0, try to read next block of data
 
 	ora F1_ACPTR_LEN+1
-	bne @3
-	jsr disk_f1_cmd_READ
+	bra msg_ACPTR_read_XX_common
+
+msg_ACPTR_read_RD:
+
+	; XXX provide implementation
+
+msg_ACPTR_read_XX_common:
+
+	bne @3                  
+	jsr disk_xx_cmd_READ
 	bcc @3
 	jsr kernalstatus_EOI
 @3:
 	jmp dos_EXIT_CLC
 
-msg_ACPTR_read_RD:
-
-	; XXX provide implementation
 
 
 msg_ACPTR_fail_no_data:
diff --git a/src/dos_m65/unit_disk/disk_fd_cmd_read.s b/src/dos_m65/unit_disk/disk_xx_cmd_read.s
similarity index 54%
rename from src/dos_m65/unit_disk/disk_fd_cmd_read.s
rename to src/dos_m65/unit_disk/disk_xx_cmd_read.s
index 49d85d6a..b809af20 100644
--- a/src/dos_m65/unit_disk/disk_fd_cmd_read.s
+++ b/src/dos_m65/unit_disk/disk_xx_cmd_read.s
@@ -4,21 +4,16 @@
 ;
 
 
-disk_f0_cmd_READ:
+disk_xx_cmd_READ:
 
-	; XXX provide implementation
-
-disk_f1_cmd_READ:
-
-	; XXX provide implementation
-
-disk_f__cmd_READ:
-
-	lda F0_MODE
+    ldx PAR_FSINSTANCE
+	lda XX_MODE, x
 	cmp #$03
 	+beq fs_cbm_nextfileblock
 
-	lda F0_DIR_PHASE
+	; Reading directory
+
+	lda XX_DIR_PHASE, x
 	cmp #$01
 	+beq fs_cbm_read_dir
 	cmp #$02