From 8fb64a07197bbc38f037e1853cfc1af7cd37aa72 Mon Sep 17 00:00:00 2001 From: Anatoliy Belyanskiy Date: Tue, 12 Sep 2023 03:33:13 +1000 Subject: [PATCH] ... --- Shared_Includes | 2 +- src/bios/exp/EXP.asm | 21 +++++++++------------ src/bios/shared/RECOVERY.IMG | Bin 98304 -> 98304 bytes 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Shared_Includes b/Shared_Includes index 7c28687..cb37592 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 7c28687c26b1f684f87b55512dffeb6e527ba6e0 +Subproject commit cb37592f1a06f495e0396611d9ffde0c04406c89 diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm index c80d557..0a6b99a 100644 --- a/src/bios/exp/EXP.asm +++ b/src/bios/exp/EXP.asm @@ -780,40 +780,37 @@ start: push af ;----[перехват soft reset #EE port]----- Check_EE_Port: - LD A,ACEX.RET_PORT LD B,0 LD C,BIOS.SET_PORTS CALL @ToBIOS_3D13 ; переустановить внутр. порт #EE LD A,B AND A - jr z,Check_Spec_Page + JR Z,Check_Spec_Page DI OUT (SLOT3),A ; Set restart page .After_Hard_Rst: - - LD HL,(#FFF4) ; prog address - ld a,(#FFF0) ; PAGE0 + LD HL,(Spec_Page.RET_addr) ; prog address + ld A,(Spec_Page.page_0) ; PAGE0 OUT (SLOT0),A - LD A,(#FFF1) ; PAGE1 + LD A,(Spec_Page.page_1) ; PAGE1 OUT (SLOT1),A - LD A,(#FFF2) ; PAGE2 + LD A,(Spec_Page.page_2) ; PAGE2 OUT (SLOT2),A - LD A,(#FFF3) ; PAGE3 + LD A,(Spec_Page.page_3) ; PAGE3 OUT (SLOT3),A - - jp (HL) + JP (HL) ; ;--[перехват soft/hard reset #41 page]-- Check_Spec_Page: LD A,Spec_Page OUT (SLOT3),A - LD A,(#FFFE) + LD A,(.flag_Z) CP 'Z' JR NZ,No_Reset_handlers - LD A,(#FFFF) + LD A,(.flag_X) CP 'X' JR NZ,No_Reset_handlers diff --git a/src/bios/shared/RECOVERY.IMG b/src/bios/shared/RECOVERY.IMG index 666c9e3b7a0a5f8f2be8ede85397d66fb9c8b8d5..40cd935062d12df7dd1405423e5e20dc14cde76d 100755 GIT binary patch delta 5552 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