From b140cdd2ba222e3dac1ec53d97bc2c693c1c78c9 Mon Sep 17 00:00:00 2001 From: Tolik <85737314+Tolik-Trek@users.noreply.github.com> Date: Fri, 11 Oct 2024 01:30:13 +1000 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=BA=D0=BE=D0=B9=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=B7=D0=B0=D1=80=D0=B5=D0=B7=D0=B5=D1=80=D0=B2=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B=202=20=D0=B8=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bios/exp/FUNC_SERVICE.asm | 21 ++++++++++++--------- src/bios/rom/ZX/ZX_FUNC.ASM | 1 - 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/bios/exp/FUNC_SERVICE.asm b/src/bios/exp/FUNC_SERVICE.asm index ae3dfd9..fb88489 100644 --- a/src/bios/exp/FUNC_SERVICE.asm +++ b/src/bios/exp/FUNC_SERVICE.asm @@ -16,7 +16,10 @@ RST_CONF: ;--[] ZX Spectrum .AY8910: CALL .ACC_OFF LD DE,ACEX.Config_ID.Sp97_AY - JR .INT_PLD + CALL .INT_PLD + LD A,CNF_PORT.CNF_1 + OUT (SYS_PORT.ON),A + RET ;--[] ;--[] Sprinter ZX @@ -79,14 +82,14 @@ RST_CONF: ; LD A,#3C OUT (FDC_93.DrvCTRL),A - ; восстанавливаем карту портов - LD C,SLOT3 - IN B,(C) - LD A,SYS_PAGE - OUT (C),A - LD A,(SYS_PAGE.CONFIG_DE.CNF_PORT) - OUT (C),B - OUT (SYS_PORT.ON),A + ; восстанавливаем карту портов - походу, не нужно + ;LD C,SLOT3 + ;IN B,(C) + ; LD A,SYS_PAGE + ; OUT (C),A + ; LD A,(SYS_PAGE.CONFIG_DE.CNF_PORT) + ;OUT (C),B + ;OUT (SYS_PORT.ON),A XOR A RET ; diff --git a/src/bios/rom/ZX/ZX_FUNC.ASM b/src/bios/rom/ZX/ZX_FUNC.ASM index b492e00..de0b255 100644 --- a/src/bios/rom/ZX/ZX_FUNC.ASM +++ b/src/bios/rom/ZX/ZX_FUNC.ASM @@ -430,7 +430,6 @@ GET_XXX_MEM: CALL FREE_vRAM .init: LD B,D LD C,BIOS.GetMem CALL ToBIOS_FromEXT - ;CALL EMM.GetMem RET C LD (SYS_PAGE.Block_ID.vRAM),A RET