From 44dfb7f39bb931d6a24f3be2fc4f15681b5a6df9 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Sat, 29 Jun 2024 00:44:35 +1000
Subject: [PATCH] fixed bug with call PrepareToBOOT from ABOOT with interrupts
 disabled

---
 Shared_Includes              |   2 +-
 src/bios/rom/SETUP/MAIN.asm  |  11 ++++-------
 src/bios/shared/RECOVERY.IMG | Bin 98304 -> 98304 bytes
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Shared_Includes b/Shared_Includes
index 1cb8eb1..d294e37 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit 1cb8eb13fb8e8b20bba324a5ab9f4e18d6bf8b3c
+Subproject commit d294e375826854d80b838ea40ca4afcf3730a141
diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm
index 1ff9acf..4c8d145 100644
--- a/src/bios/rom/SETUP/MAIN.asm
+++ b/src/bios/rom/SETUP/MAIN.asm
@@ -675,24 +675,22 @@ INFO_MESSAGE:							;!FIXIT 
 	CALL	PrepareToBOOT       
 	LD	A,msgStrings.bootFail
 	LD	E,COLORS.CGA.INC.LRED
-	;CALL	C,POSTMSG
 	CALL	C,POSTMSC
 	CALL	ScreenPOS.CRLF
-
+	;
+	CALL	INT_ON
 ABOOT:	LD	A,msgStrings.bootAltDrv
 	LD	E,COLORS.CGA.INC.LGREEN
-	;CALL	C,POSTMSG
-	CALL	C,POSTMSC
+	CALL	POSTMSC
 
 	LD	BC,CMOS_CELL.BootDrives.Mask.AltSysDisk			;#7010
 	CALL	PrepareToBOOT
 	LD	A,msgStrings.bootFail
 	LD	E,COLORS.CGA.INC.LRED
-	;CALL	C,POSTMSG
 	CALL	C,POSTMSC
 	CALL	ScreenPOS.CRLF
 
-;NO START DISK  - RESTART / SETUP / ZX SPECTRUM mode
+	;NO START DISK  - RESTART / SETUP / ZX SPECTRUM mode
 	LD	BC,CMOS_CELL.Options.Mask.RebootMSG			;#021D
 	CALL	G_VALUE
 	OR	A
@@ -892,7 +890,6 @@ RECOVERYstart:
 ;[  ][  ][  ][  ][  ][  ][  ][  ][  ][  ][  ][  ][  ][  ][  ][  ][  ][  ]
 ;
 
-
 PrepareToBOOT:
 	;CALL	INT_ON
 	HALT
diff --git a/src/bios/shared/RECOVERY.IMG b/src/bios/shared/RECOVERY.IMG
index 6db19a1ec34ecce150a547a08b93fa602a32b71e..7420ffab263c55ce4aef1329d862138c2585522c 100755
GIT binary patch
delta 2337
zcmeHJUq~ZI9NzIy&h$!j&yo`DU3OQ6xY80Lhq<lERecc5gAfsWhH{02KJ?*yD@wg4
z#_ZJ2-Kw}Ah4#U=a)h=N&xEjswxV}U??SpgqZYH=ZA0!zp)6BsTcH*jJ2|2Dxqs-3
zu){9QZ@%w0-+aH{PAFswg-o-HASkbFJa;aHKE3$Gf=E+qwsg_pLP)(N;y@VLih6;M
zAl!!o3es&jkU)5tMBRV5=RMeZC<JAD*2#nr_LJ3x!{vX@p_0{YV+1uKk7TVCuZeQw
zP;*6Il)Hvn;;SGDf(qgi2;2gBmmqG1)#WhzQz)lSL|F4gj*p}91alGxmJv(6fc?%2
z?}5uNDtj9LA=3CIM95Si*6cc3YTVrY4+w;}!o`RrMz{t`>}GpdHA6!)G!nQC#GjY8
zI=yw^_aGkg0+St&2|)I#=UWCMG(+h&CuquoM-!=H@phBQUzwr@Kf?ZwwUo|!rc71x
zOI6Qz5&<qhp}%rcFOaMSDnth%7zFv<^^vhOOHo_|aaYljYYGv~4(CWvKF6|e(wF4c
zuespcaAenVA%BD}%)`=;IUYfhv1=aj66C@NP!tYahp)$&C$aAa93y}@un6%0M8XU#
z0Y|lmWLsGt9%i3=3*nwwgnbB(Ml<x&hflwWGWc0Io^aH(Ep_H_xAQlnKWL&{5;Aks
zsLVKzegF=Wz16-6C%HMq&p|>wp1AeiB)<T$?|qmmF5$ow8sZ=G_IeyAS`GZFQMYfR
z1PS$<ouD53Bv^h&yM0*$`yb)%EWz#fIOxURvD!>$=5(eZ(^$J%m>li)8S*dH4Z$cZ
zh1|_$OA%}<rSW0%1<`l4j+$PZhKIGfeWHOz#N<DQIPeKnhax)JB$3wZas|n$Q|f{k
zO>0Fhn*yZ+vl}!X?!|0x&D3X3*`2={-{=J#n11Y6BF*r6n!k#4o+#z(QV3lF>1I4E
z1X0OFcEVJW^?Q1;NDh+@PL<D0{W4O}3+uVHQ2;0s+t=n{^p3QJ*4c~lnT==LuOq-v
z_+~VX2a>2ra#05&f2|N4NTRX}8F#(Fh`koSAjofQSeuiCeGb{UB+?36;rxb|@({n?
zB}UB=qZ+rXMN(1!xE`y@^%$$Mnku`%1KDOdU4F;US+0zpI0YWO*h6i{KZi|iW<>(k
zAfFSylD}WJpS>d~9d|trtLu)$rzGrCB{P?j+UQCuiv2nE-D~uPY48ldH-(N#Vt1Vk
zT9G|5C%7SBjtNg41?(P8e->jwO8z#+H4w5vaF0*Skjf%}9qA@okt{ts1fwC|Oe-_&
z%8cdAPFhfAEMSLSk^AF)z#V@l?y?>CiQ_(T+$aA1KJj<{+uPZDFaJ+>24%G!Gy(oU
MzndtlXF+%0AMW=)EdT%j

delta 1808
zcmeHI@oO7Z9KY9W*ThNMv!jyEwYh7B?1~z0)5KeoNedR2AEFuUv|-?W&>#F^1%I(&
z4ZWqwTl(6xrH6vT5DgMkBwKE`fGD(!fyHpN$p*b++(MWUBtBV{{ZPTwm+goC6NP)c
z2k*=0^Ld}|=gUbFElKohT1iV6K(6BxFsC9;LEtv13Esrrn07P9{w?WRJkHv#===>d
zt2&S1a2B!D8#v_d@b3w4C-RRCK7$PY2gFe8+Fsnc<9gBR<?eq?Ap9Lde}dGA2)5Yj
z$(Ys&n?}<hh4=R2|77ou_`AV>b2#D$^Z<^CKn`eUT$6FeNtq5e7_5MYSBi~Bflct2
zlgz|-IOJI`n(XN$eTYrO<g9jjL`CMMXUq?em~|ptq$DN^!33!7Y)nT=EJblK#4Vt#
z08zuNKfNPGHJu%}%3PEyhq$><;q;FEz1lv3xCUE~bUq1*XkiWUi;$BLpeP)c;pLq3
zSsX~i2m!?5uOL1bM`8-Lfa|c22)4AB&$-K8MR;r(;Xo43WXjC*Pro2dHTh*YtGcYi
z*%2L&y8mqk=V(e;L^f^-wHepYU%*8VoEWGs%yX-VUxkEtR=u5`=dVE=_!1TySsaGw
zJpY7u+~?{%(ZnA$yLV|yTtq>e8}#77B5d!O(Lkk%Ll5z2h2RE#E+#!5=_-$ukC*$(
z$GWP&&CiSmn(~{QeUsn7mgF7cW8_T`^-=~eky9M~-sQ56I}AK!bng-m3}Pn#EyUsP
zp*9sa$s>uienE(m##7q0M5bgkj7kx-_H15oOk9&M(nsG}LZ$<Ui5F8FC4K>!Jh3LA
z5_r<BC~65rwbMfMJvME4%4{@9^O$I|-6QRnc-^dT=<728P(J4aPsz@h>;>7m_0mZh
z0Vjp8XG-{79yJK9HW|lZk_E!05H1|fqju(;-X5_(F>ViuURm1e9m*5pRpj9E$fz6j
zGh2SjN78wR#8M}*Y!)mDF)IJK^|D-*rgPR_+H$k!zU;6cZ|}<M_UKHf<2n7^F{-Nk
z3<rm8Y6=_%HC_Bw{^Q2LtHo5_bI0fE6^bdokivm-%ElE^!;FQ>;E>LKzQmkg1}^}7
zUG&V8Xqsd(s_e_TL0Z0)6OZl}?Cf9vlw(0bevsq(2-yVK<dqdN2n5hm8f4UzeQcXx
z^eID(y29RCvG;G6M0Lduw%J>9P&o@uDPJgp<6x{k>jz_fFxF(O|LpkSW943D^Zh6P
Uyw6U7x>A>30r~FNz@xYR2Y}Hnx&QzG