From 1fe0d1b589ea475c7ce3568046d89cf809548ad5 Mon Sep 17 00:00:00 2001
From: Anatoliy Belyanskiy <tolik.trek@gmail.com>
Date: Tue, 20 Feb 2024 00:52:19 +1000
Subject: [PATCH] ...

---
 Shared_Includes                   |   2 +-
 src/ZX_ROMS/new/SP_TRDOS.bin      | Bin 16384 -> 16384 bytes
 src/bios/exp/EXP.asm              |  13 ++++---------
 src/bios/exp/FUNC_4x.ASM          |  13 +++++++------
 src/bios/exp/FUNC_RAM_ROM_DRV.ASM |   4 ++--
 src/bios/shared/RECOVERY.IMG      | Bin 98304 -> 98304 bytes
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Shared_Includes b/Shared_Includes
index b8a215d..dbf3e86 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit b8a215d38afde3eed48f39eb961e96cdb6d9e426
+Subproject commit dbf3e86b6290d71e5789cabf7af6981a5a42db0e
diff --git a/src/ZX_ROMS/new/SP_TRDOS.bin b/src/ZX_ROMS/new/SP_TRDOS.bin
index 43d9055f1c909e63946a6f393da97c2fca921d82..37f3babd7082934b5d404de8e641e6dd46fb3ef4 100644
GIT binary patch
delta 351
zcmZo@U~Fh$+z`jXShYExBaVr&YVtm=P?q@?XP-|N=MG`KIyr|sU!uyYPWvpBuv54W
z=WPDW{hNz%>gM-i>0FFro5K~KaxjW)w$+kgW6a$gW>Cq(ICb&`6BD2cR?~}&>{Bg{
z%(6J^H2JRC8J0+k!{w9Lnok$tf5&8`(fEw1^75hI8qN}Klfx}!*)lBNE|&N_ImSYw
zzRlw8B8ks-jF<PGv{M8UXE&Psb1>ll$8zbk<=NA=XD?Y?I1FR~sk@2{41)FycK;L^
zjxe$^o~<!Edj~8D7U5$73Vgo(h{NvR<wsVcNB(`db<|SP?1<n+OEwm%e+mlB!V*9B
zDF`YH3w*5mXQueSQG?^3(ILj8n}sZc8Rd^!a;9@!e)RkG!IMhYW3+C@)cw;xaX8%I
hD?bpNZJyj>rNFpy^HQrA#?Ak%Ef|6RH@7{>1OSP-lj;Bf

delta 332
zcmZo@U~Fh$+z`jXSi3o%BaVr&cJe;1P?kj&XJ1Vg=MG`KF*%1jU!vBkPWvpBuv54W
z=WPDW{hNz%#^(28>0FGGo5K~Kaxf}vw$+kgV=UMlW>Cq(IAih!6BD2cR?~}&>@zHm
z%(Xb{I{B{I8I~A}!&Q^lnosu^ddFm>(fEw1^75hIXTT~>f|w`SSZ@D+c0fT$xO$Vq
zSAoxWUxK(AzkX#~yj?8u8JBG5<Ovp%8s{v}p0+)E)#AcoAPY#{Rb*fgv}dsUr^s-G
zk(KdmjoI1zAj!!WEhO1bSSp$w5xg?_qlGNviOu|$!Hn`JEIHFTE<gJH`rt{W>oHn4
qW9t6tpEw+D@Rc73&bCc%v{GPPvw4wK4C7`-8&gK0XU%O-G64W4+my-x

diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm
index bf44da9..b0bf048 100644
--- a/src/bios/exp/EXP.asm
+++ b/src/bios/exp/EXP.asm
@@ -1045,8 +1045,7 @@ PORTS_INIT:
 .CBL_MUTE:
 	OUT (C),A
 	DJNZ .CBL_MUTE
-
-; Сброс контроллера дисковода
+	; Сброс контроллера дисковода
         ; Включить доступ к контроллеру диска (третья конфа)
 	LD A,CNF_PORT.CNF_3 + ROM.BIOS
 	OUT (SYS_PORT.ROM),A
@@ -1060,12 +1059,10 @@ PORTS_INIT:
 	pop hl
 	XOR A
 	OUT (FDC_93.Command),A
-
-; Выключить доступ к контроллеру диска
+	; Выключить доступ к контроллеру диска
 	LD A,CNF_PORT.CNF_0 + ROM.BIOS
 	OUT (SYS_PORT.ROM),A
-
-; set HDD1/not-HDD2
+	; set HDD1/not-HDD2
 	LD A,IDE.Chanel.Primary							;!HARDCODE сделать через метку
 	OUT (IDE.Chanel.Set),A
 
@@ -1075,15 +1072,13 @@ PORTS_INIT:
 	LD B,#1F
 	LD A,01
 	OUT (C),A							; RAM-0 mode !!!
-
-;----[Clearing the keyboard buffer]-----
+	;Clearing the keyboard buffer
 .clean_kbd_buf:
 	IN	A,(Z84.SIO.Ch_A.Ctrl)
 	AND	1
 	RET	Z
 	IN	A,(Z84.SIO.Ch_A.Data)
 	JR	.clean_kbd_buf
-;	RET	PORTS_INIT.clean_kbd_buf
 ;---------------------------------------
 
 ;-----------------------------------------------------------------------;
diff --git a/src/bios/exp/FUNC_4x.ASM b/src/bios/exp/FUNC_4x.ASM
index 8400e28..0942404 100644
--- a/src/bios/exp/FUNC_4x.ASM
+++ b/src/bios/exp/FUNC_4x.ASM
@@ -281,7 +281,7 @@ FN_HDD_READ:
 .L2:	WAIT_HDD
 	;BIT IDE.ControlBit.DataRequest,A
 	AND IDE.ControlByte.DataRequest
-	JR Z,HD_RET_PortY
+	JR Z,.RET_PortY
 	;
 	;HD_READ_CONT
 	LD BC,IDE.Read.Data
@@ -308,12 +308,12 @@ FN_HDD_READ:
 	LD A,(HL)
 	OUT (SLOT3),A
 	EX AF,AF'
-	LD HL,#C000							; !!!!!
+	LD HL,#C000
 	JR .L2
-
-
-HD_RET_PortY:
+	;
+.RET_PortY:
 	ZERO_PORTY
+	;
 HD_RET:	EXX
 	OUT (C),B
 	EXX
@@ -644,7 +644,8 @@ FN_HDD_INIT:
 ; 	SCF 
 ; 	RET 
 	;
-.L2:	LD	BC,IDE.Read.Data
+;.L2:
+	LD	BC,IDE.Read.Data
 	LD	HL,SYS_PAGE.HD_IDF_ADR
 	IN	A,(SLOT3)
 	LD	D,A
diff --git a/src/bios/exp/FUNC_RAM_ROM_DRV.ASM b/src/bios/exp/FUNC_RAM_ROM_DRV.ASM
index da58801..ff00893 100644
--- a/src/bios/exp/FUNC_RAM_ROM_DRV.ASM
+++ b/src/bios/exp/FUNC_RAM_ROM_DRV.ASM
@@ -565,7 +565,7 @@ BLK_RD_WR:
 	LD A,16
 .BLK_LL1:
 	DUP 16
-		LDI
+	 LDI
 	EDUP
                 
 	DEC A
@@ -599,7 +599,7 @@ BLK_RD_WR:
 .BLK_PAGE3_X:
 	IN A,(SLOT3)
 	LD E,A
-	LD D,#C2
+	LD D,high SYS_PAGE.RAMD_FAT
 	LD A,SYS_PAGE
 	OUT (SLOT3),A
 	LD A,(DE)
diff --git a/src/bios/shared/RECOVERY.IMG b/src/bios/shared/RECOVERY.IMG
index ff293bd7e355e543e84cf4783a7eaee2f2388177..b478f14cade55942857112cb685b8bb3f5feaa20 100755
GIT binary patch
delta 28
jcmZo@U~6b#+aSir)TudHf=`aAOS9R6Z@UE_<B385cBTj+

delta 28
icmZo@U~6b#+aSir6s|E@f=>=eHCym)x8P$uQ3wEV)(5%(