From 76258e54d6fa2c05fedc457c409c011fc8cdd425 Mon Sep 17 00:00:00 2001
From: Philip Smart <support@nowhere.com>
Date: Wed, 18 Mar 2020 18:10:20 +0000
Subject: [PATCH] Bug fixes

---
 .gitignore                               |  11 ++++++
 software/asm/include/RFS_Definitions.asm |   3 ++
 software/asm/rfs.asm                     |  45 +++++++++++++++++------
 software/asm/rfs_bank2.asm               |   5 ---
 software/roms/USER_ROM_256.bin           | Bin 524032 -> 524032 bytes
 software/roms/rfs.rom                    | Bin 16384 -> 16384 bytes
 6 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2a2cb66..90a5406 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,14 @@ software/roms/MZ80AFI.rom
 software/roms/bios.rom
 software/roms/cpm22.rom
 software/tmp/
+software/src/FatFS
+software/src/sav
+software/asm/cbios.asm.bak
+software/asm/sav/
+software/rfs_bank2.asm.1703.2200
+software/roms/cbios_bank5.rom
+software/roms/cbios_bank6.rom
+software/roms/cbios_bank7.rom
+software/roms/cbios_bank8.rom
+software/src/sdtest.c
+
diff --git a/software/asm/include/RFS_Definitions.asm b/software/asm/include/RFS_Definitions.asm
index 11e6f3a..1e368dc 100644
--- a/software/asm/include/RFS_Definitions.asm
+++ b/software/asm/include/RFS_Definitions.asm
@@ -67,6 +67,9 @@ DLY12:      EQU     00DA7h
 DLY12A:     EQU     00DAAh
 ?RSTR1:     EQU     00EE6h
 
+; Debugging
+ENADEBUG    EQU     0                                                    ; Enable debugging logic, 1 = enable, 0 = disable
+
 ;-----------------------------------------------
 ; Memory mapped ports in hardware.
 ;-----------------------------------------------
diff --git a/software/asm/rfs.asm b/software/asm/rfs.asm
index cfb0ec6..4237cec 100644
--- a/software/asm/rfs.asm
+++ b/software/asm/rfs.asm
@@ -762,7 +762,9 @@ ISMZFNOT:   POP     HL
             POP     BC
             RET
 
-PRTDBG:     PUSH    HL
+            
+PRTDBG:     IF ENADEBUG = 1
+            PUSH    HL
             PUSH    DE
             PUSH    BC
             PUSH    AF
@@ -797,6 +799,7 @@ PRTDBG:     PUSH    HL
             POP     DE
             POP     HL
             RET
+            ENDIF
 
 _PRTMZF:    PUSH    DE
             PUSH    HL
@@ -806,9 +809,9 @@ _PRTMZF:    PUSH    DE
             ;
             LD      A,(SCRNMODE)
             CP      0
-            LD      H,46
+            LD      H,47
             JR      Z,PRTMZF0
-            LD      H,92
+            LD      H,93
 PRTMZF0:    LD      A,(TMPLINECNT)                                       ; Pause if we fill the screen.
             LD      E,A
             INC     E
@@ -1033,6 +1036,18 @@ LOADROM1:   DI
             LD      (RFSBK1), A
             CALL    MFINDMZF                                             ; Try and find the file in User ROM via MROM utility.
             JR      NZ, LROMNTFND
+            ;
+            LD      A,(ROMBK1)
+            LD      (RFSBK1), A
+            LD      DE,MSGLDROM
+            RST     018H
+            LD      DE,NAME
+            RST     018H
+            CALL    NL
+            LD      A,(WRKROMBK1)
+            LD      (RFSBK1), A
+
+            ;
             CALL    MROMLOAD                                             ; Load the file from User ROM via MROM utility.
             JP      Z, LROMLOAD5
 
@@ -1049,6 +1064,13 @@ LOADROMEND: EI
             ; Load program from RFS Bank 1 (MROM Bank)
             ;
 LROMLOAD:   PUSH    BC
+            ;
+            LD      DE,MSGLDROM
+            RST     018H
+            LD      DE,NAME
+            RST     018H
+            CALL    NL
+            ;
             LD      A,B
             LD      (WRKROMBK1),A
             LD      (RFSBK1), A
@@ -1169,14 +1191,15 @@ LOADSDCARD2:RET
 ;
 ;======================================
 ;
-MSGSON:     DB      "+ RFS ", 0ABh, "1.1 **",00Dh
-MSGOK:      DB      "OK!"
-MSGNOTFND:  DB      "NOT FOUND", 00Dh
-MSGRDIRLST: DB      "ROM DIRECTORY:", 00Dh
-MSGTRM:     DB      00Dh
-MSGSV:      DB      "FILENAME? ",  0DH
-MSG_INITM:  DB      "INIT MEMORY", 0Dh
-MSGBADCMD:  DB      "???", 0DH
+MSGSON:     DB      "+ RFS ", 0ABh, "1.1 **",00DH
+MSGOK:      DB      "OK!",                   00DH
+MSGNOTFND:  DB      "NOT FOUND",             00DH
+MSGRDIRLST: DB      "ROM DIRECTORY:",        00DH
+MSGTRM:     DB                               00DH
+MSGSV:      DB      "FILENAME? ",            00DH
+MSG_INITM:  DB      "INIT MEMORY",           00DH
+MSGBADCMD:  DB      "???",                   00DH
+MSGLDROM:   DB      "LOADING ",              00DH
 
             ; Bring in additional resources.
             USE_CMPSTRING:    EQU   1
diff --git a/software/asm/rfs_bank2.asm b/software/asm/rfs_bank2.asm
index 3b546f9..261832a 100644
--- a/software/asm/rfs_bank2.asm
+++ b/software/asm/rfs_bank2.asm
@@ -1167,11 +1167,6 @@ DIRSD2:     LD      A,(HL)
             INC     D
 DIRSD3:     INC     E                                                    ; Onto next directory entry number.
             DJNZ    DIRSD1
-
-            LD      DE,MSGSDRERR
-            RST     018H
-            CALL    NL
-
             RET
             ;
 
diff --git a/software/roms/USER_ROM_256.bin b/software/roms/USER_ROM_256.bin
index 6d6ddd814e2e88a3f47a65913e489ce80980694b..ff1002c70792abfabe25fb1c2f1947a37076fd3f 100644
GIT binary patch
delta 573
zcmYjNO=}ZT6rDFSnOJmW#+djFrg>>3CMiwYKy3^%SP~4aLt0`M*|>0_TT%Q##H5xI
z>OyFFe?S)sA}+K_ML{Cc#i$RAG(`j%s{|X#ytJU8L?*sk7v9Y|oOAEt-aBRcr)>Y+
zHBg$L9tL;kpPc4f6eDmT_PModEd8Yg#*L<^7ji|?<n=<0@qDg$-{STB154D?x#D%o
z>**T{7eE<+I{v{&cP>)%Wp#}Va35|q)kQoYTw=y;p~!!txGR)h^+w90B!0J3Ud84@
z@h~4cfmg&LSi*5f0Zif<htB_^_?;t?O<3U(O-R7ac5;?OzO6}hoto-~Vv-&%wdI}X
zUR|WC|J-NP>=;Y`HDM&pq-JSUQaepU>q1`R5+1c4=yv=33YlypfnhBmTjbE1(U0;+
zkE44-u^|+V$`i)|GX5wHC-sTZ%vdgq<VM|Vb79q%!?JY?iLP%Q+W)+^YLuAzld0cF
z;D&wjy?y2F3NnZfk2*7PU)wGs;PTp$@L@ZUOp;I=9dt!lJw5}QfA#%LM<m-G>?I-m
z$f@JG?Ry_?Ti%fzrzUwSuv2R<Gyp9PBm#=oP4ua1k~uwGFX!PTj+9%~QZV?s92QBa
zwR@jJanKzDA)I$#2DA8$J2NQJ)Vg8=<YRwms^_T5kR_|97!x-c3xf{zDuoS=Gt}{g
eBc3W?YwVeZ6$mPjuRx&!#R_y(pmYa1zy1Nr;N`3U

delta 566
zcmXw!PiWIn0LI@-($qpb`ufkubZfGyO)D!~VPmZ`J9G$YY@znh<K{sqo&;qGvd$p^
z4}#-)5fAD?FH;bQAbRN-J4DT)U@rwJMZ(t6Bq~e~)700^p1vP^f8bkoqRUS7!5z4{
zx-tnrufDs=4A?|~v1H5)oX>vizzbTNQ;NBg-e#0yjdCGZ`e`ys;g`uN*<9(R#VFa=
z>o;Kq!rx?%Nencs=4N$A9|Mi2ZPXxR>>@Ruvn7VHNtdl$GU{7<nTS92$JXDovY-dR
ze7R3ouJx&9^hwUp$U!cHd#xWEwU$;l4kt)F6eF*=8MsY$xgso+S(m~DY;xZfKe=d1
zg3P84O8Rvm@cIq#@sZU!Y@)ALb6?vce_eOeYgU3s`)y6`Vnzn32&#+S?nu<Hmu-Qi
zS`$y0dU{7YEfmgO7S<+`6G9^4%U=}92YxbW)CV0PA;%~A%x3}@+zr{p>pljjh~%CN
zOxaFJfWbj0F3mXN^t3)pmfT1Ad3$`A;$ye+=ExUse!*(ezq$w1He`rR8Ky+P+)a%j
zl&6jdhybK%U>HOI5A;f>x->fasUmUusZQv4{l8oD8>lzr0mK_l!n5Q|_!fLZ-iGJK
zhpfzZzXOFKdbEx1Sxu^R58bB3^@x_R3q7>3Ap;F9tj8l&xPny-Rm`ZERWYYxmx}op
H*uDJ^3l!e6

diff --git a/software/roms/rfs.rom b/software/roms/rfs.rom
index b9f8c83f7cd1efbb95dd6fb04f348096834ead5f..6aefd6e59e48dde4b694fbdb21748d6e9521bba2 100644
GIT binary patch
delta 552
zcmYjNO=}ZT6rDFSNi8}uV@w=_sV|L;lawayKy3^%SP~44Lt0`MvvJ`<x1#ugh)I+#
z>OyFFe?SEnA}+K_ML{Cc#i$RAm?DCVRRSH!ytJU8L?*sk7v9Y|oOAEt-dn4IS`Exy
z1(o@0W8m)mlT&P)APDv+zqEHuX1}&U!E$(`Tr{!68s!G%rJ{M?WsTAUmp8IS^EzRT
z?2U!<pb9_}{a_Q@7m59{zKVyLk2f7@5e;(}sd0xh+0O*^xN4x;%7jGicPA4TJw{2X
zta2PJ^CnnADPI{(qZyyU{vzm|FP_(2bzJ8(d7~YlVPIr)Qd%Rnv@Y7XpUG@`=a^R)
z$jU$W8L_+8(tk||`e!n;B;l93j-~fxR%f)3)Qt9egL_3h-GLm%MpSU|!BuMrmW~{Q
z_ePVWFp&_Zjz$Ia$v>7hrY3Te#XJ;R&9KL)k|(HwdkgY`Z(TC<ys=_csQQzt-^b;3
z@5Bf1^4n!-;Ru@O%cUY6&x9Zl_TuUxFPctcr2`KH;<O&0mYu))KB_~U?~Dv!1wHCB
z(A?JD54XJEmM#z*KjrADjTbtQT^(pqQSWJkl9Z-SKQq9D7(aun?Rq5^dtFs|th9IT
z5ebR~lR!bG;3Y7N-UM?aev(-eJpd#04~}$}*c559bdoZDgV8YACtV?OOJ^*puy8n3
L2Xu{Hw`KJYj%nXV

delta 545
zcmXw!J!lhA0LS0EyIc$;B`;qd)z){dHJ3<38)#`_y$&gYdL|GvWNaOT;3OzTkS2<Y
zgJ5|s;@}53RY5F*=#o-8oce}<SppJ*9BoSOPKDN?dhw+-)Bgwm5BOIquu_2!@4$_f
zyHoJX%KNL_fK4!rCZcBGeCB%xUeMcuR>&4<o6`z4#`$dVm&s}QJyXy!+2SjU(=u<?
zZo)EzzsW8aA81(3jp{ZX2aRWK)F9*h5;I=%MUJycmoHy3>YKaih(GzqrXP3}(*Rf~
z_36sBKDCTKsc9BD$fc!T>*so{rPqza2@(rM$!lR2Zjl|K083=frEvk9JaEOvmP`e!
zeDa_~uLCU78{pGpt995!->l}ozDfSN?xj|(xQO=Ky4saE6(l35E_b^lC;YTzW1eYE
zK55d_wtgDt&t1l=lZi<jkNa{LW%5y+3L5o62Pnw#DL(T#7J@q=n|R&F;51R(^MPsG
zDPkBLbYjY^BhSpxIkN0NDlXU)!wjFewYNvUdUK0bll`S0P+M1_WU4SJ`_*o81fd*r
zJU|8@#R9`10z^Q|o$B)F=;yK`&{Lhz@%n$a<~LAp$ODKsoPcM^neZ+6l)MYiPYhY<
pAASeoA$GKl?psZ!Y!BULB=m@tBo}&QNrnn^w73?FRN)Ir`3GsI*i8Tc