From 4e1f35f813973bdcbca817d70f5b161dc751d6ce Mon Sep 17 00:00:00 2001
From: Philip Smart <philip.smart@net2net.org>
Date: Fri, 29 May 2020 23:38:40 +0100
Subject: [PATCH] Updates for the tranZPUter development

---
 common/tranzputer.c             |  21 ++++++++++++++++++++-
 include/tools.h                 |   2 +-
 include/tranzputer.h            |   2 ++
 libraries/lib/libimath2-k64f.a  | Bin 12504 -> 12504 bytes
 libraries/lib/libumansi-k64f.a  | Bin 124218 -> 124218 bytes
 libraries/lib/libummath-k64f.a  | Bin 2660 -> 2660 bytes
 libraries/lib/libummathf-k64f.a | Bin 63972 -> 63972 bytes
 libraries/lib/libummisc-k64f.a  | Bin 6222 -> 6222 bytes
 libraries/lib/libumstdio-k64f.a | Bin 80050 -> 80050 bytes
 startup/app_k64f_crt0.s         |   2 +-
 startup/mk20dx128.c             |   2 +-
 zOS/src/zOS.cpp                 |   2 +-
 12 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/common/tranzputer.c b/common/tranzputer.c
index 00d4e18..b2d996b 100644
--- a/common/tranzputer.c
+++ b/common/tranzputer.c
@@ -1937,8 +1937,11 @@ void loadTranZPUterDefaultROMS(void)
         {
             fillZ80Memory(MZ_MROM_STACK_ADDR, MZ_MROM_STACK_SIZE, 0x00, 1);
         }
-    z80Control.disableRefresh = 1;
+
+        // No longer need refresh on the mainboard as all operations are in static RAM.
+        z80Control.disableRefresh = 1;
     }
+    return;
 }
 
 // Method to set the service status flag on the Z80 (and duplicated in the internal
@@ -2867,6 +2870,22 @@ void processServiceRequest(void)
             status=svcCacheDir((const char *)svcControl.directory, 0);
             break;
 
+        // Load the 40 column version of the SA1510 bios into memory.
+        case TZSVC_CMD_LOAD40BIOS:
+            if((status=loadZ80Memory((const char *)MZ_ROM_SA1510_40C, 0, MZ_MROM_ADDR, 0, 0, 1)) != FR_OK)
+            {
+                printf("Error: Failed to load %s into tranZPUter memory.\n", MZ_ROM_SA1510_40C);
+            }
+            break;
+          
+        // Load the 80 column version of the SA1510 bios into memory.
+        case TZSVC_CMD_LOAD80BIOS:
+            if((status=loadZ80Memory((const char *)MZ_ROM_SA1510_80C, 0, MZ_MROM_ADDR, 0, 0, 1)) != FR_OK)
+            {
+                printf("Error: Failed to load %s into tranZPUter memory.\n", MZ_ROM_SA1510_80C);
+            }
+            break;
+
         default:
             break;
     }
diff --git a/include/tools.h b/include/tools.h
index 8856d0c..8758a14 100644
--- a/include/tools.h
+++ b/include/tools.h
@@ -103,7 +103,7 @@ extern "C" {
 #define CMD_APP_MBASIC            141              // Mini Basic
 #define CMD_APP_KILO              142              // Kilo Editor
 #define CMD_APP_ED                143              // Ed Editor
-#define CMD_TZ_ZPU                150              // tranZPUter interface/test.
+#define CMD_TZ_TZPU               150              // tranZPUter interface/test.
 #define CMD_TZ_LOAD               151              // tranZPUter memory load/save tool.
 #define CMD_TZ_DUMP               152              // tranZPUter memory dump tool.
 #define CMD_TZ_CLEAR              153              // tranZPUter memory clear tool.
diff --git a/include/tranzputer.h b/include/tranzputer.h
index 8facdd7..16f1199 100755
--- a/include/tranzputer.h
+++ b/include/tranzputer.h
@@ -115,6 +115,8 @@
 #define TZSVC_CMD_SAVEFILE           0x09                                // Service command to save a file directly from tranZPUter memory.
 #define TZSVC_CMD_ERASEFILE          0x0A                                // Service command to erase a file on the SD card.
 #define TZSVC_CMD_CHANGEDIR          0x0B                                // Service command to change active directory on the SD card.
+#define TZSVC_CMD_LOAD40BIOS         0x20                                // Service command requesting that the 40 column version of the SA1510 BIOS is loaded.
+#define TZSVC_CMD_LOAD80BIOS         0x21                                // Service command requesting that the 80 column version of the SA1510 BIOS is loaded.
 #define TZSVC_DEFAULT_DIR            "MZF"                               // Default directory where MZF files are stored.
 #define TZSVC_DEFAULT_EXT            "MZF"                               // Default file extension for MZF files.
 #define TZSVC_DEFAULT_WILDCARD       "*"                                 // Default wildcard file matching.
diff --git a/libraries/lib/libimath2-k64f.a b/libraries/lib/libimath2-k64f.a
index 8fb4532d06bcb0008b759a029f3788b9ad264f15..1382a59fa95e7b2c4a197e9b05950911428eff33 100644
GIT binary patch
delta 66
zcmcbScq4IwEUTrVv9akyrFsZs@;XWJjeF<tL3o?v_`SKH%yp9WJWw@p{NkHE)%v*r
Du`?4{

delta 66
zcmcbScq4IwEUSsBg^A@vrFsZs@;XWJjeF<tL3o?v_`SKH%yp9WJWw@p{NkHE)%v*r
Dw+0i2

diff --git a/libraries/lib/libumansi-k64f.a b/libraries/lib/libumansi-k64f.a
index 8ec43aabfb785884315ef72bb87c14db1230aa51..ae91167dfa6e0d2ad304d76d2606954cb42e6c89 100644
GIT binary patch
delta 710
zcmYjOO(;ZB6z&*e#>mT*c~8v9Uy?%am7kPCHWZ2yn<-X9N?D>=jfI67Z!txr-cGY%
zj@%kWqU5JM>`;UhDRyi$?wfn>%<Rs0&bi;ux$*Pd_<3%qET^?eRkfXp_pD^4qGUU?
zvr?CAGJZOb)6i{P6mx{8*T`dgk<B}hF;qM0U^u2Wr=Q3;)PA1{`+D{TG@}Yu4}1tH
z+5EULIxL{+^<m3I7Z<_6)UuS}tA75LFRrLEmM)H`kb>)>5<y~d)~pIn3>dw9f@U-!
zmQ1g#OFwmy=_2sxjpf<cLi)KZy@4BzL#J4^_&jHVPv1@`7`};RPGb+LX<*8Ym2al7
zO=VE}SrdV_6IbFLjY?kaAhPP*5TS-<(nb{WR{~q9H&L0KR6z$jx@H+A-UhhLPaa7l
z-)->1cD2aU2Dr&rH{?0lkTqO`5GrI1D+oFA0Z(GF`N^{%codB~QpoTu1eqI+Jk7zQ
zV7I=XJOn}KRv7zI7zPTs7pm{#HD&UVk*LV3k<DEg<4k)8U<gtw&`CZ{VVyUU`HXA$
K6%MHCs^cFz;MZUP

delta 710
zcmYjOO(;ZB6z&-EH}W#&y*J^>Uy`DR+@ut;p-`0AOtBhL$`Z|rg@qY!F-4@_PO}(u
z<Q7Gu<flCBP=pjIc5F26n|m*_JKs6yen02#oM!HvW`>G08X8Fh*(`faOIA&&xc0Mo
zX(}!a-`$7*P_@nq1wz}fviM$P{RT7)RgdLx9QQT-Khdzi<u(;|ckW7PM|G_1eUnge
z1#os~KtkK_BN=TMA{ZQBR8oA^&RmPdC7*^x^CN#q$JLNmk~o}I%aRj=R+pHd9Zkq3
z+t5tqt0pp003~L9X*v?xBV^ePRJ8Wpa@FB0Igxy3ETLogDxNxx-~CO4<0_WF*wQwW
zLFH>j28tyv<U1CXK4*i>Y6?S?8Jgtlgc;H4j~6!h8)Di~jUH7%D?hq3SE*44=efxv
z5&GE-PhvOnum&pq=zuIYAM%E$4?_98;RK-veh^6<wg7z$fQZ7>44n>4!JKeIAEx16
zvOC{T@8-Z1Ryg}Y7<%)B7pCtKHDmJA!Klni==v563#RQoup}uHXrph(uqqnKeAXp=
KO9xDKIp-IiaM=<7

diff --git a/libraries/lib/libummath-k64f.a b/libraries/lib/libummath-k64f.a
index 6420cd748b666426e36c98c92293ed604ff3fed8..175dc5fbfc9f254b3b17f4fc3dde96a0a45203bc 100644
GIT binary patch
delta 25
ccmaDN@<e2UEUTrVv9ZZSC3gs8W8ODT0A_~=$N&HU

delta 25
ccmaDN@<e2UEUSsBg^9&PC3gs8W8ODT0B1M{+5i9m

diff --git a/libraries/lib/libummathf-k64f.a b/libraries/lib/libummathf-k64f.a
index 292edf2d84ee6562bdc56e3e1ba6e9437b1d7894..8888f23dbfd787ecd2c801e51a48a3ec8bbe7b50 100644
GIT binary patch
delta 312
zcmaFznfb|Q<_WT_mWIa0CL5LH86m96|6Ig3$1-N{LAmSJOKg6`e;mr)yiTs06C$(O
zPGd5ZIeDF&#O8N~+AtY8>)SBqKbPOUQ1$<UjG@fQ=Wa=C_DkS~DT>QHjF6GsY+o(}
zGZ^HU+=dE%sAJ@;B{nlnSPs*-Zsv1jg&P<D;D*|@ZvA?g2kbN?H&^c~gDC_#mG6Wy
ljBBT{Wb>_y?>V6Q&fU_7$;eqdZFYGw6UGI(<mcPh+yJ{5W`qC$

delta 312
zcmaFznfb|Q<_WT_CZ-l978{l186m96|6Ig3$1-N{LAmSJOKg6`e;mr)yiTs06C$(O
zPGd5ZIeDF&#O8N~+AtY8>)SBqKbPOUQ1$<UjG@fQ=Wa=C_DkS~DT>QHjF6GsY+o(}
zGZ^HU+=dE%sAJ@;B{nlnSPs*-Zsv1jg&P<D;D*|@ZvA?g2kbN?H&^c~gDC_#mG6Wy
ljBBT{Wb>_y?>V6Q&fU_7$;eqdZFYGw6UGI(<mcPh+yFZpXHx(G

diff --git a/libraries/lib/libummisc-k64f.a b/libraries/lib/libummisc-k64f.a
index c64e6636faf62e3d4b82a707614eab137b469552..029e7d35140c78bf4a333d1b1827208e1f03cf8e 100644
GIT binary patch
delta 36
jcmX?SaL!<YEUTrVv9akyr9cQ{V}(2qgtd7N&n9jF#5@W(

delta 36
jcmX?SaL!<YEUSsBg^A@vr9cQ{V}(2qgtd7N&n9jF#q0`G

diff --git a/libraries/lib/libumstdio-k64f.a b/libraries/lib/libumstdio-k64f.a
index a28319e9985ce66854c2435d39b2bd8775b84071..a77edb219bcd7b64d8fae402f23a214a8a947497 100644
GIT binary patch
delta 348
zcmdn=k!90ImI<<~mWIa0rW=(?8Nn=*$sd9xHg93{=7n>`H%s#$;em4{Hvf@UN63n8
zw$pqm4VM+)?CiRN55nF2As9uWQKF>`RHmSIJ~xsc?amB{1*SmjqbA$Qux<V^^*BOE
zeDm!^JCM2S*Pnnm0i;2E^W?o}V6p|Z5}RvIO@^2bk=4GY0h0wO&VN*btoQ$W5oB5Y
qKOsom?ejSp;nD@Q;@i)QFsg8YT@E&TJHI?*1wy^V_9fbke7pc@=ySCI

delta 348
zcmdn=k!90ImI<<~CZ-l9mK&8y8Nn=z$sd9xHg93{=7n>`H%s#$;em4{Hvf@UN63n8
zw$pqm4VM+)?CiRN56rdP{2>^s&=P2>*k+?dOBtw4LG65Q2ooqHzFE6717ZP4Vbo+h
z8Me(orXEKKiEqBWXa_QP{rVFSCxA4FZ=SsO3{1A5R$_C_smUm&U(<lef)wXJDnZu!
u|GfyZtp1-6B<}Y49E@=3f?DzI=S3J*xDYPi&M(hcflx28eTg<BA1?s?ade0P

diff --git a/startup/app_k64f_crt0.s b/startup/app_k64f_crt0.s
index ed26070..0772580 100644
--- a/startup/app_k64f_crt0.s
+++ b/startup/app_k64f_crt0.s
@@ -372,5 +372,5 @@ BSS_END:    .word      __bss_section_end__
             .equ funcAddr,  funcAddr+funcNext;
             defapifunc      loadTranZPUterDefaultROMS funcAddr
             .equ funcAddr,  funcAddr+funcNext;
-            defapifunc      convertSharpFilename      funcAddr
+            defapifunc      convertSharpFilenameToAscii funcAddr
     .end
diff --git a/startup/mk20dx128.c b/startup/mk20dx128.c
index 373f869..0089c28 100644
--- a/startup/mk20dx128.c
+++ b/startup/mk20dx128.c
@@ -1021,7 +1021,7 @@ void _ZPUTA_Vectors(void)
     __asm__ volatile ("b getZ80IO");
     __asm__ volatile ("b clearZ80Reset");
     __asm__ volatile ("b loadTranZPUterDefaultROMS");
-    __asm__ volatile ("b convertSharpFilename");
+    __asm__ volatile ("b convertSharpFilenameToAscii");
   #endif
 }
 
diff --git a/zOS/src/zOS.cpp b/zOS/src/zOS.cpp
index 3dc8a1c..077516b 100644
--- a/zOS/src/zOS.cpp
+++ b/zOS/src/zOS.cpp
@@ -283,7 +283,7 @@ printf("Got an IO request, addr:%02x, Data:%02x\n", ioAddr, ioData);
         // Indicate the thread is free.
         //
         G.ctrlThreadBusy = 0;
-        threads.delay(100);
+        threads.delay(1);
         threads.yield();
     }
 }