From b2623d1cd940950c62e71ed53534f36a673f1715 Mon Sep 17 00:00:00 2001
From: Anatoliy Belyanskiy <tolik.trek@gmail.com>
Date: Sat, 24 Jun 2023 05:50:08 +1000
Subject: [PATCH] No need EXP and EXP2

---
 SP_TRDOS.ASM | 33 ++++++++++++++++++---------------
 ZX_EXP.ASM   | 22 +++++++++++-----------
 ZX_EXP2.ASM  | 23 ++++++++++++-----------
 3 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/SP_TRDOS.ASM b/SP_TRDOS.ASM
index a11acc9..b5105f3 100644
--- a/SP_TRDOS.ASM
+++ b/SP_TRDOS.ASM
@@ -6503,18 +6503,16 @@ REDIR_3D13:
 	RES 6,C
 	JP HD_CMD	;#3FF0	ROM. DI
 
-        BLOCK #3CFA - $,255
-
 ;*****************************
-
+        BLOCK #3CFA - $,255
 AUTO_3CFA:
         JP      xchg_intf1
 
 ;****** 3D13 redirection ******
+        BLOCK #3CFD - $,255
 AUTO_3CFD:
 	JP	REDIR_3D13
 ;	JP	AUTO_283C
-
 ;***********************************************************************;
         BLOCK #3D00-$,#FF
 
@@ -6535,6 +6533,7 @@ AUTO_3D0E:
 	NOP
 	JR	AUTO_3CFA
 ;****** 3D13 point !!! ****
+        BLOCK #3D13-$,#FF
 	NOP
 	JR	AUTO_3CFD
 AUTO_3D16:
@@ -6562,8 +6561,8 @@ AUTO_3D31:
         JP      EDIT_X05
 AUTO_3D38:
 	XOR	A
-        OUT     (#F7),A         ;?????
-        IN      A,(#F7)         ;?????
+        OUT     (#F7),A         ;проверка ИнтерфейсАДЫН)))
+        IN      A,(#F7)
 	CP	30
 	JR	Z,AUTO_3D44
 	CP	31
@@ -6579,7 +6578,7 @@ AUTO_3D44:
 AUTO_3D4C:
 	XOR	A
         OUT     (P_DOS_FF),A
-        IN      A,(#F6)         ;?????
+        IN      A,(#F6)
         LD      HL,AUTO_3D38
         LD      DE,MEM_BOT
         LD      BC,AUTO_3D38.Size + AUTO_3D44.Size
@@ -6622,7 +6621,7 @@ PRINT_SYM:
 	RST	R38
 AUTO_3D94:
 	RST	RST20
-	DW	00010H
+	DW	#0010   ;!HARDCODE
 	RET
 AUTO_3D98:
 	LD	A,8
@@ -6631,11 +6630,11 @@ WG93_EXE:
 AUTO_3D9C:
 	PUSH	HL
 	RST	RST20
-	DW	01F54H
+	DW	#1F54   ;!HARDCODE
 ;RET_1F54:
 	JR	C,AUTO_3DA5
 	RST	RST20
-	DW	01B7BH
+	DW	#1B7B   ;!HARDCODE
 AUTO_3DA5:
 	POP	HL
         IN      A,(P_DOS_FF)
@@ -7014,7 +7013,8 @@ AUTO_3FEC:
 ;******************************************
 
 
-;******************************************
+;!FIXIT Можно поправить номера функций при вызовах API и прыгать сразу в BIOS через #3FF8
+;-------[ From TR-DOS to API 4x ]-------
 	BLOCK #3FF0-$, #FF
 HD_CMD:	PUSH AF
 	DI
@@ -7022,10 +7022,10 @@ HD_CMD:	PUSH AF
 	OUT (SYS_PORT_ON),A
 	POP AF
 	RET
-;******************************************
+;---------------------------------------
 
-
-;******************************************
+;
+;----[ From API #80..#FF to TR-DOS ]-----
 	BLOCK #3FF8-$, #FF
 EXP_FNS:
 	PUSH AF
@@ -7034,7 +7034,10 @@ EXP_FNS:
 	OUT (SYS_PORT_ON),A
 	POP AF
 	RET
-;******************************************
+;---------------------------------------
+;
+
+;
         BLOCK #4000-$, #FF
 		DISPLAY "16k..ALL!"
 ;
diff --git a/ZX_EXP.ASM b/ZX_EXP.ASM
index 817f254..839670d 100644
--- a/ZX_EXP.ASM
+++ b/ZX_EXP.ASM
@@ -1707,21 +1707,21 @@ kbd_loop2:
 ;***********************************************************************;
 ;!FIXIT not used
 	BLOCK #3FD0 - $,0
-FN1_RET:
-	PUSH AF
-	LD A,D_ROM16ON
-	OUT (CNF_PORT),A
-	POP AF
-	RST #18
-	JR FN1_RET
+; FN1_RET:
+; 	PUSH AF
+; 	LD A,D_ROM16ON
+; 	OUT (CNF_PORT),A
+; 	POP AF
+; 	RST #18
+; 	JR FN1_RET
 
 ;***********************************************************************;
 ;!FIXIT not used
 	BLOCK #3FE0 - $,255
-SOUND_TEST:
-	LD A,D_ROM16ON		; AROM16 = 1
-	OUT (CNF_PORT),A
-	JP SND_TEST_RET
+; SOUND_TEST:
+; 	LD A,D_ROM16ON		; AROM16 = 1
+; 	OUT (CNF_PORT),A
+; 	JP SND_TEST_RET
         
 ;***********************************************************************;
 	BLOCK #3FE8 - $,255
diff --git a/ZX_EXP2.ASM b/ZX_EXP2.ASM
index 37e1e0a..ac79c80 100644
--- a/ZX_EXP2.ASM
+++ b/ZX_EXP2.ASM
@@ -40,12 +40,12 @@ START:
 ;	RET
 ;***********************************************************************;
 	BLOCK #3FD0-$,255
-	PUSH AF
-	LD A,D_ROM16OFF
-	OUT (SYS_PORT_ON),A
-	POP AF
-HD_CMD_XR_RET:
-	RET
+; 	PUSH AF
+; 	LD A,D_ROM16OFF
+; 	OUT (SYS_PORT_ON),A
+; 	POP AF
+; HD_CMD_XR_RET:
+; 	RET
 
 ;***********************************************************************;
         BLOCK #3FD7-$,255
@@ -55,10 +55,10 @@ HD_CMD_XR:
 ;***********************************************************************;
 ;!FIXIT not used
 	BLOCK #3FE0-$,255
-SND_TEST_RET:
-	LD A,D_ROM16OFF
-	OUT (SYS_PORT_OFF),A
-        JP SND_TEST_RET
+; SND_TEST_RET:
+; 	LD A,D_ROM16OFF
+; 	OUT (SYS_PORT_OFF),A
+;         JP SND_TEST_RET
 
 ;***********************************************************************;
 	BLOCK #3FE8-$,255
@@ -86,7 +86,8 @@ EXP_FNS_RET:
 	PUSH AF
 	LD A,D_ROM16OFF
 	OUT (SYS_PORT_OFF),A
-	JP HD_CMD_XR_RET
+	//JP HD_CMD_XR_RET
+        RET
 
 ;***********************************************************************;
 	BLOCK #4000-$,255