From 952489eac40c302d61fa1bf869575104c24b3d1d Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 29 Dec 2023 15:18:34 -0800 Subject: [PATCH] Miscellaneous - Corrected inconsistencies in CPU oscillator speed configuration for Z280 systems. - Updated Bill Chen's ZZRCC monitor from v0.5 to v0.6. --- Source/HBIOS/cfg_rcz280.asm | 2 +- Source/HBIOS/hbios.asm | 9 +++++++++ Source/ZZRCC/zzrcc_mon.bin | Bin 4096 -> 4096 bytes Source/ver.inc | 2 +- Source/ver.lib | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Source/HBIOS/cfg_rcz280.asm b/Source/HBIOS/cfg_rcz280.asm index 3b70b249..39ea9909 100644 --- a/Source/HBIOS/cfg_rcz280.asm +++ b/Source/HBIOS/cfg_rcz280.asm @@ -28,7 +28,7 @@ BOOT_DELAY .EQU 0 ; FIXED BOOT DELAY IN SECONDS PRIOR TO CONSOLE OUTPUT ; CPUSPDCAP .EQU SPD_FIXED ; CPU SPEED CHANGE CAPABILITY SPD_FIXED|SPD_HILO CPUSPDDEF .EQU SPD_HIGH ; CPU SPEED DEFAULT SPD_UNSUP|SPD_HIGH|SPD_LOW -CPUOSC .EQU 12000000 ; CPU OSC FREQ IN MHZ +CPUOSC .EQU 24000000 ; CPU OSC FREQ IN MHZ INTMODE .EQU 0 ; INTERRUPTS: 0=NONE, 1=MODE 1, 2=MODE 2, 3=MODE 3 (Z280) DEFSERCFG .EQU SER_115200_8N1 | SER_RTS ; DEFAULT SERIAL LINE CONFIG (SEE STD.ASM) ; diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm index bacea45a..f42a920a 100644 --- a/Source/HBIOS/hbios.asm +++ b/Source/HBIOS/hbios.asm @@ -2094,6 +2094,15 @@ HB_CPU2: HB_CPU3: #ENDIF ; +#IF (CPUFAM == CPU_Z280) +; + ; Z280 ALWAYS HALVES THE INPUT OSCILLATOR TO DERIVE + ; ACTUAL CPU SPEED. + ; ADJUST HL TO REFLECT HALF SPEED OPERATION + SRL H ; ADJUST HL ASSUMING + RR L ; HALF SPEED OPERATION +#ENDIF +; ; HL SHOULD NOW HAVE FINAL CPU RUNNING SPEED IN KHZ. ; UPDATE CB_CPUMHZ/CB_CPUKHZ WITH THIS VALUE. ; diff --git a/Source/ZZRCC/zzrcc_mon.bin b/Source/ZZRCC/zzrcc_mon.bin index e9a04d7459570e959ce63495effc30735dc8ab69..cedad49d6f9b74fb88bc7e5cdf0c3d68205ee6a8 100644 GIT binary patch literal 4096 zcmc&%eQZCpbu~ znyP93c<-Eh&OPVc^Sk%FcV=h*zaL>%E)}lIB|@HT5dI}EzqI^%_r!<2J#w*ZEP2GC zUY#C9MV<080aK|a{)gUtl~OkVegW4uG1?~V2>P8Z2L+~E#c3zT=_O%iq3_uH3d3oaEARyeI>L;54r$OcbV|WQ@Qq%e{j@yZwmnEg0FZnK7 zK4qN$UBB~C>y0+|fm?7t?|CKld^a4;kkCw$kY`&Xkzh%TdQk59Pa&=$A)4kwgpH_% z2%8W_9bgWETLZ)zNr2$~%%X1yFTY<6?^&l&^uI@FA%@WtQuJq1G(QqGMxs@bs#yXL zIg|;D6usZKP?RlYuTiabQ8c?+SR|>=5 zO4uXU_bFTACx(=|_=b?OIev3g*&4q*s5HhG4=LN?>xPtu_~)ZaQ~boRvNyhKSgDWi z8&+!L<`HFQ9FHnB@!t z_f*~R#EwB>bM#Fj<$g>2!_Mz+xD2Sk$mOF5Xj3u14-6>dEdXsYADz>ca#!!9#&j>u zz-1LT2Ds@~a)=DAuyfKo)9(s}1HiD&2ZcLQYK-gd)~$vk4PaG5=GX#Z6Z^HW3&;e? zD}EgP%>dUqMvz(^QL6burH0olwY)*8yr*EEg=#ThDV!8k}hEWQIQ&m^vd+CTVdLl4khIOSkmI6=}hqrpw|GRe(%Z@!J#|uTj>=>xZLn4{)E-r0rUmG&m&aZ#sQRH+_OC zC;1}vDLP-gjBJwR3*CGEd<63i>U{Te=cC;DP&K$xf_Oe+HJpZ0v$+Z!IwQ>bOktdf zVDf}F`;HCZG+F--NG3Q3&FUOzP*b`3g(D^@yD{hk1Ifj-G(!QFjpQW(mIp3$di5;< z7FdFTPpSybBw9no_#Qc9H=7+6Y-RLWTo| zIl9+?9sv#Oqi;a+GKXA5@|F9@$&qyTW=}zvte5o_$CZ5(pO0{-$APVwxHv+<%}7Z# zx|zf?XNnvtifo84&OJ`>;DxhfWUs;W7*|0SoeSTS@=^%;jN#|#Npk#<$!B`9LYNKX zdx8?dDS#73%|7#?Co2He`=ChlVXSKe*O|J8@usZ)ZKD5WRv*UKnn9zC&PpW;!a^hD zOL!A5PqIb(mykPH4UugjvTbky22L5tqM0H|&t>z$xJx#{5#&r65Cdcjvq0VqRBfS?%iy`*Q z&M>}4fDp{!sJvVPx99Tos9+rS;0(JcCkmZDnf1xwhcl|}f^e6D)4d_(C+WTrEwd)( zJo`^lQ)1^D3gL6TF!9$Am~NjV#$%HouKm*+Yh%Yi={Qlm0QER=HoOEryH&Dp8ulT2 z)x04_;JPVbFc5>M6Qmgw`9u52Ue)j^!n{3YQosG#(UoMhKH;NfUBed>_7z~2+1S); z>X#jxDxX@F`!7N4IG8EQ{rB&SK{?Nd^7$1Yma{|GDEM;8t0zlSHaivH2X^7K`enk<<#Oj^fcT|?(#zKQ)h zS*fs^WaTWoC|L>5J59?(?D#xcUmB?(22nb1q5J)Ec;8Ibk zHFFnaTC@_CBRl#&+Kb*ro#+?nV>G&C6vfdO=oU&NymxO?Z7tsJ^|+x$z(=f=8*r6% zU6pN}?R$(CFs3p*_H0pI;0FaFZB3?DycH7mMv;%i*AiTfA*; zPLB%|vlMnVLu(nwG}suxXtTw?{|x?N{n}Q_(c2` zvFr1DTSU=?a}0XCLF{hxwTf+`hZyz}J<`-bM0RX#N0|0Lc0#G$4@f{B0{lH<;Az?7~BhoRwjt&Qj z1iVAkRN@W<)r0B?n0Tk#gLy#hb&!yx3>5uR(sD5quYR`pX=Uyn#`vNn#o zg9l)F_4N>h==Wxa2{Z2p7_YB`M3BWz%UCUzW@siW7Ic#VV6*Kcbd$j3bd$KHRdo6( u>TvPX_R%c{v`jU&Sg_0QJ|g03m{RkUt$}{D_9T?9kBm(`|xid2zc}W delta 2723 zcmZuzeNY?66<+}sLP63U2snsa-=a>rf~nz(6Gx$EzKlri7$%J;j@!nQPCaR+oy5sZ zgG`Jhrj6+|o=F`w?R474Go8{u`VTG~pE~29i>dG8O-)t%4-1V^sDu+oP3?q~$m64L zPvGE8rP1E|+V_6@_Puus@gY9=(hK<49QB(DBrLERFUEYf1ETpEb6(nqn1cttuC zEgl(;mBrk#(&ktR4xN!2Ou0?}%19u_Y>(EBs7St#JhjmAD4Ds|FGsuHlk!wcygHSl z$SlKRrQ9rXvc!uOGPWa*B_|aL#cn!RGUudkGqIbQbL5l)F=%8bgAwv_a?I_mkYlBi zC00TMlIXYR~bC1K&-oAs>~>Zin>g3 zl**DtbjuVO1;hZL;dMO!7ml04Dcyj>Z@?MJjDWNm+yM|b5N=rlAeT7gtt|W;OL@>b z3K1aE7lWt>`4i4HlD~9uHmNxgCGy|XZdC5KB6{5cS2{G%Euo+LfO3U=*a@;h_^gC{ zE6M)kSlXg(lpBjtW$Hx_e4&Q);(tM9ur5S~mXfK*4j=oq$N#41^i{4R~6?cRwfgcAVI){eFah; z84UlfU|TS&kbnX^$iXq5Gpomvs~!*xi&e6CzswbZYs{UchCtj#)h?L~DZ&;qs&Jp; z8dEW&7+yU%X4r*K42SRmxum2I8(q48!syU1P8)ml;I#3Gu8kYr`hUiaefs?qhEM^K-aU@D(+J#e@B#Drnz%Lm+?Mj- zR#`La>4VvMFVK*KYE~wJ$P?W@Sf2^e^?7qOknpf!5$cSBXv=uW*JtFx6SQK9Z0bce z_sn!mMw`c_J?ev0iyLS-sJW0YfzcU|Bzh6ho-+PpU<$#S?;iBenb(h{B*)@k>qh68}$o9Wd zyk^}+-;wVrJo8)_nFf%rMq!^J3Kce^Nf#&8t})zX=B9N$H~%ce+sxcRL%X>Y%?i5p z1sk^w=kmA725q)cKOVs{#b!mE4gbNU);1ep^p>=C)T8jX&+@BK4RuG4kMUW0kTgYu z=S@r->4#Z@3%4Jt;1{_GTFvkS7>WHdz~ zlbfnc?HQrP=@7O+3)?iw4p%#@Ne=TtHBUl^EwHbLI42yRMXQ_@;IKbrQ#mh5vR)O1~K9?(22Y^MHb zNmG3f<)EK}&`^Q{mfoDy!x5vN&#&X=3`cZX_HZ*)zV6M*++{X7u8Q<2*=70Vv)S9z z+;X47F9FJwR0ol2t7M3K-ol`wS-9FHm%j;ylSz@&K?(($>C?`d+rL4~YIDD=dAFrTI}S$u)bKLQC2~k9gwGQ>a%7$k z(1+?C(CUuXz3{%og9D94h&((>Erk~j(;Bb|8OnV39Z&8%x-PAv(oSME=bKF^qwIsk z8s1;r#$QtAVJk>3T&A(W$A^Z4FPP|?*J!E_h0hdM)buHaef0{P^(%9BgIT>&n|&!q z&6Urwa}DRTz{CZx4*$EjQXEv^$A4QOIpTI@)RU1{;rG#&$fPg;B=E$&a_C@`IA@mpzpaX`~FZ{3M21qu9( z47onwtvzwYmcTwrbDrnFiuwx^TYK;H8?0p6Wf@NN7SuQVIATEp&md&{Y0COPB~EDd diff --git a/Source/ver.inc b/Source/ver.inc index 2d1e939f..6ca89abe 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,7 +2,7 @@ #DEFINE RMN 4 #DEFINE RUP 0 #DEFINE RTP 0 -#DEFINE BIOSVER "3.4.0-rc.1" +#DEFINE BIOSVER "3.4.0-rc.2" #define rmj RMJ #define rmn RMN #define rup RUP diff --git a/Source/ver.lib b/Source/ver.lib index eb1f478d..0ac7cc51 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 4 rup equ 0 rtp equ 0 biosver macro - db "3.4.0-rc.1" + db "3.4.0-rc.2" endm