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 43d9055..37f3bab 100644 Binary files a/src/ZX_ROMS/new/SP_TRDOS.bin and b/src/ZX_ROMS/new/SP_TRDOS.bin differ 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 ff293bd..b478f14 100755 Binary files a/src/bios/shared/RECOVERY.IMG and b/src/bios/shared/RECOVERY.IMG differ