From 50da4aa2b1f49347f9ccfd5e62b15dd76bdfb45c Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Fri, 29 Jan 2021 20:48:57 +0100
Subject: [PATCH] more file loading fixes

---
 src/zvm_m65/zvm_cpmemu.s  |  3 +++
 src/zvm_m65/zvm_cputest.s | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/zvm_m65/zvm_cpmemu.s b/src/zvm_m65/zvm_cpmemu.s
index 2c58c979..4a17bbe5 100644
--- a/src/zvm_m65/zvm_cpmemu.s
+++ b/src/zvm_m65/zvm_cpmemu.s
@@ -6,6 +6,9 @@
 
 zvm_CPMemu:
 
+	jsr PRIMM
+	!pet "DBG: CP1", $0D, 0
+
 	ldx REG_C
 	cpx #$09
 	beq zvm_CPMemu_09
diff --git a/src/zvm_m65/zvm_cputest.s b/src/zvm_m65/zvm_cputest.s
index 11801c5f..bf7b7d52 100644
--- a/src/zvm_m65/zvm_cputest.s
+++ b/src/zvm_m65/zvm_cputest.s
@@ -74,13 +74,17 @@ ZVM_cputest:
 	lda #$00
 	sta BIOS_LOADPTR+1
 
-!addr BIOS_LOADCOUNT         = $48               ; 2 bytes - counter used for loading data
+	; Read data, 512 byte chunks
 
-
-	; Read sectors
+	lda #$02                                     ; summy value - 2*256 bytes read
+	pha
 
 @loop2:
 
+	pla
+	cmp #$02
+	bne @load_done
+
 	; Set I/O buffer pointer to start
 
 	lda #$6E
@@ -103,6 +107,8 @@ ZVM_cputest:
 	ora BIOS_LOADCOUNT+0
 	beq @load_done
 
+	phy                                          ; if 2 - we most likely have something more to read
+
 @loop3:
 
 	dew BIOS_LOADCOUNT